Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kikadftesting.git;a=commitdiff;h=6e590eaed77a5cca43c7541fcc2abe0db119b202
commit 6e590eaed77a5cca43c7541fcc2abe0db119b202 Author: kikadf <[email protected]> Date: Mon Apr 7 18:55:16 2014 +0200 Remove FrugalBuild.orig files diff --git a/source/xapps-extra/amule/FrugalBuild.orig b/source/xapps-extra/amule/FrugalBuild.orig deleted file mode 100644 index 4bac380..0000000 --- a/source/xapps-extra/amule/FrugalBuild.orig +++ /dev/null @@ -1,57 +0,0 @@ -# Compiling Time: 4.69 SBU -# Maintainer: kikadf <[email protected]> -# Contributor: Devil505 <[email protected]> -# Contributor: BMH1980 <[email protected]> - -options+=('asneeded') - -pkgname=amule -<<<<<<< HEAD -pkgver=10835 -pkgrel=1 -pkgdesc="aMule is a file-sharing program, connects to eDonkey2000 network." -depends=('wxwidget' 'libstdc++' 'gtk+2>=2.16.2-2' 'libxau>=1.0.4-1' 'libxdmcp' \ -======= -pkgver=10834 -pkgrel=2 -pkgdesc="aMule is a file-sharing program, connects to eDonkey2000 network." -depends=('wxgtk>=2.8.10.1-2' 'libstdc++' 'gtk+2>=2.16.2-2' 'libxau>=1.0.4-1' 'libxdmcp' \ ->>>>>>> e99a9cf95b1548f0d2dac0cd2adf6db0345c095f - 'libxxf86vm>=1.0.2-1' 'libxdamage>=1.1.1-3' 'libxml2>=2.7.8' 'libice>=1.0.5-1' \ - 'readline' 'gd' 'binutils>=2.24' 'cryptopp>=5.6.1') -url="http://www.amule.org/"; -groups=('xapps-extra') -archs=('i686' 'x86_64') -options=('scriptlet') -_F_archive_name="aMule-SVN" -Fpkgversep="-r" -up2date="lynx -dump http://repo.or.cz/w/amule.git/ | sed -n 's/.*amule-svn-r\([0-9]*\).*/\1/p' | head -1" -<<<<<<< HEAD -_F_cd_path="$pkgname" -source=(http://repo.or.cz/w/amule.git/snapshot/1a369e473077836b4594930fc706d404aff4dee0.tar.gz) -======= -_F_cd_path="aMule-SVN-r${pkgver}" -source=(http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2) ->>>>>>> e99a9cf95b1548f0d2dac0cd2adf6db0345c095f -Fconfopts+=" \ - --mandir=/usr/share/man \ - --enable-cas \ - --enable-wxcas \ - --enable-amule-daemon \ - --enable-amulecmd \ - --enable-amule-gui \ - --enable-alc \ - --enable-alcc \ - --enable-webserver \ - --disable-debug \ - --enable-optimize \ - --enable-ccache \ - --enable-geoip \ - --enable-upnp" -<<<<<<< HEAD -sha1sums=('2232b159eeb9f65ea57215748da432d331a8e637') -======= -sha1sums=('9caa724b99be609d6300659afb971656330302e6') ->>>>>>> e99a9cf95b1548f0d2dac0cd2adf6db0345c095f - -# optimization OK diff --git a/source/xapps-extra/codeblocks/FrugalBuild.orig b/source/xapps-extra/codeblocks/FrugalBuild.orig deleted file mode 100644 index da1aef7..0000000 --- a/source/xapps-extra/codeblocks/FrugalBuild.orig +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: 2.68 SBU -# Maintainer: Melko <[email protected]> - -options+=('asneeded') - -pkgname=codeblocks -pkgver=13.12 -<<<<<<< HEAD -pkgrel=2 -======= -pkgrel=1 ->>>>>>> e99a9cf95b1548f0d2dac0cd2adf6db0345c095f -pkgdesc="A free cross platform C++ IDE" -depends=('libstdc++' 'wxwidget' 'libxdamage>=1.1.1-3' \ - 'libxxf86vm>=1.0.2' 'expat' 'libice>=1.0.5-2' 'bzip2' \ - 'hunspell' 'gamin') -makedepends=('zip' 'boost') -groups=('xapps-extra') -archs=('i686' 'x86_64') -options+=('scriptlet' 'force') -Fconfopts+=" --with-contrib-plugins=all" -_F_sourceforge_dirname=$pkgname.berlios -_F_sourceforge_sep="_" -_F_sourceforge_ext="-1.tar.gz" -Finclude sourceforge -url="http://www.codeblocks.org/"; -sha1sums=('3d16f977c9dcc0d857f61af3233a76d6a68609e3') -_F_cd_path="codeblocks-${pkgver}" - -# optimization OK - diff --git a/source/xapps-extra/rapidsvn/FrugalBuild.orig b/source/xapps-extra/rapidsvn/FrugalBuild.orig deleted file mode 100644 index 87c1c77..0000000 --- a/source/xapps-extra/rapidsvn/FrugalBuild.orig +++ /dev/null @@ -1,52 +0,0 @@ -# Compiling Time: 1.14 SBU -# Maintainer: kikadf <[email protected]> -# Contributor: crazy <[email protected]> - -options+=('asneeded') - -options+=('asneeded') - -pkgname=rapidsvn -pkgver=0.12.1 -pkgrel=1 -pkgdesc="GUI front-end for Subversion" -url="http://rapidsvn.tigris.org/"; -depends=('subversion>=1.6.5' 'wxgtk28' 'libstdc++' 'libxxf86vm' 'libxdamage' 'libice') -rodepends=('libsvncpp') -groups=('xapps-extra') -archs=('i686' 'x86_64') -up2date="lynx -dump 'http://rapidsvn.tigris.org/'|grep 'latest release:' |sed 's/.*: \(.*\) .*/\1/'" -<<<<<<< HEAD -source=(http://www.rapidsvn.org/download/release/$pkgver/$pkgname-${pkgver}.tar.gz) -======= -source=(http://www.rapidsvn.org/download/release/0.12.1/$pkgname-$pkgver.tar.gz) ->>>>>>> e99a9cf95b1548f0d2dac0cd2adf6db0345c095f -sha1sums=('65d051b5a84fe8b5b0ce906f2ba5cf134a560feb') -options=('scriptlet') - -subpkgs=('libsvncpp') -subdescs=('svncpp is a C++ wrapper for the C Subversion client library.') -subdepends=('libstdc++') -subgroups=('lib-extra') -subarchs=('i686 x86_64') - -<<<<<<< HEAD -Fconfopts+=" --with-wx-config=wx-config-2.8" - -======= ->>>>>>> e99a9cf95b1548f0d2dac0cd2adf6db0345c095f -build() -{ - Fbuild \ - --with-apr-config=/usr/bin/apr-1-config \ - --with-apu-config=/usr/bin/apu-1-config - ## prepare .desktop file - Ffilerel \ - src/res/bitmaps/rapidsvn_128x128.png \ - /usr/share/pixmaps/$pkgname.png - Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" "Development;" - - Fsplit libsvncpp usr/lib usr/include -} - -# optimization OK diff --git a/source/xlib-extra/wxsqlite3/FrugalBuild.orig b/source/xlib-extra/wxsqlite3/FrugalBuild.orig deleted file mode 100644 index cb1c660..0000000 --- a/source/xlib-extra/wxsqlite3/FrugalBuild.orig +++ /dev/null @@ -1,36 +0,0 @@ -# Compiling Time: 0.09 SBU -# Maintainer: kikadf <[email protected]> -# Contributor: crazy <[email protected]> -# Contributor: Miklos Nemeth <[email protected]> - -options+=('asneeded') - -pkgname=wxsqlite3 -pkgver=3.0.6.1 -<<<<<<< HEAD -pkgrel=2 -======= -pkgrel=1 ->>>>>>> e99a9cf95b1548f0d2dac0cd2adf6db0345c095f -pkgdesc="wxSQLite3 is a C++ wrapper around the public domain SQLite 3.x database" -depends=('sqlite3' 'wxwidget') -groups=('xlib-extra') -archs=('i686' 'x86_64') -options=('scriptlet') -_F_sourceforge_dirname="wxcode" -_F_cd_path="$pkgname-3.0.6" -Finclude sourceforge -url="http://wxcode.sourceforge.net/components/wxsqlite3/"; -<<<<<<< HEAD -Fconfopts+=" --with-sqlite3-prefix=/usr" -sha1sums=('0b2f4e2e2e22bfd1f6115b62300788a17562c9de') -======= -#up2date="lynx -dump http://wxcode.sourceforge.net/components/wxsqlite3/ | grep Latest | sed 's/.*n: \([0-9.]*\) B.*/\1/'" -Fconfopts+=" --with-sqlite3-prefix=/usr" -sha1sums=('0b2f4e2e2e22bfd1f6115b62300788a17562c9de') -unset MAKEFLAGS -_F_cd_path=$pkgname-3.0.6 ->>>>>>> e99a9cf95b1548f0d2dac0cd2adf6db0345c095f - - -# optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
