diff --git a/Makefile b/Makefile deleted file mode 100644 index ba8e8633dbf..00000000000 --- a/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Toplevel Makefile -# -.PHONY: all -all: - $(MAKE) -C xbps-src - -.PHONY: install -install: - $(MAKE) -C xbps-src install - -.PHONY: uninstall -uninstall: - $(MAKE) -C xbps-src uninstall - -.PHONY: clean -clean: - $(MAKE) -C xbps-src clean diff --git a/README b/README index a9b4d802cd5..f9f7b553242 100644 --- a/README +++ b/README @@ -1,48 +1,74 @@ ------------------------------------------------------------------------------- - REQUIREMENTS ------------------------------------------------------------------------------- +xbps-src - building packages from source +======================================== +What is it? +----------- +`xbps-src` is the utility used by the _X binary package system_ to build +binary packages from source distribution files. A root directory `srcpkgs` +contains multiple subdirs, each one to build a package as its name +indicates. The following example illustrates it: + + + + +................................. +xbps-templates/ + | + |----- srcpkgs/ + | + |----- binutils/ + |----- gcc/ + |----- glibc/ + |----- .... +.................................. + +Requirements +------------ The following software is required in the host system to build XBPS -binary packages: +binary packages from source: - * GNU awk - * GNU bash - * GNU bison - * GNU gcc c++ (development package) - * GNU gettext (development package) - * GNU make - * GNU patch - * GNU texinfo - * fakeroot - * perl - * sudo + - GNU awk + - GNU bash + - GNU bison + - GNU gcc c++ (development package) + - GNU gettext (development package) + - GNU make + - GNU patch + - GNU texinfo + - fakeroot + - perl + - sudo -Run "make install clean" at the top level directory, xbps-src and -its shell utilities will be installed into /usr/local by default (can be -changed by setting PREFIX and DESTDIR). +`xbps-src` and its shell utilities need to be installed in a directory +for correct operation, that is accomplished by issuing: +----------------------------------- +$ cd xbps-src && make install clean +----------------------------------- -DONT FORGET TO EDIT "$PREFIX/etc/xbps-src.conf" BEFORE USING IT! +This will install all files into `/usr/local` by default, can be changed +by specifying `PREFIX` and `DESTDIR` to make(1). ------------------------------------------------------------------------------- - HOW TO BUILD/HANDLE PACKAGES FROM SOURCE ------------------------------------------------------------------------------- - -Before using xbps-src, some required utilities need to be built and installed -into $(PREFIX); by default they are installed into /usr/local. -You can do this by issuing "make" and "make install" as root in the top -level directory. +Building packages from source +----------------------------- +`xbps-src` always look for a `template` file in current directory, that's what +it specifies the package build definitions and such. The build templates +are located in the `srcpkgs` directory, you should change the cwd to the +directory matching the package that you want to work on, i.e for binutils, +its directory is `srcpkgs/binutils`. + + If configuration file is not specified from the command line with the -c flag, it will first try to use the default location at -/usr/local/etc/xbps-src.conf (or the installation prefix that was specified +`/usr/local/etc/xbps-src.conf` (or the installation prefix that was specified to the make(1) command), and as last resort in the etc directory of the current directory. + + To avoid problems with libtool and configure scripts finding stuff that is available in the host system, almost all packages must be built inside of a -chroot. So the first thing would be to create the binary packages with: - - $ xbps-src install xbps-base-chroot +chroot. So the first thing would be to create the required set of packages +that will be used in the chroot: +------------------------------------------------- +$ cd srcpkgs/xbps-base-chroot && xbps-src install +------------------------------------------------- This will build all required packages via fakeroot in masterdir, therefore you can run it as normal user. Next commands will require super-user privileges @@ -52,65 +78,78 @@ be that xbps packages are meant to be used in a system and not just for ordinary users. So once all packages are built, you can create and enter to the chroot with: - $ sudo xbps-src chroot +---------------------- +$ sudo xbps-src chroot +---------------------- Press Control + D to exit from the chroot. The following targets will require -to be done in the chroot: - - build, configure, install, install-destdir, remove, stow and unstow. +to be done in the chroot (_once xbps-base-chroot is installed_): +*build, configure, install, install-destdir, remove, stow and unstow* + + Now let's explain some more about the targets that you can use. To start -installing packages you should use the install target: - - $ sudo xbps-src install glib +installing packages you should use the install target, all source packages +are located in the `srcpkgs` directory, so to install glib: +------------------------------------------ +$ cd srcpkgs/glib && sudo xbps-src install +------------------------------------------ If the package is properly installed, it will be "stowned" automatically. ``stowned'' means that this package is available in the master directory, on which xpbs has copied all files from DESTDIR/. + + To remove a currently installed (and stowned) package, you can use: - - $ sudo xbps-src remove glib +----------------------------------------- +$ cd srcpkgs/glib && sudo xbps-src remove +----------------------------------------- Please note that when you remove it, the package will also be removed -from XBPS_DESTDIR and previously "unstowned". +from XBPS_DESTDIR and previously `unstowned`. + + To stow an already installed package (from XBPS_DESTDIR/): +--------------------------------------- +$ cd srcpkgs/glib && sudo xbps-src stow +--------------------------------------- - $ sudo xbps-src stow glib - -and to unstow an already installed (stowned) package: - - $ sudo xbps-src unstow glib +To unstow an already installed (stowned) package: +----------------------------------------- +$ cd srcpkgs/glib && sudo xbps-src unstow +----------------------------------------- You can also print some stuff about any template build file, e.g: - - $ xbps-src info glib +---------------------------------- +$ cd srcpkgs/glib && xbps-src info +---------------------------------- To list installed (stowned) packages, use this: - - $ xbps-src list +--------------- +$ xbps-src list +--------------- To only extract the distfiles, without configuring/building/installing: - - $ xbps-src extract foo +------------------------------------ +$ cd srcpkgs/foo && xbps-src extract +------------------------------------ To not remove the build directory after successful installation: - - $ sudo xbps-src -C install blah +--------------------------------------------- +$ cd srcpkgs/blah && sudo xbps-src -C install +--------------------------------------------- To only fetch the distfile: - - $ xbps-src fetch blah +----------------------------------- +$ cd srcpkgs/blah && xbps-src fetch +----------------------------------- To only install the package, _without_ stowning it into the master directory: - - $ sudo xbps-src install-destdir blob +-------------------------------------------------- +$ cd srcpkgs/blob && sudo xbps-src install-destdir +-------------------------------------------------- To list files installed by a package, note that package must be installed into destination directory first: - - $ xbps-src listfiles blob - ------------------------------------------------------------------------------- - Juan Romero Pardines +---------------------------- +$ xbps-src listfiles pkgname +---------------------------- diff --git a/TODO b/TODO deleted file mode 100644 index e971cd3798a..00000000000 --- a/TODO +++ /dev/null @@ -1,6 +0,0 @@ -* Add a trigger for fc-cache. -* Add a trigger to (un)register users/groups. Currently packages that - require user/groups use custom INSTALL/REMOVE scripts, which adds - a lot of duplicated work. -* Support external remote patches. -* Add the following packages: mercurial, vala. diff --git a/templates/ConsoleKit-devel b/srcpkgs/ConsoleKit-devel similarity index 100% rename from templates/ConsoleKit-devel rename to srcpkgs/ConsoleKit-devel diff --git a/templates/ConsoleKit-x11 b/srcpkgs/ConsoleKit-x11 similarity index 100% rename from templates/ConsoleKit-x11 rename to srcpkgs/ConsoleKit-x11 diff --git a/templates/ConsoleKit/devel.template b/srcpkgs/ConsoleKit/ConsoleKit-devel.template similarity index 100% rename from templates/ConsoleKit/devel.template rename to srcpkgs/ConsoleKit/ConsoleKit-devel.template diff --git a/templates/ConsoleKit/x11.template b/srcpkgs/ConsoleKit/ConsoleKit-x11.template similarity index 100% rename from templates/ConsoleKit/x11.template rename to srcpkgs/ConsoleKit/ConsoleKit-x11.template diff --git a/templates/ConsoleKit/depends b/srcpkgs/ConsoleKit/depends similarity index 100% rename from templates/ConsoleKit/depends rename to srcpkgs/ConsoleKit/depends diff --git a/templates/ConsoleKit/template b/srcpkgs/ConsoleKit/template similarity index 96% rename from templates/ConsoleKit/template rename to srcpkgs/ConsoleKit/template index 785b5a0256d..376c44be63a 100644 --- a/templates/ConsoleKit/template +++ b/srcpkgs/ConsoleKit/template @@ -16,7 +16,7 @@ long_desc=" conf_files="/etc/dbus-1/system.d/ConsoleKit.conf /etc/ConsoleKit/seats.d/00-primary.seat" -subpackages="devel x11" +subpackages="$pkgname-devel $pkgname-x11" Add_dependency full glibc Add_dependency full dbus Add_dependency full dbus-glib diff --git a/templates/GConf-devel b/srcpkgs/GConf-devel similarity index 100% rename from templates/GConf-devel rename to srcpkgs/GConf-devel diff --git a/templates/GConf/devel.template b/srcpkgs/GConf/GConf-devel.template similarity index 100% rename from templates/GConf/devel.template rename to srcpkgs/GConf/GConf-devel.template diff --git a/templates/GConf/depends b/srcpkgs/GConf/depends similarity index 100% rename from templates/GConf/depends rename to srcpkgs/GConf/depends diff --git a/templates/GConf/template b/srcpkgs/GConf/template similarity index 96% rename from templates/GConf/template rename to srcpkgs/GConf/template index 9ee54be1c00..69dfe196e28 100644 --- a/templates/GConf/template +++ b/srcpkgs/GConf/template @@ -15,7 +15,7 @@ long_desc=" conf_files="/etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf /etc/gconf/2/path" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency full glibc diff --git a/templates/ImageMagick/template b/srcpkgs/ImageMagick/template similarity index 95% rename from templates/ImageMagick/template rename to srcpkgs/ImageMagick/template index f165c70d1fe..6c4b5dd29ef 100644 --- a/templates/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -2,6 +2,7 @@ pkgname=ImageMagick _distver=6.5.6 _distverpatch=10 +revision=1 version=${_distver}.${_distverpatch} wrksrc=${pkgname}-${_distver}-${_distverpatch} distfiles="ftp://ftp.imagemagick.org/pub/$pkgname/$pkgname-${_distver}-${_distverpatch}.tar.bz2" @@ -46,6 +47,6 @@ Add_dependency full libxml2 Add_dependency full cairo Add_dependency full librsvg Add_dependency full libX11 -Add_dependency run libtool-ltdl -Add_dependency run gcc-libgomp -Add_dependency run gcc-libstdc++ +Add_dependency run libltdl +Add_dependency run libgomp +Add_dependency run libstdc++ diff --git a/templates/MesaLib-devel b/srcpkgs/MesaLib-devel similarity index 100% rename from templates/MesaLib-devel rename to srcpkgs/MesaLib-devel diff --git a/templates/MesaLib/devel.template b/srcpkgs/MesaLib/MesaLib-devel.template similarity index 100% rename from templates/MesaLib/devel.template rename to srcpkgs/MesaLib/MesaLib-devel.template diff --git a/templates/MesaLib/depends b/srcpkgs/MesaLib/depends similarity index 100% rename from templates/MesaLib/depends rename to srcpkgs/MesaLib/depends diff --git a/templates/MesaLib/template b/srcpkgs/MesaLib/template similarity index 94% rename from templates/MesaLib/template rename to srcpkgs/MesaLib/template index 379ae99998c..08b3003a22f 100644 --- a/templates/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -1,6 +1,7 @@ # Template build file for 'MesaLib'. pkgname=MesaLib version=7.6 +revision=1 wrksrc="Mesa-$version" distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2" build_style=gnu_configure @@ -15,7 +16,7 @@ long_desc=" Inc. However, the author makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with Silicon Graphics, Inc." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build glproto Add_dependency build dri2proto ">=2.1" @@ -31,4 +32,4 @@ Add_dependency full libXi Add_dependency full libXfixes Add_dependency full libXdamage Add_dependency full libXxf86vm -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ diff --git a/templates/ORBit2-devel b/srcpkgs/ORBit2-devel similarity index 100% rename from templates/ORBit2-devel rename to srcpkgs/ORBit2-devel diff --git a/templates/ORBit2/devel.template b/srcpkgs/ORBit2/ORBit2-devel.template similarity index 100% rename from templates/ORBit2/devel.template rename to srcpkgs/ORBit2/ORBit2-devel.template diff --git a/templates/ORBit2/depends b/srcpkgs/ORBit2/depends similarity index 100% rename from templates/ORBit2/depends rename to srcpkgs/ORBit2/depends diff --git a/templates/ORBit2/template b/srcpkgs/ORBit2/template similarity index 96% rename from templates/ORBit2/template rename to srcpkgs/ORBit2/template index 2c4fad0fc8c..84f5c29bda7 100644 --- a/templates/ORBit2/template +++ b/srcpkgs/ORBit2/template @@ -16,7 +16,7 @@ long_desc=" engineered for the desktop workstation environment, with a focus on performance, low resource usage, and security." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full glib diff --git a/templates/OpenRC/files/OpenRC.logrotate b/srcpkgs/OpenRC/files/OpenRC.logrotate similarity index 100% rename from templates/OpenRC/files/OpenRC.logrotate rename to srcpkgs/OpenRC/files/OpenRC.logrotate diff --git a/templates/OpenRC/files/locale.confd b/srcpkgs/OpenRC/files/locale.confd similarity index 100% rename from templates/OpenRC/files/locale.confd rename to srcpkgs/OpenRC/files/locale.confd diff --git a/templates/OpenRC/files/locale.rc b/srcpkgs/OpenRC/files/locale.rc similarity index 100% rename from templates/OpenRC/files/locale.rc rename to srcpkgs/OpenRC/files/locale.rc diff --git a/templates/OpenRC/files/rc.conf b/srcpkgs/OpenRC/files/rc.conf similarity index 100% rename from templates/OpenRC/files/rc.conf rename to srcpkgs/OpenRC/files/rc.conf diff --git a/templates/OpenRC/patches/fix_incorrect_shell_syntax_init.d_network.diff b/srcpkgs/OpenRC/patches/fix_incorrect_shell_syntax_init.d_network.diff similarity index 100% rename from templates/OpenRC/patches/fix_incorrect_shell_syntax_init.d_network.diff rename to srcpkgs/OpenRC/patches/fix_incorrect_shell_syntax_init.d_network.diff diff --git a/templates/OpenRC/patches/keymaps_ignore_warning_from_kbd_1.15.1.diff b/srcpkgs/OpenRC/patches/keymaps_ignore_warning_from_kbd_1.15.1.diff similarity index 100% rename from templates/OpenRC/patches/keymaps_ignore_warning_from_kbd_1.15.1.diff rename to srcpkgs/OpenRC/patches/keymaps_ignore_warning_from_kbd_1.15.1.diff diff --git a/templates/OpenRC/patches/xbps_changes.diff b/srcpkgs/OpenRC/patches/xbps_changes.diff similarity index 100% rename from templates/OpenRC/patches/xbps_changes.diff rename to srcpkgs/OpenRC/patches/xbps_changes.diff diff --git a/templates/OpenRC/template b/srcpkgs/OpenRC/template similarity index 100% rename from templates/OpenRC/template rename to srcpkgs/OpenRC/template diff --git a/templates/PolicyKit-devel b/srcpkgs/PolicyKit-devel similarity index 100% rename from templates/PolicyKit-devel rename to srcpkgs/PolicyKit-devel diff --git a/templates/PolicyKit/INSTALL b/srcpkgs/PolicyKit/INSTALL similarity index 100% rename from templates/PolicyKit/INSTALL rename to srcpkgs/PolicyKit/INSTALL diff --git a/templates/PolicyKit/devel.template b/srcpkgs/PolicyKit/PolicyKit-devel.template similarity index 100% rename from templates/PolicyKit/devel.template rename to srcpkgs/PolicyKit/PolicyKit-devel.template diff --git a/templates/PolicyKit/REMOVE b/srcpkgs/PolicyKit/REMOVE similarity index 100% rename from templates/PolicyKit/REMOVE rename to srcpkgs/PolicyKit/REMOVE diff --git a/templates/PolicyKit/depends b/srcpkgs/PolicyKit/depends similarity index 100% rename from templates/PolicyKit/depends rename to srcpkgs/PolicyKit/depends diff --git a/templates/PolicyKit/template b/srcpkgs/PolicyKit/template similarity index 97% rename from templates/PolicyKit/template rename to srcpkgs/PolicyKit/template index 5d94496df0a..fd289ca552c 100644 --- a/templates/PolicyKit/template +++ b/srcpkgs/PolicyKit/template @@ -14,9 +14,9 @@ long_desc=" conf_files="/etc/PolicyKit/PolicyKit.conf /etc/dbus-1/system.d/org.freedesktop.PolicyKit.conf" - keep_empty_dirs=yes -subpackages="devel" + +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full dbus Add_dependency full dbus-glib diff --git a/templates/Terminal/template b/srcpkgs/Terminal/template similarity index 100% rename from templates/Terminal/template rename to srcpkgs/Terminal/template diff --git a/templates/Thunar-devel b/srcpkgs/Thunar-devel similarity index 100% rename from templates/Thunar-devel rename to srcpkgs/Thunar-devel diff --git a/templates/Thunar/devel.template b/srcpkgs/Thunar/Thunar-devel.template similarity index 100% rename from templates/Thunar/devel.template rename to srcpkgs/Thunar/Thunar-devel.template diff --git a/templates/Thunar/depends b/srcpkgs/Thunar/depends similarity index 100% rename from templates/Thunar/depends rename to srcpkgs/Thunar/depends diff --git a/templates/Thunar/template b/srcpkgs/Thunar/template similarity index 97% rename from templates/Thunar/template rename to srcpkgs/Thunar/template index d4ba9d1e4c7..4e5451f4058 100644 --- a/templates/Thunar/template +++ b/srcpkgs/Thunar/template @@ -18,7 +18,7 @@ long_desc=" gtk_iconcache_dirs="/usr/share/icons/hicolor" triggers="gtk-icon-cache" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency full glibc diff --git a/templates/acct/template b/srcpkgs/acct/template similarity index 100% rename from templates/acct/template rename to srcpkgs/acct/template diff --git a/templates/acl-devel b/srcpkgs/acl-devel similarity index 100% rename from templates/acl-devel rename to srcpkgs/acl-devel diff --git a/templates/acl-progs b/srcpkgs/acl-progs similarity index 100% rename from templates/acl-progs rename to srcpkgs/acl-progs diff --git a/templates/acl/devel.template b/srcpkgs/acl/acl-devel.template similarity index 100% rename from templates/acl/devel.template rename to srcpkgs/acl/acl-devel.template diff --git a/templates/acl/progs.template b/srcpkgs/acl/acl-progs.template similarity index 100% rename from templates/acl/progs.template rename to srcpkgs/acl/acl-progs.template diff --git a/templates/acl/depends b/srcpkgs/acl/depends similarity index 100% rename from templates/acl/depends rename to srcpkgs/acl/depends diff --git a/templates/acl/template b/srcpkgs/acl/template similarity index 96% rename from templates/acl/template rename to srcpkgs/acl/template index 365f69bb1f5..25b276beff8 100644 --- a/templates/acl/template +++ b/srcpkgs/acl/template @@ -14,7 +14,7 @@ long_desc=" filesystems." keep_libtool_archives=yes -subpackages="devel progs" +subpackages="acl-devel acl-progs" Add_dependency build gettext Add_dependency build gawk Add_dependency run glibc diff --git a/templates/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template similarity index 96% rename from templates/adobe-flash-plugin/template rename to srcpkgs/adobe-flash-plugin/template index d62e71734ba..a0c22d0306c 100644 --- a/templates/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -1,6 +1,7 @@ # Template file for 'adobe-flash-plugin' pkgname=adobe-flash-plugin version=10.1beta +revision=1 # The EULA file _eula="http://www.adobe.com/products/eulas/pdfs/Reader_Player_WWEULA-Combined-20060724_1430.pdf" _eulacksum=986c3ddacfee18946fbef7b76485922f8f36e61f790776ce82a87afff3008427 @@ -24,8 +25,8 @@ long_desc=" This is the Adobe Flash Player plugin for Netscape compatible browsers." # Direct requirements as per objdump -p. -Add_dependency run glibc -Add_dependency run gcc-libstdc++ +Add_dependency run glibc +Add_dependency run libstdc++ Add_dependency full libX11 Add_dependency full libXext Add_dependency full libXt diff --git a/templates/alsa-lib-devel b/srcpkgs/alsa-lib-devel similarity index 100% rename from templates/alsa-lib-devel rename to srcpkgs/alsa-lib-devel diff --git a/templates/alsa-lib/devel.template b/srcpkgs/alsa-lib/alsa-lib-devel.template similarity index 100% rename from templates/alsa-lib/devel.template rename to srcpkgs/alsa-lib/alsa-lib-devel.template diff --git a/templates/alsa-lib/depends b/srcpkgs/alsa-lib/depends similarity index 100% rename from templates/alsa-lib/depends rename to srcpkgs/alsa-lib/depends diff --git a/templates/alsa-lib/template b/srcpkgs/alsa-lib/template similarity index 96% rename from templates/alsa-lib/template rename to srcpkgs/alsa-lib/template index 560fe8201eb..6e10d8c7d58 100644 --- a/templates/alsa-lib/template +++ b/srcpkgs/alsa-lib/template @@ -14,6 +14,6 @@ long_desc=" programming and provide higher level functionality as well as support for the older OSS API, providing binary compatibility for most OSS programs." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc diff --git a/templates/anacron/files/00anacron.daily b/srcpkgs/anacron/files/00anacron.daily similarity index 100% rename from templates/anacron/files/00anacron.daily rename to srcpkgs/anacron/files/00anacron.daily diff --git a/templates/anacron/files/00anacron.monthly b/srcpkgs/anacron/files/00anacron.monthly similarity index 100% rename from templates/anacron/files/00anacron.monthly rename to srcpkgs/anacron/files/00anacron.monthly diff --git a/templates/anacron/files/00anacron.weekly b/srcpkgs/anacron/files/00anacron.weekly similarity index 100% rename from templates/anacron/files/00anacron.weekly rename to srcpkgs/anacron/files/00anacron.weekly diff --git a/templates/anacron/files/anacrond.rc b/srcpkgs/anacron/files/anacrond.rc similarity index 100% rename from templates/anacron/files/anacrond.rc rename to srcpkgs/anacron/files/anacrond.rc diff --git a/templates/anacron/files/anacrontab b/srcpkgs/anacron/files/anacrontab similarity index 100% rename from templates/anacron/files/anacrontab rename to srcpkgs/anacron/files/anacrontab diff --git a/templates/anacron/template b/srcpkgs/anacron/template similarity index 100% rename from templates/anacron/template rename to srcpkgs/anacron/template diff --git a/templates/asciidoc/template b/srcpkgs/asciidoc/template similarity index 100% rename from templates/asciidoc/template rename to srcpkgs/asciidoc/template diff --git a/templates/aspell-devel b/srcpkgs/aspell-devel similarity index 100% rename from templates/aspell-devel rename to srcpkgs/aspell-devel diff --git a/templates/aspell/devel.template b/srcpkgs/aspell/aspell-devel.template similarity index 92% rename from templates/aspell/devel.template rename to srcpkgs/aspell/aspell-devel.template index 6442d75ffe0..283fe783fe4 100644 --- a/templates/aspell/devel.template +++ b/srcpkgs/aspell/aspell-devel.template @@ -13,7 +13,6 @@ do_install() mkdir -p ${DESTDIR}/usr/share/info ${DESTDIR}/usr/share/man/man1 mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/bin/pspell-config ${DESTDIR}/usr/bin mv ${SRCPKGDESTDIR}/usr/share/info/aspell-dev* \ diff --git a/templates/aspell/depends b/srcpkgs/aspell/depends similarity index 100% rename from templates/aspell/depends rename to srcpkgs/aspell/depends diff --git a/templates/aspell/template b/srcpkgs/aspell/template similarity index 93% rename from templates/aspell/template rename to srcpkgs/aspell/template index bb20de87f3c..4fe11b31510 100644 --- a/templates/aspell/template +++ b/srcpkgs/aspell/template @@ -1,6 +1,7 @@ # Template file for 'aspell' pkgname=aspell version=0.60.6 +revision=1 distfiles="ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz" build_style=gnu_configure configure_args="--enable-compile-in-filters" @@ -18,8 +19,8 @@ long_desc=" process is open at once." # XXX Add missing ncursesw dependency. -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full ncurses Add_dependency full perl -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ diff --git a/templates/atk-devel b/srcpkgs/atk-devel similarity index 100% rename from templates/atk-devel rename to srcpkgs/atk-devel diff --git a/templates/atk/devel.template b/srcpkgs/atk/atk-devel.template similarity index 100% rename from templates/atk/devel.template rename to srcpkgs/atk/atk-devel.template diff --git a/templates/atk/depends b/srcpkgs/atk/depends similarity index 100% rename from templates/atk/depends rename to srcpkgs/atk/depends diff --git a/templates/atk/template b/srcpkgs/atk/template similarity index 97% rename from templates/atk/template rename to srcpkgs/atk/template index 692d115dedf..90ef826627a 100644 --- a/templates/atk/template +++ b/srcpkgs/atk/template @@ -18,7 +18,7 @@ long_desc=" It also provides interfaces which an application can use to provide additional accessibility information to assistive technology tools." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full glib diff --git a/templates/attr-devel b/srcpkgs/attr-devel similarity index 100% rename from templates/attr-devel rename to srcpkgs/attr-devel diff --git a/templates/attr-progs b/srcpkgs/attr-progs similarity index 100% rename from templates/attr-progs rename to srcpkgs/attr-progs diff --git a/templates/attr/devel.template b/srcpkgs/attr/attr-devel.template similarity index 100% rename from templates/attr/devel.template rename to srcpkgs/attr/attr-devel.template diff --git a/templates/attr/progs.template b/srcpkgs/attr/attr-progs.template similarity index 100% rename from templates/attr/progs.template rename to srcpkgs/attr/attr-progs.template diff --git a/templates/attr/depends b/srcpkgs/attr/depends similarity index 100% rename from templates/attr/depends rename to srcpkgs/attr/depends diff --git a/templates/attr/template b/srcpkgs/attr/template similarity index 96% rename from templates/attr/template rename to srcpkgs/attr/template index 5cd417c7c91..12eaac7f4af 100644 --- a/templates/attr/template +++ b/srcpkgs/attr/template @@ -13,7 +13,7 @@ long_desc=" This package includes Extended attribute support library for ACL support." keep_libtool_archives=yes -subpackages="devel progs" +subpackages="attr-devel attr-progs" Add_dependency build gettext Add_dependency build gawk Add_dependency run glibc diff --git a/templates/aufs2-kmod/template b/srcpkgs/aufs2-kmod/template similarity index 100% rename from templates/aufs2-kmod/template rename to srcpkgs/aufs2-kmod/template diff --git a/templates/autoconf/template b/srcpkgs/autoconf/template similarity index 100% rename from templates/autoconf/template rename to srcpkgs/autoconf/template diff --git a/templates/automake/template b/srcpkgs/automake/template similarity index 100% rename from templates/automake/template rename to srcpkgs/automake/template diff --git a/templates/babl-devel b/srcpkgs/babl-devel similarity index 100% rename from templates/babl-devel rename to srcpkgs/babl-devel diff --git a/templates/babl/devel.template b/srcpkgs/babl/babl-devel.template similarity index 100% rename from templates/babl/devel.template rename to srcpkgs/babl/babl-devel.template diff --git a/templates/babl/depends b/srcpkgs/babl/depends similarity index 100% rename from templates/babl/depends rename to srcpkgs/babl/depends diff --git a/templates/babl/patches/fix_extensions_rpath.diff b/srcpkgs/babl/patches/fix_extensions_rpath.diff similarity index 100% rename from templates/babl/patches/fix_extensions_rpath.diff rename to srcpkgs/babl/patches/fix_extensions_rpath.diff diff --git a/templates/babl/template b/srcpkgs/babl/template similarity index 96% rename from templates/babl/template rename to srcpkgs/babl/template index 60c23b8a0e4..71829ee4b5a 100644 --- a/templates/babl/template +++ b/srcpkgs/babl/template @@ -16,5 +16,5 @@ long_desc=" A vocabulary to formulate new pixel formats from existing primitives is provided as well as the framework to add new color models and data types." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency run glibc diff --git a/templates/bash/template b/srcpkgs/bash/template similarity index 100% rename from templates/bash/template rename to srcpkgs/bash/template diff --git a/templates/bdftopcf/template b/srcpkgs/bdftopcf/template similarity index 100% rename from templates/bdftopcf/template rename to srcpkgs/bdftopcf/template diff --git a/templates/bigreqsproto/template b/srcpkgs/bigreqsproto/template similarity index 100% rename from templates/bigreqsproto/template rename to srcpkgs/bigreqsproto/template diff --git a/templates/binutils-devel b/srcpkgs/binutils-devel similarity index 100% rename from templates/binutils-devel rename to srcpkgs/binutils-devel diff --git a/templates/binutils/devel.template b/srcpkgs/binutils/binutils-devel.template similarity index 100% rename from templates/binutils/devel.template rename to srcpkgs/binutils/binutils-devel.template diff --git a/templates/binutils/depends b/srcpkgs/binutils/depends similarity index 100% rename from templates/binutils/depends rename to srcpkgs/binutils/depends diff --git a/templates/binutils/template b/srcpkgs/binutils/template similarity index 97% rename from templates/binutils/template rename to srcpkgs/binutils/template index a997f757190..bb534b64877 100644 --- a/templates/binutils/template +++ b/srcpkgs/binutils/template @@ -23,7 +23,7 @@ long_desc=" and other tools." base_chroot=yes -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency run glibc pre_install() diff --git a/templates/bison/template b/srcpkgs/bison/template similarity index 100% rename from templates/bison/template rename to srcpkgs/bison/template diff --git a/templates/busybox-initramfs/dotconfig b/srcpkgs/busybox-initramfs/files/dotconfig similarity index 100% rename from templates/busybox-initramfs/dotconfig rename to srcpkgs/busybox-initramfs/files/dotconfig diff --git a/templates/busybox-initramfs/template b/srcpkgs/busybox-initramfs/template similarity index 94% rename from templates/busybox-initramfs/template rename to srcpkgs/busybox-initramfs/template index accb3312dad..32f96f24adc 100644 --- a/templates/busybox-initramfs/template +++ b/srcpkgs/busybox-initramfs/template @@ -26,5 +26,5 @@ Add_dependency full glibc pre_build() { - cp -f ${XBPS_TEMPLATESDIR}/${pkgname}/dotconfig ${wrksrc}/.config + cp -f ${FILESDIR}/dotconfig ${wrksrc}/.config } diff --git a/templates/bzip2-devel b/srcpkgs/bzip2-devel similarity index 100% rename from templates/bzip2-devel rename to srcpkgs/bzip2-devel diff --git a/templates/bzip2/devel.template b/srcpkgs/bzip2/bzip2-devel.template similarity index 100% rename from templates/bzip2/devel.template rename to srcpkgs/bzip2/bzip2-devel.template diff --git a/templates/bzip2/depends b/srcpkgs/bzip2/depends similarity index 100% rename from templates/bzip2/depends rename to srcpkgs/bzip2/depends diff --git a/templates/bzip2/patches/Makefile_fix_install.diff b/srcpkgs/bzip2/patches/Makefile_fix_install.diff similarity index 100% rename from templates/bzip2/patches/Makefile_fix_install.diff rename to srcpkgs/bzip2/patches/Makefile_fix_install.diff diff --git a/templates/bzip2/patches/Makefile_libbz2_so_fix_soname.diff b/srcpkgs/bzip2/patches/Makefile_libbz2_so_fix_soname.diff similarity index 100% rename from templates/bzip2/patches/Makefile_libbz2_so_fix_soname.diff rename to srcpkgs/bzip2/patches/Makefile_libbz2_so_fix_soname.diff diff --git a/templates/bzip2/template b/srcpkgs/bzip2/template similarity index 97% rename from templates/bzip2/template rename to srcpkgs/bzip2/template index a0ac1c7e06b..00114a6a4fb 100644 --- a/templates/bzip2/template +++ b/srcpkgs/bzip2/template @@ -24,6 +24,5 @@ long_desc=" predecessor, bzip (.bz)." base_chroot=yes -subpackages="devel" - +subpackages="bzip2-devel" Add_dependency run glibc diff --git a/templates/bzr/template b/srcpkgs/bzr/template similarity index 100% rename from templates/bzr/template rename to srcpkgs/bzr/template diff --git a/templates/bzrtools/template b/srcpkgs/bzrtools/template similarity index 100% rename from templates/bzrtools/template rename to srcpkgs/bzrtools/template diff --git a/templates/cairo-devel b/srcpkgs/cairo-devel similarity index 100% rename from templates/cairo-devel rename to srcpkgs/cairo-devel diff --git a/templates/cairo/devel.template b/srcpkgs/cairo/cairo-devel.template similarity index 100% rename from templates/cairo/devel.template rename to srcpkgs/cairo/cairo-devel.template diff --git a/templates/cairo/depends b/srcpkgs/cairo/depends similarity index 100% rename from templates/cairo/depends rename to srcpkgs/cairo/depends diff --git a/templates/cairo/template b/srcpkgs/cairo/template similarity index 98% rename from templates/cairo/template rename to srcpkgs/cairo/template index 5aa9843c20c..25bb20656cc 100644 --- a/templates/cairo/template +++ b/srcpkgs/cairo/template @@ -22,7 +22,7 @@ long_desc=" Bezier cubic splines, transforming and compositing translucent images, and antialiased text rendering." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full zlib diff --git a/templates/cdparanoia-devel b/srcpkgs/cdparanoia-devel similarity index 100% rename from templates/cdparanoia-devel rename to srcpkgs/cdparanoia-devel diff --git a/templates/cdparanoia/devel.template b/srcpkgs/cdparanoia/cdparanoia-devel.template similarity index 100% rename from templates/cdparanoia/devel.template rename to srcpkgs/cdparanoia/cdparanoia-devel.template diff --git a/templates/cdparanoia/depends b/srcpkgs/cdparanoia/depends similarity index 100% rename from templates/cdparanoia/depends rename to srcpkgs/cdparanoia/depends diff --git a/templates/cdparanoia/patches/gcc.diff b/srcpkgs/cdparanoia/patches/gcc.diff similarity index 100% rename from templates/cdparanoia/patches/gcc.diff rename to srcpkgs/cdparanoia/patches/gcc.diff diff --git a/templates/cdparanoia/template b/srcpkgs/cdparanoia/template similarity index 97% rename from templates/cdparanoia/template rename to srcpkgs/cdparanoia/template index 1481b65bd1a..68411ff8864 100644 --- a/templates/cdparanoia/template +++ b/srcpkgs/cdparanoia/template @@ -21,5 +21,5 @@ long_desc=" reconstruction capability." disable_parallel_build=yes -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/cdrtools/template b/srcpkgs/cdrtools/template similarity index 100% rename from templates/cdrtools/template rename to srcpkgs/cdrtools/template diff --git a/templates/cloog-ppl-devel b/srcpkgs/cloog-ppl-devel similarity index 100% rename from templates/cloog-ppl-devel rename to srcpkgs/cloog-ppl-devel diff --git a/templates/cloog-ppl/devel.template b/srcpkgs/cloog-ppl/cloog-ppl-devel.template similarity index 100% rename from templates/cloog-ppl/devel.template rename to srcpkgs/cloog-ppl/cloog-ppl-devel.template diff --git a/templates/cloog-ppl/depends b/srcpkgs/cloog-ppl/depends similarity index 100% rename from templates/cloog-ppl/depends rename to srcpkgs/cloog-ppl/depends diff --git a/templates/cloog-ppl/template b/srcpkgs/cloog-ppl/template similarity index 96% rename from templates/cloog-ppl/template rename to srcpkgs/cloog-ppl/template index efa8817cd21..cb1afeaebc6 100644 --- a/templates/cloog-ppl/template +++ b/srcpkgs/cloog-ppl/template @@ -14,7 +14,7 @@ long_desc=" designed to avoid control overhead and to produce a very efficient code." base_chroot=yes -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency run glibc Add_dependency full gmp ">=4.3.1_1" Add_dependency full ppl diff --git a/templates/cmake/template b/srcpkgs/cmake/template similarity index 100% rename from templates/cmake/template rename to srcpkgs/cmake/template diff --git a/templates/compositeproto/template b/srcpkgs/compositeproto/template similarity index 100% rename from templates/compositeproto/template rename to srcpkgs/compositeproto/template diff --git a/templates/coreutils/template b/srcpkgs/coreutils/template similarity index 100% rename from templates/coreutils/template rename to srcpkgs/coreutils/template diff --git a/templates/cpio/template b/srcpkgs/cpio/template similarity index 100% rename from templates/cpio/template rename to srcpkgs/cpio/template diff --git a/templates/cracklib-words/template b/srcpkgs/cracklib-words/template similarity index 100% rename from templates/cracklib-words/template rename to srcpkgs/cracklib-words/template diff --git a/templates/cracklib/depends b/srcpkgs/cracklib/depends similarity index 100% rename from templates/cracklib/depends rename to srcpkgs/cracklib/depends diff --git a/templates/cracklib/template b/srcpkgs/cracklib/template similarity index 100% rename from templates/cracklib/template rename to srcpkgs/cracklib/template diff --git a/templates/cronie/files/crond.logrotate b/srcpkgs/cronie/files/crond.logrotate similarity index 100% rename from templates/cronie/files/crond.logrotate rename to srcpkgs/cronie/files/crond.logrotate diff --git a/templates/cronie/files/crond.rc b/srcpkgs/cronie/files/crond.rc similarity index 100% rename from templates/cronie/files/crond.rc rename to srcpkgs/cronie/files/crond.rc diff --git a/templates/cronie/files/crontab b/srcpkgs/cronie/files/crontab similarity index 100% rename from templates/cronie/files/crontab rename to srcpkgs/cronie/files/crontab diff --git a/templates/cronie/patches/fix_pam_crond.diff b/srcpkgs/cronie/patches/fix_pam_crond.diff similarity index 100% rename from templates/cronie/patches/fix_pam_crond.diff rename to srcpkgs/cronie/patches/fix_pam_crond.diff diff --git a/templates/cronie/template b/srcpkgs/cronie/template similarity index 100% rename from templates/cronie/template rename to srcpkgs/cronie/template diff --git a/templates/curl-devel b/srcpkgs/curl-devel similarity index 100% rename from templates/curl-devel rename to srcpkgs/curl-devel diff --git a/templates/curl-libs b/srcpkgs/curl-libs similarity index 100% rename from templates/curl-libs rename to srcpkgs/curl-libs diff --git a/templates/curl/devel.template b/srcpkgs/curl/curl-devel.template similarity index 100% rename from templates/curl/devel.template rename to srcpkgs/curl/curl-devel.template diff --git a/templates/curl/libs.template b/srcpkgs/curl/curl-libs.template similarity index 100% rename from templates/curl/libs.template rename to srcpkgs/curl/curl-libs.template diff --git a/templates/curl/depends b/srcpkgs/curl/depends similarity index 100% rename from templates/curl/depends rename to srcpkgs/curl/depends diff --git a/templates/curl/template b/srcpkgs/curl/template similarity index 95% rename from templates/curl/template rename to srcpkgs/curl/template index c2df550b074..a96160268ba 100644 --- a/templates/curl/template +++ b/srcpkgs/curl/template @@ -14,8 +14,7 @@ long_desc=" kerberos...), file transfer resume, proxy tunneling and a busload of other useful tricks." -subpackages="devel libs" - +subpackages="$pkgname-devel $pkgname-libs" Add_dependency full glibc Add_dependency full libidn Add_dependency full zlib diff --git a/templates/damageproto/template b/srcpkgs/damageproto/template similarity index 100% rename from templates/damageproto/template rename to srcpkgs/damageproto/template diff --git a/templates/dash/INSTALL b/srcpkgs/dash/INSTALL similarity index 100% rename from templates/dash/INSTALL rename to srcpkgs/dash/INSTALL diff --git a/templates/dash/template b/srcpkgs/dash/template similarity index 100% rename from templates/dash/template rename to srcpkgs/dash/template diff --git a/templates/db-devel b/srcpkgs/db-devel similarity index 100% rename from templates/db-devel rename to srcpkgs/db-devel diff --git a/templates/db/devel.template b/srcpkgs/db/db-devel.template similarity index 100% rename from templates/db/devel.template rename to srcpkgs/db/db-devel.template diff --git a/templates/db/depends b/srcpkgs/db/depends similarity index 100% rename from templates/db/depends rename to srcpkgs/db/depends diff --git a/templates/db/template b/srcpkgs/db/template similarity index 95% rename from templates/db/template rename to srcpkgs/db/template index da8f20b5d35..eef739659c1 100644 --- a/templates/db/template +++ b/srcpkgs/db/template @@ -1,6 +1,7 @@ # Template file for 'db' pkgname=db version=4.8.24 +revision=1 wrksrc="db-${version}/build_unix" distfiles="http://download-uk.oracle.com/berkeley-db/db-${version}.tar.gz" build_style=gnu_configure @@ -36,10 +37,10 @@ long_desc=" records or requiring that new records be added only at the end of the database." -subpackages="devel" - +subpackages="db-devel" Add_dependency full glibc -Add_dependency full gcc-libstdc++ +Add_dependency build gcc +Add_dependency full libstdc++ post_install() { diff --git a/templates/dbus-devel b/srcpkgs/dbus-devel similarity index 100% rename from templates/dbus-devel rename to srcpkgs/dbus-devel diff --git a/templates/dbus-glib-devel b/srcpkgs/dbus-glib-devel similarity index 100% rename from templates/dbus-glib-devel rename to srcpkgs/dbus-glib-devel diff --git a/templates/dbus-glib/devel.template b/srcpkgs/dbus-glib/dbus-glib-devel.template similarity index 89% rename from templates/dbus-glib/devel.template rename to srcpkgs/dbus-glib/dbus-glib-devel.template index 99093bfb4c6..1a5088d9c03 100644 --- a/templates/dbus-glib/devel.template +++ b/srcpkgs/dbus-glib/dbus-glib-devel.template @@ -14,6 +14,5 @@ do_install() mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib } diff --git a/templates/dbus-glib/depends b/srcpkgs/dbus-glib/depends similarity index 100% rename from templates/dbus-glib/depends rename to srcpkgs/dbus-glib/depends diff --git a/templates/dbus-glib/template b/srcpkgs/dbus-glib/template similarity index 83% rename from templates/dbus-glib/template rename to srcpkgs/dbus-glib/template index fa539805caa..88573dfbd1a 100644 --- a/templates/dbus-glib/template +++ b/srcpkgs/dbus-glib/template @@ -1,8 +1,7 @@ # Template file for 'dbus-glib' pkgname=dbus-glib version=0.80 -distfiles=" -http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz" +distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-static=no --enable-bash-completion=no" short_desc="GLib bindings for D-Bus" @@ -12,7 +11,7 @@ long_desc=" D-Bus add-on library to integrate the standard D-Bus library with the GLib thread abstraction and main loop." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full glib Add_dependency build dbus diff --git a/templates/dbus-libs b/srcpkgs/dbus-libs similarity index 100% rename from templates/dbus-libs rename to srcpkgs/dbus-libs diff --git a/templates/dbus/INSTALL b/srcpkgs/dbus/INSTALL similarity index 100% rename from templates/dbus/INSTALL rename to srcpkgs/dbus/INSTALL diff --git a/templates/dbus/REMOVE b/srcpkgs/dbus/REMOVE similarity index 100% rename from templates/dbus/REMOVE rename to srcpkgs/dbus/REMOVE diff --git a/templates/dbus/devel.template b/srcpkgs/dbus/dbus-devel.template similarity index 100% rename from templates/dbus/devel.template rename to srcpkgs/dbus/dbus-devel.template diff --git a/templates/dbus/libs.template b/srcpkgs/dbus/dbus-libs.template similarity index 100% rename from templates/dbus/libs.template rename to srcpkgs/dbus/dbus-libs.template diff --git a/templates/dbus/depends b/srcpkgs/dbus/depends similarity index 100% rename from templates/dbus/depends rename to srcpkgs/dbus/depends diff --git a/templates/dbus/files/dbus.rc b/srcpkgs/dbus/files/dbus.rc similarity index 100% rename from templates/dbus/files/dbus.rc rename to srcpkgs/dbus/files/dbus.rc diff --git a/templates/dbus/template b/srcpkgs/dbus/template similarity index 96% rename from templates/dbus/template rename to srcpkgs/dbus/template index 6864a157d7c..6ad470c1240 100644 --- a/templates/dbus/template +++ b/srcpkgs/dbus/template @@ -23,7 +23,7 @@ long_desc=" keep_empty_dirs=yes conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" -subpackages="devel libs" +subpackages="$pkgname-devel $pkgname-libs" openrc_services="dbus default" Add_dependency full glibc diff --git a/templates/dejavu-fonts-ttf/template b/srcpkgs/dejavu-fonts-ttf/template similarity index 100% rename from templates/dejavu-fonts-ttf/template rename to srcpkgs/dejavu-fonts-ttf/template diff --git a/templates/desktop-file-utils/template b/srcpkgs/desktop-file-utils/template similarity index 100% rename from templates/desktop-file-utils/template rename to srcpkgs/desktop-file-utils/template diff --git a/templates/lvm2-device-mapper b/srcpkgs/device-mapper similarity index 100% rename from templates/lvm2-device-mapper rename to srcpkgs/device-mapper diff --git a/templates/dhcpcd-dbus/patches/fix_Makefile.diff b/srcpkgs/dhcpcd-dbus/patches/fix_Makefile.diff similarity index 100% rename from templates/dhcpcd-dbus/patches/fix_Makefile.diff rename to srcpkgs/dhcpcd-dbus/patches/fix_Makefile.diff diff --git a/templates/dhcpcd-dbus/template b/srcpkgs/dhcpcd-dbus/template similarity index 100% rename from templates/dhcpcd-dbus/template rename to srcpkgs/dhcpcd-dbus/template diff --git a/templates/dhcpcd-gtk/patches/fix_install.diff b/srcpkgs/dhcpcd-gtk/patches/fix_install.diff similarity index 100% rename from templates/dhcpcd-gtk/patches/fix_install.diff rename to srcpkgs/dhcpcd-gtk/patches/fix_install.diff diff --git a/templates/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template similarity index 100% rename from templates/dhcpcd-gtk/template rename to srcpkgs/dhcpcd-gtk/template diff --git a/templates/dhcpcd/files/dhcpcd.rc b/srcpkgs/dhcpcd/files/dhcpcd.rc similarity index 100% rename from templates/dhcpcd/files/dhcpcd.rc rename to srcpkgs/dhcpcd/files/dhcpcd.rc diff --git a/templates/dhcpcd/template b/srcpkgs/dhcpcd/template similarity index 100% rename from templates/dhcpcd/template rename to srcpkgs/dhcpcd/template diff --git a/templates/diffutils/template b/srcpkgs/diffutils/template similarity index 100% rename from templates/diffutils/template rename to srcpkgs/diffutils/template diff --git a/templates/dmidecode/template b/srcpkgs/dmidecode/template similarity index 100% rename from templates/dmidecode/template rename to srcpkgs/dmidecode/template diff --git a/templates/dmxproto/template b/srcpkgs/dmxproto/template similarity index 100% rename from templates/dmxproto/template rename to srcpkgs/dmxproto/template diff --git a/templates/docbook-xml/template b/srcpkgs/docbook-xml/template similarity index 100% rename from templates/docbook-xml/template rename to srcpkgs/docbook-xml/template diff --git a/templates/docbook-xsl/template b/srcpkgs/docbook-xsl/template similarity index 100% rename from templates/docbook-xsl/template rename to srcpkgs/docbook-xsl/template diff --git a/templates/dri2proto/template b/srcpkgs/dri2proto/template similarity index 100% rename from templates/dri2proto/template rename to srcpkgs/dri2proto/template diff --git a/templates/e2fsprogs-devel b/srcpkgs/e2fsprogs-devel similarity index 100% rename from templates/e2fsprogs-devel rename to srcpkgs/e2fsprogs-devel diff --git a/templates/e2fsprogs-libs b/srcpkgs/e2fsprogs-libs similarity index 100% rename from templates/e2fsprogs-libs rename to srcpkgs/e2fsprogs-libs diff --git a/templates/e2fsprogs/depends b/srcpkgs/e2fsprogs/depends similarity index 100% rename from templates/e2fsprogs/depends rename to srcpkgs/e2fsprogs/depends diff --git a/templates/e2fsprogs/devel.template b/srcpkgs/e2fsprogs/e2fsprogs-devel.template similarity index 100% rename from templates/e2fsprogs/devel.template rename to srcpkgs/e2fsprogs/e2fsprogs-devel.template diff --git a/templates/e2fsprogs/libs.template b/srcpkgs/e2fsprogs/e2fsprogs-libs.template similarity index 100% rename from templates/e2fsprogs/libs.template rename to srcpkgs/e2fsprogs/e2fsprogs-libs.template diff --git a/templates/e2fsprogs/template b/srcpkgs/e2fsprogs/template similarity index 96% rename from templates/e2fsprogs/template rename to srcpkgs/e2fsprogs/template index 2fabdc69d15..0cc5fcc9bf3 100644 --- a/templates/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -14,7 +14,7 @@ long_desc=" It provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3 filesystem with journaling support." -subpackages="devel libs" +subpackages="$pkgname-devel $pkgname-libs" conf_files="/etc/mke2fs.conf" Add_dependency run glibc Add_dependency run e2fsprogs-libs diff --git a/templates/eject/template b/srcpkgs/eject/template similarity index 100% rename from templates/eject/template rename to srcpkgs/eject/template diff --git a/templates/enchant-devel b/srcpkgs/enchant-devel similarity index 100% rename from templates/enchant-devel rename to srcpkgs/enchant-devel diff --git a/templates/enchant/depends b/srcpkgs/enchant/depends similarity index 100% rename from templates/enchant/depends rename to srcpkgs/enchant/depends diff --git a/templates/enchant/devel.template b/srcpkgs/enchant/enchant-devel.template similarity index 100% rename from templates/enchant/devel.template rename to srcpkgs/enchant/enchant-devel.template diff --git a/templates/enchant/template b/srcpkgs/enchant/template similarity index 98% rename from templates/enchant/template rename to srcpkgs/enchant/template index f4313e47744..581983b97f5 100644 --- a/templates/enchant/template +++ b/srcpkgs/enchant/template @@ -31,7 +31,7 @@ long_desc=" shouldn't even need to know this information itself. To accomplish this, all of Enchant's providers are DLLs." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full aspell diff --git a/templates/encodings/template b/srcpkgs/encodings/template similarity index 100% rename from templates/encodings/template rename to srcpkgs/encodings/template diff --git a/templates/epdfview/template b/srcpkgs/epdfview/template similarity index 94% rename from templates/epdfview/template rename to srcpkgs/epdfview/template index 036f689b8e6..3dcf10bb93c 100644 --- a/templates/epdfview/template +++ b/srcpkgs/epdfview/template @@ -1,7 +1,7 @@ # Template build file for 'epdfview'. pkgname=epdfview version=0.1.7 -revision=1 +revision=2 distfiles=" http://trac.emma-soft.com/epdfview/chrome/site/releases/$pkgname-$version.tar.bz2" build_style=gnu_configure @@ -21,4 +21,4 @@ Add_dependency full gtk+ Add_dependency full desktop-file-utils Add_dependency build poppler Add_dependency run poppler-glib -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ diff --git a/templates/evieext/template b/srcpkgs/evieext/template similarity index 100% rename from templates/evieext/template rename to srcpkgs/evieext/template diff --git a/templates/exo-devel b/srcpkgs/exo-devel similarity index 100% rename from templates/exo-devel rename to srcpkgs/exo-devel diff --git a/templates/exo/depends b/srcpkgs/exo/depends similarity index 100% rename from templates/exo/depends rename to srcpkgs/exo/depends diff --git a/templates/exo/devel.template b/srcpkgs/exo/exo-devel.template similarity index 100% rename from templates/exo/devel.template rename to srcpkgs/exo/exo-devel.template diff --git a/templates/exo/template b/srcpkgs/exo/template similarity index 97% rename from templates/exo/template rename to srcpkgs/exo/template index ee37c903e3c..bed00b50824 100644 --- a/templates/exo/template +++ b/srcpkgs/exo/template @@ -14,7 +14,7 @@ conf_files="/etc/xdg/xfce4/helpers.rc" gtk_iconcache_dirs="/usr/share/icons/hicolor" triggers="gtk-icon-cache" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency build perl-URI diff --git a/templates/expat-devel b/srcpkgs/expat-devel similarity index 100% rename from templates/expat-devel rename to srcpkgs/expat-devel diff --git a/templates/expat/depends b/srcpkgs/expat/depends similarity index 100% rename from templates/expat/depends rename to srcpkgs/expat/depends diff --git a/templates/expat/devel.template b/srcpkgs/expat/expat-devel.template similarity index 100% rename from templates/expat/devel.template rename to srcpkgs/expat/expat-devel.template diff --git a/templates/expat/template b/srcpkgs/expat/template similarity index 94% rename from templates/expat/template rename to srcpkgs/expat/template index 2aab0a250dd..71a5468d074 100644 --- a/templates/expat/template +++ b/srcpkgs/expat/template @@ -11,6 +11,5 @@ long_desc=" oriented parser that requires setting handlers to deal with the structure that the parser discovers in the document." -subpackages="devel" - +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/fakeroot/template b/srcpkgs/fakeroot/template similarity index 100% rename from templates/fakeroot/template rename to srcpkgs/fakeroot/template diff --git a/templates/file-devel b/srcpkgs/file-devel similarity index 100% rename from templates/file-devel rename to srcpkgs/file-devel diff --git a/templates/file/depends b/srcpkgs/file/depends similarity index 100% rename from templates/file/depends rename to srcpkgs/file/depends diff --git a/templates/file/devel.template b/srcpkgs/file/file-devel.template similarity index 100% rename from templates/file/devel.template rename to srcpkgs/file/file-devel.template diff --git a/templates/file/template b/srcpkgs/file/template similarity index 95% rename from templates/file/template rename to srcpkgs/file/template index 3abcfb791fa..4681fec999d 100644 --- a/templates/file/template +++ b/srcpkgs/file/template @@ -11,7 +11,7 @@ long_desc=" a description if a match is found." base_chroot=yes -subpackages="devel" +subpackages="file-devel" Add_dependency run glibc Add_dependency full zlib diff --git a/templates/findutils/files/updatedb.cron-daily b/srcpkgs/findutils/files/updatedb.cron-daily similarity index 100% rename from templates/findutils/files/updatedb.cron-daily rename to srcpkgs/findutils/files/updatedb.cron-daily diff --git a/templates/findutils/template b/srcpkgs/findutils/template similarity index 100% rename from templates/findutils/template rename to srcpkgs/findutils/template diff --git a/templates/firefox/template b/srcpkgs/firefox/template similarity index 100% rename from templates/firefox/template rename to srcpkgs/firefox/template diff --git a/templates/fixesproto/template b/srcpkgs/fixesproto/template similarity index 100% rename from templates/fixesproto/template rename to srcpkgs/fixesproto/template diff --git a/templates/flex/template b/srcpkgs/flex/template similarity index 100% rename from templates/flex/template rename to srcpkgs/flex/template diff --git a/templates/font-adobe-100dpi/template b/srcpkgs/font-adobe-100dpi/template similarity index 100% rename from templates/font-adobe-100dpi/template rename to srcpkgs/font-adobe-100dpi/template diff --git a/templates/font-adobe-75dpi/template b/srcpkgs/font-adobe-75dpi/template similarity index 100% rename from templates/font-adobe-75dpi/template rename to srcpkgs/font-adobe-75dpi/template diff --git a/templates/font-adobe-utopia-100dpi/template b/srcpkgs/font-adobe-utopia-100dpi/template similarity index 100% rename from templates/font-adobe-utopia-100dpi/template rename to srcpkgs/font-adobe-utopia-100dpi/template diff --git a/templates/font-adobe-utopia-75dpi/template b/srcpkgs/font-adobe-utopia-75dpi/template similarity index 100% rename from templates/font-adobe-utopia-75dpi/template rename to srcpkgs/font-adobe-utopia-75dpi/template diff --git a/templates/font-adobe-utopia-type1/template b/srcpkgs/font-adobe-utopia-type1/template similarity index 100% rename from templates/font-adobe-utopia-type1/template rename to srcpkgs/font-adobe-utopia-type1/template diff --git a/templates/font-alias/template b/srcpkgs/font-alias/template similarity index 100% rename from templates/font-alias/template rename to srcpkgs/font-alias/template diff --git a/templates/font-bh-100dpi/template b/srcpkgs/font-bh-100dpi/template similarity index 100% rename from templates/font-bh-100dpi/template rename to srcpkgs/font-bh-100dpi/template diff --git a/templates/font-bh-75dpi/template b/srcpkgs/font-bh-75dpi/template similarity index 100% rename from templates/font-bh-75dpi/template rename to srcpkgs/font-bh-75dpi/template diff --git a/templates/font-bh-lucidatypewriter-100dpi/template b/srcpkgs/font-bh-lucidatypewriter-100dpi/template similarity index 100% rename from templates/font-bh-lucidatypewriter-100dpi/template rename to srcpkgs/font-bh-lucidatypewriter-100dpi/template diff --git a/templates/font-bh-lucidatypewriter-75dpi/template b/srcpkgs/font-bh-lucidatypewriter-75dpi/template similarity index 100% rename from templates/font-bh-lucidatypewriter-75dpi/template rename to srcpkgs/font-bh-lucidatypewriter-75dpi/template diff --git a/templates/font-bh-ttf/template b/srcpkgs/font-bh-ttf/template similarity index 100% rename from templates/font-bh-ttf/template rename to srcpkgs/font-bh-ttf/template diff --git a/templates/font-bh-type1/template b/srcpkgs/font-bh-type1/template similarity index 100% rename from templates/font-bh-type1/template rename to srcpkgs/font-bh-type1/template diff --git a/templates/font-bitstream-100dpi/template b/srcpkgs/font-bitstream-100dpi/template similarity index 100% rename from templates/font-bitstream-100dpi/template rename to srcpkgs/font-bitstream-100dpi/template diff --git a/templates/font-bitstream-75dpi/template b/srcpkgs/font-bitstream-75dpi/template similarity index 100% rename from templates/font-bitstream-75dpi/template rename to srcpkgs/font-bitstream-75dpi/template diff --git a/templates/font-bitstream-speedo/template b/srcpkgs/font-bitstream-speedo/template similarity index 100% rename from templates/font-bitstream-speedo/template rename to srcpkgs/font-bitstream-speedo/template diff --git a/templates/font-bitstream-type1/template b/srcpkgs/font-bitstream-type1/template similarity index 100% rename from templates/font-bitstream-type1/template rename to srcpkgs/font-bitstream-type1/template diff --git a/templates/font-cursor-misc/template b/srcpkgs/font-cursor-misc/template similarity index 100% rename from templates/font-cursor-misc/template rename to srcpkgs/font-cursor-misc/template diff --git a/templates/font-daewoo-misc/template b/srcpkgs/font-daewoo-misc/template similarity index 100% rename from templates/font-daewoo-misc/template rename to srcpkgs/font-daewoo-misc/template diff --git a/templates/font-dec-misc/template b/srcpkgs/font-dec-misc/template similarity index 100% rename from templates/font-dec-misc/template rename to srcpkgs/font-dec-misc/template diff --git a/templates/font-ibm-type1/template b/srcpkgs/font-ibm-type1/template similarity index 100% rename from templates/font-ibm-type1/template rename to srcpkgs/font-ibm-type1/template diff --git a/templates/font-isas-misc/template b/srcpkgs/font-isas-misc/template similarity index 100% rename from templates/font-isas-misc/template rename to srcpkgs/font-isas-misc/template diff --git a/templates/font-jis-misc/template b/srcpkgs/font-jis-misc/template similarity index 100% rename from templates/font-jis-misc/template rename to srcpkgs/font-jis-misc/template diff --git a/templates/font-misc-misc/template b/srcpkgs/font-misc-misc/template similarity index 100% rename from templates/font-misc-misc/template rename to srcpkgs/font-misc-misc/template diff --git a/templates/font-mutt-misc/template b/srcpkgs/font-mutt-misc/template similarity index 100% rename from templates/font-mutt-misc/template rename to srcpkgs/font-mutt-misc/template diff --git a/templates/font-sony-misc/template b/srcpkgs/font-sony-misc/template similarity index 100% rename from templates/font-sony-misc/template rename to srcpkgs/font-sony-misc/template diff --git a/templates/font-util/template b/srcpkgs/font-util/template similarity index 100% rename from templates/font-util/template rename to srcpkgs/font-util/template diff --git a/templates/fontcacheproto/template b/srcpkgs/fontcacheproto/template similarity index 100% rename from templates/fontcacheproto/template rename to srcpkgs/fontcacheproto/template diff --git a/templates/fontconfig-devel b/srcpkgs/fontconfig-devel similarity index 100% rename from templates/fontconfig-devel rename to srcpkgs/fontconfig-devel diff --git a/templates/fontconfig/INSTALL b/srcpkgs/fontconfig/INSTALL similarity index 100% rename from templates/fontconfig/INSTALL rename to srcpkgs/fontconfig/INSTALL diff --git a/templates/fontconfig/depends b/srcpkgs/fontconfig/depends similarity index 100% rename from templates/fontconfig/depends rename to srcpkgs/fontconfig/depends diff --git a/templates/fontconfig/devel.template b/srcpkgs/fontconfig/fontconfig-devel.template similarity index 100% rename from templates/fontconfig/devel.template rename to srcpkgs/fontconfig/fontconfig-devel.template diff --git a/templates/fontconfig/patches/dont_run_fccache.diff b/srcpkgs/fontconfig/patches/dont_run_fccache.diff similarity index 100% rename from templates/fontconfig/patches/dont_run_fccache.diff rename to srcpkgs/fontconfig/patches/dont_run_fccache.diff diff --git a/templates/fontconfig/template b/srcpkgs/fontconfig/template similarity index 98% rename from templates/fontconfig/template rename to srcpkgs/fontconfig/template index 47f479262de..34a63067c39 100644 --- a/templates/fontconfig/template +++ b/srcpkgs/fontconfig/template @@ -34,7 +34,7 @@ long_desc=" applications do not have such dependencies." conf_files="/etc/fonts/fonts.conf" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full expat diff --git a/templates/fontsproto/template b/srcpkgs/fontsproto/template similarity index 100% rename from templates/fontsproto/template rename to srcpkgs/fontsproto/template diff --git a/templates/freeglut/freeglut-src-Makefile-in.diff b/srcpkgs/freeglut/freeglut-src-Makefile-in.diff similarity index 100% rename from templates/freeglut/freeglut-src-Makefile-in.diff rename to srcpkgs/freeglut/freeglut-src-Makefile-in.diff diff --git a/templates/freeglut/template b/srcpkgs/freeglut/template similarity index 100% rename from templates/freeglut/template rename to srcpkgs/freeglut/template diff --git a/templates/freetype-devel b/srcpkgs/freetype-devel similarity index 100% rename from templates/freetype-devel rename to srcpkgs/freetype-devel diff --git a/templates/freetype/depends b/srcpkgs/freetype/depends similarity index 100% rename from templates/freetype/depends rename to srcpkgs/freetype/depends diff --git a/templates/freetype/devel.template b/srcpkgs/freetype/freetype-devel.template similarity index 100% rename from templates/freetype/devel.template rename to srcpkgs/freetype/freetype-devel.template diff --git a/templates/freetype/template b/srcpkgs/freetype/template similarity index 96% rename from templates/freetype/template rename to srcpkgs/freetype/template index 370624beed6..12a2bc1ce2a 100644 --- a/templates/freetype/template +++ b/srcpkgs/freetype/template @@ -17,7 +17,7 @@ long_desc=" * Even more portable * An improved anti-aliasing algorithm" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full zlib diff --git a/templates/gamin-devel b/srcpkgs/gamin-devel similarity index 100% rename from templates/gamin-devel rename to srcpkgs/gamin-devel diff --git a/templates/gamin-python b/srcpkgs/gamin-python similarity index 100% rename from templates/gamin-python rename to srcpkgs/gamin-python diff --git a/templates/gamin/depends b/srcpkgs/gamin/depends similarity index 100% rename from templates/gamin/depends rename to srcpkgs/gamin/depends diff --git a/templates/gamin/devel.template b/srcpkgs/gamin/gamin-devel.template similarity index 100% rename from templates/gamin/devel.template rename to srcpkgs/gamin/gamin-devel.template diff --git a/templates/gamin/python.template b/srcpkgs/gamin/gamin-python.template similarity index 100% rename from templates/gamin/python.template rename to srcpkgs/gamin/gamin-python.template diff --git a/templates/gamin/template b/srcpkgs/gamin/template similarity index 94% rename from templates/gamin/template rename to srcpkgs/gamin/template index acfa3b8089c..4cd0d676b8d 100644 --- a/templates/gamin/template +++ b/srcpkgs/gamin/template @@ -13,7 +13,7 @@ long_desc=" monitor mechanism compatible with FAM but not dependent on a system wide daemon." -subpackages="devel python" +subpackages="$pkgname-devel $pkgname-python" Add_dependency build pkg-config Add_dependency build python Add_dependency full glibc diff --git a/templates/gawk/template b/srcpkgs/gawk/template similarity index 100% rename from templates/gawk/template rename to srcpkgs/gawk/template diff --git a/templates/gcc-c++ b/srcpkgs/gcc-c++ similarity index 100% rename from templates/gcc-c++ rename to srcpkgs/gcc-c++ diff --git a/templates/gcc-multilib/template b/srcpkgs/gcc-multilib/template similarity index 100% rename from templates/gcc-multilib/template rename to srcpkgs/gcc-multilib/template diff --git a/templates/gcc-objc b/srcpkgs/gcc-objc similarity index 100% rename from templates/gcc-objc rename to srcpkgs/gcc-objc diff --git a/templates/gcc-objc++ b/srcpkgs/gcc-objc++ similarity index 100% rename from templates/gcc-objc++ rename to srcpkgs/gcc-objc++ diff --git a/templates/gcc/depends b/srcpkgs/gcc/depends similarity index 100% rename from templates/gcc/depends rename to srcpkgs/gcc/depends diff --git a/templates/gcc/c++.template b/srcpkgs/gcc/gcc-c++.template similarity index 93% rename from templates/gcc/c++.template rename to srcpkgs/gcc/gcc-c++.template index 19029de3505..1a33cec7511 100644 --- a/templates/gcc/c++.template +++ b/srcpkgs/gcc/gcc-c++.template @@ -5,8 +5,12 @@ long_desc="${long_desc} This package contains GCC C++ support." +revision=1 + Add_dependency run gcc -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++-devel + +revision=1 do_install() { diff --git a/templates/gcc/objc++.template b/srcpkgs/gcc/gcc-objc++.template similarity index 100% rename from templates/gcc/objc++.template rename to srcpkgs/gcc/gcc-objc++.template diff --git a/templates/gcc/objc.template b/srcpkgs/gcc/gcc-objc.template similarity index 95% rename from templates/gcc/objc.template rename to srcpkgs/gcc/gcc-objc.template index cf5bbfc2325..315689cc762 100644 --- a/templates/gcc/objc.template +++ b/srcpkgs/gcc/gcc-objc.template @@ -8,7 +8,9 @@ long_desc="${long_desc} Add_dependency run gmp Add_dependency run mpfr Add_dependency run gcc -Add_dependency run gcc-libobjc +Add_dependency run libobjc + +revision=1 do_install() { diff --git a/templates/gcc/libgcc.template b/srcpkgs/gcc/libgcc.template similarity index 89% rename from templates/gcc/libgcc.template rename to srcpkgs/gcc/libgcc.template index 92cdd572b43..01aa4ed7b73 100644 --- a/templates/gcc/libgcc.template +++ b/srcpkgs/gcc/libgcc.template @@ -5,6 +5,9 @@ long_desc="${long_desc} This package contains the GCC shared library." +replaces="gcc-libgcc" +revision=1 + do_install() { mkdir -p ${DESTDIR}/usr/lib diff --git a/templates/gcc/libgomp.template b/srcpkgs/gcc/libgomp.template similarity index 88% rename from templates/gcc/libgomp.template rename to srcpkgs/gcc/libgomp.template index 74bd3dd0d35..650c03e82f7 100644 --- a/templates/gcc/libgomp.template +++ b/srcpkgs/gcc/libgomp.template @@ -7,7 +7,10 @@ long_desc="${long_desc} for OpenMP v3.0 support." Add_dependency run glibc -Add_dependency run gcc-libgcc +Add_dependency run libgcc + +replaces="gcc-libgomp" +revision=1 do_install() { diff --git a/templates/gcc/libmudflap-devel.template b/srcpkgs/gcc/libmudflap-devel.template similarity index 85% rename from templates/gcc/libmudflap-devel.template rename to srcpkgs/gcc/libmudflap-devel.template index e62afee7f97..c79b03a710b 100644 --- a/templates/gcc/libmudflap-devel.template +++ b/srcpkgs/gcc/libmudflap-devel.template @@ -6,7 +6,10 @@ long_desc="${long_desc} This package contains GCC mudflap headers and static libraries for building mudflap-instrumented programs." -Add_dependency run gcc-libmudflap +Add_dependency run libmudflap + +replaces="gcc-libmudflap-devel" +revision=1 do_install() { diff --git a/templates/gcc/libmudflap.template b/srcpkgs/gcc/libmudflap.template similarity index 84% rename from templates/gcc/libmudflap.template rename to srcpkgs/gcc/libmudflap.template index 1626ec0f643..665f996303c 100644 --- a/templates/gcc/libmudflap.template +++ b/srcpkgs/gcc/libmudflap.template @@ -7,7 +7,10 @@ long_desc="${long_desc} for mudflap support." Add_dependency run glibc -Add_dependency run gcc-libgcc +Add_dependency run libgcc + +replaces="gcc-libmudflap" +revision=1 do_install() { diff --git a/templates/gcc/libobjc-devel.template b/srcpkgs/gcc/libobjc-devel.template similarity index 85% rename from templates/gcc/libobjc-devel.template rename to srcpkgs/gcc/libobjc-devel.template index 3cec073c0a9..16bce1489d4 100644 --- a/templates/gcc/libobjc-devel.template +++ b/srcpkgs/gcc/libobjc-devel.template @@ -6,7 +6,10 @@ long_desc="${long_desc} This package contains GCC Objective-C headers and static libs, to build Objective-C programs." -Add_dependency run gcc-libobjc +Add_dependency run libobjc + +replaces="gcc-libobjc-devel" +revision=1 do_install() { diff --git a/templates/gcc/libobjc.template b/srcpkgs/gcc/libobjc.template similarity index 86% rename from templates/gcc/libobjc.template rename to srcpkgs/gcc/libobjc.template index 47e02212363..0c0dffe9fd5 100644 --- a/templates/gcc/libobjc.template +++ b/srcpkgs/gcc/libobjc.template @@ -7,7 +7,10 @@ long_desc="${long_desc} to run Objective-C dynamically linked programs." Add_dependency run glibc -Add_dependency run gcc-libgcc +Add_dependency run libgcc + +replaces="gcc-libobjc" +revision=1 do_install() { diff --git a/templates/gcc/libstdc++-devel.template b/srcpkgs/gcc/libstdc++-devel.template similarity index 88% rename from templates/gcc/libstdc++-devel.template rename to srcpkgs/gcc/libstdc++-devel.template index 8571cb50e5d..e444be524b3 100644 --- a/templates/gcc/libstdc++-devel.template +++ b/srcpkgs/gcc/libstdc++-devel.template @@ -6,7 +6,10 @@ long_desc="${long_desc} This package contains GCC Header files and libraries for C++ development." -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ + +replaces="gcc-libstdc++-devel" +revision=1 do_install() { diff --git a/templates/gcc/libstdc++.template b/srcpkgs/gcc/libstdc++.template similarity index 91% rename from templates/gcc/libstdc++.template rename to srcpkgs/gcc/libstdc++.template index d695e56da5b..04eb79e8f3a 100644 --- a/templates/gcc/libstdc++.template +++ b/srcpkgs/gcc/libstdc++.template @@ -7,7 +7,10 @@ long_desc="${long_desc} C++ library." Add_dependency run glibc -Add_dependency run gcc-libgcc +Add_dependency run libgcc + +replaces="gcc-libstdc++" +revision=1 do_install() { diff --git a/templates/gcc/template b/srcpkgs/gcc/template similarity index 92% rename from templates/gcc/template rename to srcpkgs/gcc/template index a17e3ba0e10..3f33b96325a 100644 --- a/templates/gcc/template +++ b/srcpkgs/gcc/template @@ -1,7 +1,7 @@ # Template build file for 'gcc' pkgname=gcc version=4.4.2 -revision=1 +revision=2 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-clocale=gnu --disable-bootstrap @@ -19,14 +19,14 @@ long_desc=" base_chroot=yes subpackages="libgcc libstdc++ libstdc++-devel libgomp libmudflap" subpackages="${subpackages} libmudflap-devel libobjc libobjc-devel" -subpackages="${subpackages} c++ objc objc++" +subpackages="${subpackages} gcc-c++ gcc-objc gcc-objc++" Add_dependency full gmp Add_dependency full mpfr Add_dependency full binutils Add_dependency full cloog-ppl -Add_dependency run gcc-libgcc -Add_dependency run gcc-libgomp +Add_dependency run libgcc +Add_dependency run libgomp Add_dependency run glibc-devel # As specified in the LFS book, disable installing libiberty. diff --git a/templates/gd-devel b/srcpkgs/gd-devel similarity index 100% rename from templates/gd-devel rename to srcpkgs/gd-devel diff --git a/templates/gd-progs b/srcpkgs/gd-progs similarity index 100% rename from templates/gd-progs rename to srcpkgs/gd-progs diff --git a/templates/gd/depends b/srcpkgs/gd/depends similarity index 100% rename from templates/gd/depends rename to srcpkgs/gd/depends diff --git a/templates/gd/devel.template b/srcpkgs/gd/gd-devel.template similarity index 100% rename from templates/gd/devel.template rename to srcpkgs/gd/gd-devel.template diff --git a/templates/gd/progs.template b/srcpkgs/gd/gd-progs.template similarity index 100% rename from templates/gd/progs.template rename to srcpkgs/gd/gd-progs.template diff --git a/templates/gd/template b/srcpkgs/gd/template similarity index 96% rename from templates/gd/template rename to srcpkgs/gd/template index 259fddc1eac..3eebab433f1 100644 --- a/templates/gd/template +++ b/srcpkgs/gd/template @@ -24,7 +24,7 @@ long_desc=" graphics package, but incorporates most of the commonly requested features for an 8-bit 2D package." -subpackages="devel progs" +subpackages="$pkgname-devel $pkgname-progs" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full zlib diff --git a/templates/gdb/template b/srcpkgs/gdb/template similarity index 100% rename from templates/gdb/template rename to srcpkgs/gdb/template diff --git a/templates/gdbm-devel b/srcpkgs/gdbm-devel similarity index 100% rename from templates/gdbm-devel rename to srcpkgs/gdbm-devel diff --git a/templates/gdbm/depends b/srcpkgs/gdbm/depends similarity index 100% rename from templates/gdbm/depends rename to srcpkgs/gdbm/depends diff --git a/templates/gdbm/devel.template b/srcpkgs/gdbm/gdbm-devel.template similarity index 100% rename from templates/gdbm/devel.template rename to srcpkgs/gdbm/gdbm-devel.template diff --git a/templates/gdbm/patches/fix_installation.diff b/srcpkgs/gdbm/patches/fix_installation.diff similarity index 100% rename from templates/gdbm/patches/fix_installation.diff rename to srcpkgs/gdbm/patches/fix_installation.diff diff --git a/templates/gdbm/template b/srcpkgs/gdbm/template similarity index 96% rename from templates/gdbm/template rename to srcpkgs/gdbm/template index 05743ab80a5..538cc644be8 100644 --- a/templates/gdbm/template +++ b/srcpkgs/gdbm/template @@ -11,7 +11,7 @@ long_desc=" GNU dbm is a set of database routines that use extensible hashing. It works similar to the standard Unix dbm routines." -subpackages="devel" +subpackages="gdbm-devel" Add_dependency full glibc post_build() diff --git a/templates/gegl-devel b/srcpkgs/gegl-devel similarity index 100% rename from templates/gegl-devel rename to srcpkgs/gegl-devel diff --git a/templates/gegl/depends b/srcpkgs/gegl/depends similarity index 100% rename from templates/gegl/depends rename to srcpkgs/gegl/depends diff --git a/templates/gegl/devel.template b/srcpkgs/gegl/gegl-devel.template similarity index 100% rename from templates/gegl/devel.template rename to srcpkgs/gegl/gegl-devel.template diff --git a/templates/gegl/template b/srcpkgs/gegl/template similarity index 96% rename from templates/gegl/template rename to srcpkgs/gegl/template index eb9f634b64b..801859070b6 100644 --- a/templates/gegl/template +++ b/srcpkgs/gegl/template @@ -16,7 +16,7 @@ long_desc=" support for a wide range of color models and pixel storage formats for input and output." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full babl Add_dependency full libpng diff --git a/templates/gettext-devel b/srcpkgs/gettext-devel similarity index 100% rename from templates/gettext-devel rename to srcpkgs/gettext-devel diff --git a/templates/gettext-libs b/srcpkgs/gettext-libs similarity index 100% rename from templates/gettext-libs rename to srcpkgs/gettext-libs diff --git a/templates/gettext/depends b/srcpkgs/gettext/depends similarity index 100% rename from templates/gettext/depends rename to srcpkgs/gettext/depends diff --git a/templates/gettext/devel.template b/srcpkgs/gettext/gettext-devel.template similarity index 100% rename from templates/gettext/devel.template rename to srcpkgs/gettext/gettext-devel.template diff --git a/templates/gettext/libs.template b/srcpkgs/gettext/gettext-libs.template similarity index 100% rename from templates/gettext/libs.template rename to srcpkgs/gettext/gettext-libs.template diff --git a/templates/gettext/patches/disable_examples_install.diff b/srcpkgs/gettext/patches/disable_examples_install.diff similarity index 100% rename from templates/gettext/patches/disable_examples_install.diff rename to srcpkgs/gettext/patches/disable_examples_install.diff diff --git a/templates/gettext/patches/fix_open_mode.diff b/srcpkgs/gettext/patches/fix_open_mode.diff similarity index 100% rename from templates/gettext/patches/fix_open_mode.diff rename to srcpkgs/gettext/patches/fix_open_mode.diff diff --git a/templates/gettext/template b/srcpkgs/gettext/template similarity index 94% rename from templates/gettext/template rename to srcpkgs/gettext/template index ce90059c984..4946a4121d9 100644 --- a/templates/gettext/template +++ b/srcpkgs/gettext/template @@ -13,7 +13,7 @@ long_desc=" messages in different languages, as one of the steps to internationalisation (or i18n) of a utility." -subpackages="devel libs" +subpackages="$pkgname-devel $pkgname-libs" Add_dependency run glibc Add_dependency build ncurses Add_dependency run ncurses-libs diff --git a/templates/gimp-devel b/srcpkgs/gimp-devel similarity index 100% rename from templates/gimp-devel rename to srcpkgs/gimp-devel diff --git a/templates/gimp/depends b/srcpkgs/gimp/depends similarity index 100% rename from templates/gimp/depends rename to srcpkgs/gimp/depends diff --git a/templates/gimp/devel.template b/srcpkgs/gimp/gimp-devel.template similarity index 100% rename from templates/gimp/devel.template rename to srcpkgs/gimp/gimp-devel.template diff --git a/templates/gimp/template b/srcpkgs/gimp/template similarity index 98% rename from templates/gimp/template rename to srcpkgs/gimp/template index d92e017e1d6..c41869e7795 100644 --- a/templates/gimp/template +++ b/srcpkgs/gimp/template @@ -27,7 +27,7 @@ conf_files="/etc/gimp/2.0/unitrc /etc/gimp/2.0/gimprc /etc/gimp/2.0/controllerrc" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build intltool Add_dependency build pkg-config Add_dependency build curl diff --git a/templates/git-perl b/srcpkgs/git-perl similarity index 100% rename from templates/git-perl rename to srcpkgs/git-perl diff --git a/templates/git/perl.template b/srcpkgs/git/git-perl.template similarity index 100% rename from templates/git/perl.template rename to srcpkgs/git/git-perl.template diff --git a/templates/git/template b/srcpkgs/git/template similarity index 97% rename from templates/git/template rename to srcpkgs/git/template index 8ffc5fcd6c5..c0e0a09956e 100644 --- a/templates/git/template +++ b/srcpkgs/git/template @@ -18,7 +18,7 @@ long_desc=" GIT working directory is a full-fledged repository with full revision tracking capabilities, not dependent on network access to a central server." -subpackages="perl" +subpackages="$pkgname-perl" Add_dependency full glibc Add_dependency full zlib Add_dependency full expat diff --git a/templates/gkrellm/template b/srcpkgs/gkrellm/template similarity index 100% rename from templates/gkrellm/template rename to srcpkgs/gkrellm/template diff --git a/templates/glib-devel b/srcpkgs/glib-devel similarity index 100% rename from templates/glib-devel rename to srcpkgs/glib-devel diff --git a/templates/glib/depends b/srcpkgs/glib/depends similarity index 100% rename from templates/glib/depends rename to srcpkgs/glib/depends diff --git a/templates/glib/devel.template b/srcpkgs/glib/glib-devel.template similarity index 100% rename from templates/glib/devel.template rename to srcpkgs/glib/glib-devel.template diff --git a/templates/glib/template b/srcpkgs/glib/template similarity index 96% rename from templates/glib/template rename to srcpkgs/glib/template index 3fa5e4fb203..75620a97bae 100644 --- a/templates/glib/template +++ b/srcpkgs/glib/template @@ -12,8 +12,7 @@ long_desc=" as trees, hashes, lists and strings. It is a useful general purpose C library used by projects such as GTK+, GIMP and GNOME." -subpackages="devel" - +subpackages="glib-devel" Add_dependency full glibc Add_dependency full pcre Add_dependency build gettext diff --git a/templates/glibc-devel b/srcpkgs/glibc-devel similarity index 100% rename from templates/glibc-devel rename to srcpkgs/glibc-devel diff --git a/templates/glibc-locales b/srcpkgs/glibc-locales similarity index 100% rename from templates/glibc-locales rename to srcpkgs/glibc-locales diff --git a/templates/glibc/depends b/srcpkgs/glibc/depends similarity index 100% rename from templates/glibc/depends rename to srcpkgs/glibc/depends diff --git a/templates/glibc/devel.template b/srcpkgs/glibc/glibc-devel.template similarity index 97% rename from templates/glibc/devel.template rename to srcpkgs/glibc/glibc-devel.template index 44104915f88..7f5939b3213 100644 --- a/templates/glibc/devel.template +++ b/srcpkgs/glibc/glibc-devel.template @@ -7,6 +7,8 @@ long_desc="${long_desc} Add_dependency run glibc +revision=1 + do_install() { mkdir -p ${DESTDIR}/usr/lib diff --git a/templates/glibc/locales.template b/srcpkgs/glibc/glibc-locales.template similarity index 100% rename from templates/glibc/locales.template rename to srcpkgs/glibc/glibc-locales.template diff --git a/templates/glibc/patches/disable_timezone.diff b/srcpkgs/glibc/patches/disable_timezone.diff similarity index 100% rename from templates/glibc/patches/disable_timezone.diff rename to srcpkgs/glibc/patches/disable_timezone.diff diff --git a/templates/glibc/patches/xattr.h-dupdefs.diff b/srcpkgs/glibc/patches/xattr.h-dupdefs.diff similarity index 100% rename from templates/glibc/patches/xattr.h-dupdefs.diff rename to srcpkgs/glibc/patches/xattr.h-dupdefs.diff diff --git a/templates/glibc/template b/srcpkgs/glibc/template similarity index 97% rename from templates/glibc/template rename to srcpkgs/glibc/template index 23bdc7e9e1f..f44d8dcb664 100644 --- a/templates/glibc/template +++ b/srcpkgs/glibc/template @@ -1,6 +1,7 @@ # Template file for 'glibc' pkgname=glibc version=2.11 +revision=1 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2" build_style=gnu_configure configure_script="../configure" @@ -23,12 +24,12 @@ long_desc=" essential=yes base_chroot=yes conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf" -subpackages="devel locales" +subpackages="glibc-devel glibc-locales" Add_dependency build gcc Add_dependency build kernel-libc-headers Add_dependency run xbps-base-files -Add_dependency run gcc-libgcc +Add_dependency run libgcc Add_dependency run glibc-locales pre_configure() diff --git a/templates/glibc32/template b/srcpkgs/glibc32/template similarity index 100% rename from templates/glibc32/template rename to srcpkgs/glibc32/template diff --git a/templates/glitz-devel b/srcpkgs/glitz-devel similarity index 100% rename from templates/glitz-devel rename to srcpkgs/glitz-devel diff --git a/templates/glitz/depends b/srcpkgs/glitz/depends similarity index 100% rename from templates/glitz/depends rename to srcpkgs/glitz/depends diff --git a/templates/glitz/devel.template b/srcpkgs/glitz/glitz-devel.template similarity index 100% rename from templates/glitz/devel.template rename to srcpkgs/glitz/glitz-devel.template diff --git a/templates/glitz/template b/srcpkgs/glitz/template similarity index 97% rename from templates/glitz/template rename to srcpkgs/glitz/template index d5717e6ff90..67d3d163f7c 100644 --- a/templates/glitz/template +++ b/srcpkgs/glitz/template @@ -18,7 +18,7 @@ long_desc=" a stand-alone layer above OpenGL but is also designed to act as a backend for cairo, providing it with OpenGL accelerated output." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full libX11 diff --git a/templates/glproto/template b/srcpkgs/glproto/template similarity index 100% rename from templates/glproto/template rename to srcpkgs/glproto/template diff --git a/templates/gmp-devel b/srcpkgs/gmp-devel similarity index 100% rename from templates/gmp-devel rename to srcpkgs/gmp-devel diff --git a/templates/gmp/depends b/srcpkgs/gmp/depends similarity index 100% rename from templates/gmp/depends rename to srcpkgs/gmp/depends diff --git a/templates/gmp/devel.template b/srcpkgs/gmp/gmp-devel.template similarity index 84% rename from templates/gmp/devel.template rename to srcpkgs/gmp/gmp-devel.template index fd33f51e1e7..cea99902135 100644 --- a/templates/gmp/devel.template +++ b/srcpkgs/gmp/gmp-devel.template @@ -1,11 +1,11 @@ # Template file for 'gmp-devel'. # -short_desc="${short_desc} (development files)" +short_desc="${sourcepkg} development files" long_desc="${long_desc} This package contains files for development: headers, static libs, etc." -revision=1 +revision=2 Add_dependency run gmp do_install() diff --git a/templates/gmp/template b/srcpkgs/gmp/template similarity index 98% rename from templates/gmp/template rename to srcpkgs/gmp/template index 25743529e53..b6b21f4c204 100644 --- a/templates/gmp/template +++ b/srcpkgs/gmp/template @@ -29,6 +29,6 @@ long_desc=" operations, since GNU MP in many cases has asymptotically faster algorithms." base_chroot=yes -subpackages="devel" +subpackages="gmp-devel" Add_dependency build m4 Add_dependency run glibc diff --git a/templates/gnome-icon-theme/template b/srcpkgs/gnome-icon-theme/template similarity index 100% rename from templates/gnome-icon-theme/template rename to srcpkgs/gnome-icon-theme/template diff --git a/templates/gnutls-devel b/srcpkgs/gnutls-devel similarity index 100% rename from templates/gnutls-devel rename to srcpkgs/gnutls-devel diff --git a/templates/gnutls-tools b/srcpkgs/gnutls-tools similarity index 100% rename from templates/gnutls-tools rename to srcpkgs/gnutls-tools diff --git a/templates/gnutls/depends b/srcpkgs/gnutls/depends similarity index 100% rename from templates/gnutls/depends rename to srcpkgs/gnutls/depends diff --git a/templates/gnutls/devel.template b/srcpkgs/gnutls/gnutls-devel.template similarity index 100% rename from templates/gnutls/devel.template rename to srcpkgs/gnutls/gnutls-devel.template diff --git a/templates/gnutls/tools.template b/srcpkgs/gnutls/gnutls-tools.template similarity index 100% rename from templates/gnutls/tools.template rename to srcpkgs/gnutls/gnutls-tools.template diff --git a/templates/gnutls/template b/srcpkgs/gnutls/template similarity index 96% rename from templates/gnutls/template rename to srcpkgs/gnutls/template index 1d504170af3..5ba5dd2056d 100644 --- a/templates/gnutls/template +++ b/srcpkgs/gnutls/template @@ -24,7 +24,7 @@ long_desc=" Additionally GnuTLS provides an emulation API for the widely used OpenSSL library, to ease integration with existing applications." -subpackages="devel tools" +subpackages="$pkgname-devel $pkgname-tools" Add_dependency full glibc Add_dependency full zlib Add_dependency full readline diff --git a/templates/gobject-introspection-devel b/srcpkgs/gobject-introspection-devel similarity index 100% rename from templates/gobject-introspection-devel rename to srcpkgs/gobject-introspection-devel diff --git a/templates/gobject-introspection/depends b/srcpkgs/gobject-introspection/depends similarity index 100% rename from templates/gobject-introspection/depends rename to srcpkgs/gobject-introspection/depends diff --git a/templates/gobject-introspection/devel.template b/srcpkgs/gobject-introspection/gobject-introspection-devel.template similarity index 100% rename from templates/gobject-introspection/devel.template rename to srcpkgs/gobject-introspection/gobject-introspection-devel.template diff --git a/templates/gobject-introspection/template b/srcpkgs/gobject-introspection/template similarity index 95% rename from templates/gobject-introspection/template rename to srcpkgs/gobject-introspection/template index 5931825c863..eac49b9d6ce 100644 --- a/templates/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -10,7 +10,7 @@ long_desc=" The goal of the project is to describe the APIs and collect them in a uniform, machine readable format." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build flex Add_dependency full glibc diff --git a/templates/gperf/template b/srcpkgs/gperf/template similarity index 90% rename from templates/gperf/template rename to srcpkgs/gperf/template index 3f0b769528c..aa07cc1c468 100644 --- a/templates/gperf/template +++ b/srcpkgs/gperf/template @@ -1,6 +1,7 @@ # Template file for 'gperf' pkgname=gperf version=3.0.3 +revision=1 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="Perfect hash function generator" @@ -17,9 +18,9 @@ long_desc=" code, for emitting switch statements or nested ifs instead of a hash table, and for tuning the algorithm employed by gperf." -Add_dependency full glibc -Add_dependency run gcc-libstdc++ -Add_dependency build texinfo +Add_dependency full glibc +Add_dependency run libstdc++ +Add_dependency build texinfo post_install() { diff --git a/templates/grep/template b/srcpkgs/grep/template similarity index 100% rename from templates/grep/template rename to srcpkgs/grep/template diff --git a/templates/groff/template b/srcpkgs/groff/template similarity index 95% rename from templates/groff/template rename to srcpkgs/groff/template index e87eb21ac9d..a7f61bf0f9c 100644 --- a/templates/groff/template +++ b/srcpkgs/groff/template @@ -1,6 +1,7 @@ # Template file for 'groff' pkgname=groff version=1.20.1 +revision=1 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--with-appresdir=/usr/lib/X11/app-defaults" @@ -17,7 +18,7 @@ long_desc=" are also included together with several fonts." Add_dependency full glibc -Add_dependency full gcc-libstdc++ +Add_dependency full libstdc++ Add_dependency full bash Add_dependency full zlib Add_dependency full sed diff --git a/templates/grub2-devel b/srcpkgs/grub2-devel similarity index 100% rename from templates/grub2-devel rename to srcpkgs/grub2-devel diff --git a/templates/grub2/files/grub.default b/srcpkgs/grub2/files/grub.default similarity index 100% rename from templates/grub2/files/grub.default rename to srcpkgs/grub2/files/grub.default diff --git a/templates/grub2/devel.template b/srcpkgs/grub2/grub2-devel.template similarity index 100% rename from templates/grub2/devel.template rename to srcpkgs/grub2/grub2-devel.template diff --git a/templates/grub2/template b/srcpkgs/grub2/template similarity index 100% rename from templates/grub2/template rename to srcpkgs/grub2/template diff --git a/templates/gsfonts/template b/srcpkgs/gsfonts/template similarity index 96% rename from templates/gsfonts/template rename to srcpkgs/gsfonts/template index 82e59f60681..bb89b768aab 100644 --- a/templates/gsfonts/template +++ b/srcpkgs/gsfonts/template @@ -1,6 +1,7 @@ # Template file for 'gsfonts' pkgname=gsfonts version=8.11 +revision=1 wrksrc=fonts distfiles="${SOURCEFORGE_SITE}/ghostscript/ghostscript-fonts-std-$version.tar.gz" build_style=custom-install @@ -12,6 +13,7 @@ long_desc=" font_dirs="/usr/share/fonts/Type1" triggers="x11-fonts" +noarch=yes Add_dependency full font-util diff --git a/templates/gst-plugins-base-devel b/srcpkgs/gst-plugins-base-devel similarity index 100% rename from templates/gst-plugins-base-devel rename to srcpkgs/gst-plugins-base-devel diff --git a/templates/gst-plugins-base/depends b/srcpkgs/gst-plugins-base/depends similarity index 100% rename from templates/gst-plugins-base/depends rename to srcpkgs/gst-plugins-base/depends diff --git a/templates/gst-plugins-base/devel.template b/srcpkgs/gst-plugins-base/gst-plugins-base-devel.template similarity index 100% rename from templates/gst-plugins-base/devel.template rename to srcpkgs/gst-plugins-base/gst-plugins-base-devel.template diff --git a/templates/gst-plugins-base/template b/srcpkgs/gst-plugins-base/template similarity index 97% rename from templates/gst-plugins-base/template rename to srcpkgs/gst-plugins-base/template index 6746cb6bb94..cbb1b1a29b1 100644 --- a/templates/gst-plugins-base/template +++ b/srcpkgs/gst-plugins-base/template @@ -17,7 +17,7 @@ long_desc=" This package contains a set of well-maintained base plug-ins." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full fontconfig diff --git a/templates/gstreamer-devel b/srcpkgs/gstreamer-devel similarity index 100% rename from templates/gstreamer-devel rename to srcpkgs/gstreamer-devel diff --git a/templates/gstreamer/depends b/srcpkgs/gstreamer/depends similarity index 100% rename from templates/gstreamer/depends rename to srcpkgs/gstreamer/depends diff --git a/templates/gstreamer/devel.template b/srcpkgs/gstreamer/gstreamer-devel.template similarity index 80% rename from templates/gstreamer/devel.template rename to srcpkgs/gstreamer/gstreamer-devel.template index 34139b39c55..622d57efce5 100644 --- a/templates/gstreamer/devel.template +++ b/srcpkgs/gstreamer/gstreamer-devel.template @@ -14,10 +14,8 @@ do_install() mkdir -p ${DESTDIR}/usr/lib/gstreamer-${lver} mkdir -p ${DESTDIR}/usr/share mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/gstreamer-${lver}/*.*a \ - ${DESTDIR}/usr/lib/gstreamer-${lver} mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share diff --git a/templates/gstreamer/template b/srcpkgs/gstreamer/template similarity index 97% rename from templates/gstreamer/template rename to srcpkgs/gstreamer/template index 18c48d24616..0c84bafe11f 100644 --- a/templates/gstreamer/template +++ b/srcpkgs/gstreamer/template @@ -16,7 +16,7 @@ long_desc=" transparently. Developers can add new codecs and filters by writing a simple plugin with a clean, generic interface." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build python Add_dependency build docbook-xsl diff --git a/templates/gtk+-devel b/srcpkgs/gtk+-devel similarity index 100% rename from templates/gtk+-devel rename to srcpkgs/gtk+-devel diff --git a/templates/gtk+/depends b/srcpkgs/gtk+/depends similarity index 100% rename from templates/gtk+/depends rename to srcpkgs/gtk+/depends diff --git a/templates/gtk+/devel.template b/srcpkgs/gtk+/gtk+-devel.template similarity index 100% rename from templates/gtk+/devel.template rename to srcpkgs/gtk+/gtk+-devel.template diff --git a/templates/gtk+/template b/srcpkgs/gtk+/template similarity index 98% rename from templates/gtk+/template rename to srcpkgs/gtk+/template index 562c01fd0a5..b546d15766d 100644 --- a/templates/gtk+/template +++ b/srcpkgs/gtk+/template @@ -21,7 +21,7 @@ long_desc=" conf_files="/etc/gtk-2.0/im-multipress.conf" triggers="gtk-pixbuf-loaders gtk-immodules" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build perl Add_dependency full glibc diff --git a/templates/gtk-sharp/template b/srcpkgs/gtk-sharp/template similarity index 100% rename from templates/gtk-sharp/template rename to srcpkgs/gtk-sharp/template diff --git a/templates/gzip/template b/srcpkgs/gzip/template similarity index 100% rename from templates/gzip/template rename to srcpkgs/gzip/template diff --git a/templates/hal-info/template b/srcpkgs/hal-info/template similarity index 100% rename from templates/hal-info/template rename to srcpkgs/hal-info/template diff --git a/templates/hal/INSTALL b/srcpkgs/hal/INSTALL similarity index 100% rename from templates/hal/INSTALL rename to srcpkgs/hal/INSTALL diff --git a/templates/hal/REMOVE b/srcpkgs/hal/REMOVE similarity index 100% rename from templates/hal/REMOVE rename to srcpkgs/hal/REMOVE diff --git a/templates/hal/depends b/srcpkgs/hal/depends similarity index 100% rename from templates/hal/depends rename to srcpkgs/hal/depends diff --git a/templates/hal/files/10-keymap.fdi b/srcpkgs/hal/files/10-keymap.fdi similarity index 100% rename from templates/hal/files/10-keymap.fdi rename to srcpkgs/hal/files/10-keymap.fdi diff --git a/templates/hal/files/hal.rc b/srcpkgs/hal/files/hal.rc similarity index 100% rename from templates/hal/files/hal.rc rename to srcpkgs/hal/files/hal.rc diff --git a/templates/hal/patches/configure_fix_smbios_test.diff b/srcpkgs/hal/patches/configure_fix_smbios_test.diff similarity index 100% rename from templates/hal/patches/configure_fix_smbios_test.diff rename to srcpkgs/hal/patches/configure_fix_smbios_test.diff diff --git a/templates/hal/template b/srcpkgs/hal/template similarity index 100% rename from templates/hal/template rename to srcpkgs/hal/template diff --git a/templates/hicolor-icon-theme/template b/srcpkgs/hicolor-icon-theme/template similarity index 100% rename from templates/hicolor-icon-theme/template rename to srcpkgs/hicolor-icon-theme/template diff --git a/templates/hunspell-devel b/srcpkgs/hunspell-devel similarity index 100% rename from templates/hunspell-devel rename to srcpkgs/hunspell-devel diff --git a/templates/hunspell/depends b/srcpkgs/hunspell/depends similarity index 100% rename from templates/hunspell/depends rename to srcpkgs/hunspell/depends diff --git a/templates/hunspell/devel.template b/srcpkgs/hunspell/hunspell-devel.template similarity index 100% rename from templates/hunspell/devel.template rename to srcpkgs/hunspell/hunspell-devel.template diff --git a/templates/hunspell/template b/srcpkgs/hunspell/template similarity index 96% rename from templates/hunspell/template rename to srcpkgs/hunspell/template index defa0c46212..37798bea824 100644 --- a/templates/hunspell/template +++ b/srcpkgs/hunspell/template @@ -21,7 +21,7 @@ long_desc=" * GPL/LGPL/MPL tri-license." # XXX Add ncursesw dependency -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build bison Add_dependency full glibc diff --git a/templates/iana-etc/template b/srcpkgs/iana-etc/template similarity index 100% rename from templates/iana-etc/template rename to srcpkgs/iana-etc/template diff --git a/templates/iceauth/template b/srcpkgs/iceauth/template similarity index 100% rename from templates/iceauth/template rename to srcpkgs/iceauth/template diff --git a/templates/icon-naming-utils/template b/srcpkgs/icon-naming-utils/template similarity index 100% rename from templates/icon-naming-utils/template rename to srcpkgs/icon-naming-utils/template diff --git a/templates/icu-devel b/srcpkgs/icu-devel similarity index 100% rename from templates/icu-devel rename to srcpkgs/icu-devel diff --git a/templates/icu-libs b/srcpkgs/icu-libs similarity index 100% rename from templates/icu-libs rename to srcpkgs/icu-libs diff --git a/templates/icu/depends b/srcpkgs/icu/depends similarity index 100% rename from templates/icu/depends rename to srcpkgs/icu/depends diff --git a/templates/icu/devel.template b/srcpkgs/icu/icu-devel.template similarity index 100% rename from templates/icu/devel.template rename to srcpkgs/icu/icu-devel.template diff --git a/templates/icu/libs.template b/srcpkgs/icu/icu-libs.template similarity index 87% rename from templates/icu/libs.template rename to srcpkgs/icu/icu-libs.template index 7b55f53319a..7f6e2ced77f 100644 --- a/templates/icu/libs.template +++ b/srcpkgs/icu/icu-libs.template @@ -5,8 +5,10 @@ long_desc="${long_desc} This package contains the shared libraries." +revision=1 + Add_dependency run glibc -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ do_install() { diff --git a/templates/icu/template b/srcpkgs/icu/template similarity index 95% rename from templates/icu/template rename to srcpkgs/icu/template index f6afdfd6e67..1e793c0f5db 100644 --- a/templates/icu/template +++ b/srcpkgs/icu/template @@ -25,5 +25,5 @@ long_desc=" - Transliteration - Word, line and sentence breaks" -subpackages="devel libs" +subpackages="$pkgname-devel $pkgname-libs" Add_dependency run icu-libs diff --git a/templates/imlib2/template b/srcpkgs/imlib2/template similarity index 100% rename from templates/imlib2/template rename to srcpkgs/imlib2/template diff --git a/templates/initramfs-tools/files/conf/initramfs.conf b/srcpkgs/initramfs-tools/files/conf/initramfs.conf similarity index 100% rename from templates/initramfs-tools/files/conf/initramfs.conf rename to srcpkgs/initramfs-tools/files/conf/initramfs.conf diff --git a/templates/initramfs-tools/files/conf/modules b/srcpkgs/initramfs-tools/files/conf/modules similarity index 100% rename from templates/initramfs-tools/files/conf/modules rename to srcpkgs/initramfs-tools/files/conf/modules diff --git a/templates/initramfs-tools/files/conf/update-initramfs.conf b/srcpkgs/initramfs-tools/files/conf/update-initramfs.conf similarity index 100% rename from templates/initramfs-tools/files/conf/update-initramfs.conf rename to srcpkgs/initramfs-tools/files/conf/update-initramfs.conf diff --git a/templates/initramfs-tools/files/docs/example_hook b/srcpkgs/initramfs-tools/files/docs/example_hook similarity index 100% rename from templates/initramfs-tools/files/docs/example_hook rename to srcpkgs/initramfs-tools/files/docs/example_hook diff --git a/templates/initramfs-tools/files/docs/example_hook_cpiogz b/srcpkgs/initramfs-tools/files/docs/example_hook_cpiogz similarity index 100% rename from templates/initramfs-tools/files/docs/example_hook_cpiogz rename to srcpkgs/initramfs-tools/files/docs/example_hook_cpiogz diff --git a/templates/initramfs-tools/files/docs/example_script b/srcpkgs/initramfs-tools/files/docs/example_script similarity index 100% rename from templates/initramfs-tools/files/docs/example_script rename to srcpkgs/initramfs-tools/files/docs/example_script diff --git a/templates/initramfs-tools/files/hook-functions b/srcpkgs/initramfs-tools/files/hook-functions similarity index 100% rename from templates/initramfs-tools/files/hook-functions rename to srcpkgs/initramfs-tools/files/hook-functions diff --git a/templates/initramfs-tools/files/hooks/blkid b/srcpkgs/initramfs-tools/files/hooks/blkid similarity index 100% rename from templates/initramfs-tools/files/hooks/blkid rename to srcpkgs/initramfs-tools/files/hooks/blkid diff --git a/templates/initramfs-tools/files/hooks/busybox b/srcpkgs/initramfs-tools/files/hooks/busybox similarity index 100% rename from templates/initramfs-tools/files/hooks/busybox rename to srcpkgs/initramfs-tools/files/hooks/busybox diff --git a/templates/initramfs-tools/files/hooks/keymap b/srcpkgs/initramfs-tools/files/hooks/keymap similarity index 100% rename from templates/initramfs-tools/files/hooks/keymap rename to srcpkgs/initramfs-tools/files/hooks/keymap diff --git a/templates/initramfs-tools/files/hooks/klibc b/srcpkgs/initramfs-tools/files/hooks/klibc similarity index 100% rename from templates/initramfs-tools/files/hooks/klibc rename to srcpkgs/initramfs-tools/files/hooks/klibc diff --git a/templates/initramfs-tools/files/hooks/module_init_tools b/srcpkgs/initramfs-tools/files/hooks/module_init_tools similarity index 100% rename from templates/initramfs-tools/files/hooks/module_init_tools rename to srcpkgs/initramfs-tools/files/hooks/module_init_tools diff --git a/templates/initramfs-tools/files/init b/srcpkgs/initramfs-tools/files/init similarity index 100% rename from templates/initramfs-tools/files/init rename to srcpkgs/initramfs-tools/files/init diff --git a/templates/initramfs-tools/files/initramfs-tools.8 b/srcpkgs/initramfs-tools/files/initramfs-tools.8 similarity index 100% rename from templates/initramfs-tools/files/initramfs-tools.8 rename to srcpkgs/initramfs-tools/files/initramfs-tools.8 diff --git a/templates/initramfs-tools/files/initramfs.conf.5 b/srcpkgs/initramfs-tools/files/initramfs.conf.5 similarity index 100% rename from templates/initramfs-tools/files/initramfs.conf.5 rename to srcpkgs/initramfs-tools/files/initramfs.conf.5 diff --git a/templates/initramfs-tools/files/mkinitramfs b/srcpkgs/initramfs-tools/files/mkinitramfs similarity index 100% rename from templates/initramfs-tools/files/mkinitramfs rename to srcpkgs/initramfs-tools/files/mkinitramfs diff --git a/templates/initramfs-tools/files/mkinitramfs.8 b/srcpkgs/initramfs-tools/files/mkinitramfs.8 similarity index 100% rename from templates/initramfs-tools/files/mkinitramfs.8 rename to srcpkgs/initramfs-tools/files/mkinitramfs.8 diff --git a/templates/initramfs-tools/files/scripts/functions b/srcpkgs/initramfs-tools/files/scripts/functions similarity index 100% rename from templates/initramfs-tools/files/scripts/functions rename to srcpkgs/initramfs-tools/files/scripts/functions diff --git a/templates/initramfs-tools/files/scripts/init-premount/blacklist b/srcpkgs/initramfs-tools/files/scripts/init-premount/blacklist similarity index 100% rename from templates/initramfs-tools/files/scripts/init-premount/blacklist rename to srcpkgs/initramfs-tools/files/scripts/init-premount/blacklist diff --git a/templates/initramfs-tools/files/scripts/init-top/all_generic_ide b/srcpkgs/initramfs-tools/files/scripts/init-top/all_generic_ide similarity index 100% rename from templates/initramfs-tools/files/scripts/init-top/all_generic_ide rename to srcpkgs/initramfs-tools/files/scripts/init-top/all_generic_ide diff --git a/templates/initramfs-tools/files/scripts/init-top/keymap b/srcpkgs/initramfs-tools/files/scripts/init-top/keymap similarity index 100% rename from templates/initramfs-tools/files/scripts/init-top/keymap rename to srcpkgs/initramfs-tools/files/scripts/init-top/keymap diff --git a/templates/initramfs-tools/files/scripts/local b/srcpkgs/initramfs-tools/files/scripts/local similarity index 100% rename from templates/initramfs-tools/files/scripts/local rename to srcpkgs/initramfs-tools/files/scripts/local diff --git a/templates/initramfs-tools/files/scripts/local-premount/resume b/srcpkgs/initramfs-tools/files/scripts/local-premount/resume similarity index 100% rename from templates/initramfs-tools/files/scripts/local-premount/resume rename to srcpkgs/initramfs-tools/files/scripts/local-premount/resume diff --git a/templates/initramfs-tools/files/scripts/nfs b/srcpkgs/initramfs-tools/files/scripts/nfs similarity index 100% rename from templates/initramfs-tools/files/scripts/nfs rename to srcpkgs/initramfs-tools/files/scripts/nfs diff --git a/templates/initramfs-tools/files/update-initramfs b/srcpkgs/initramfs-tools/files/update-initramfs similarity index 100% rename from templates/initramfs-tools/files/update-initramfs rename to srcpkgs/initramfs-tools/files/update-initramfs diff --git a/templates/initramfs-tools/files/update-initramfs.8 b/srcpkgs/initramfs-tools/files/update-initramfs.8 similarity index 100% rename from templates/initramfs-tools/files/update-initramfs.8 rename to srcpkgs/initramfs-tools/files/update-initramfs.8 diff --git a/templates/initramfs-tools/files/update-initramfs.conf.5 b/srcpkgs/initramfs-tools/files/update-initramfs.conf.5 similarity index 100% rename from templates/initramfs-tools/files/update-initramfs.conf.5 rename to srcpkgs/initramfs-tools/files/update-initramfs.conf.5 diff --git a/templates/initramfs-tools/template b/srcpkgs/initramfs-tools/template similarity index 99% rename from templates/initramfs-tools/template rename to srcpkgs/initramfs-tools/template index c585d1a97f5..614daebd8b9 100644 --- a/templates/initramfs-tools/template +++ b/srcpkgs/initramfs-tools/template @@ -1,6 +1,7 @@ # Template file for 'initramfs-tools' pkgname=initramfs-tools version=0.93.3 +revision=1 build_style=custom-install short_desc="Tools for generating an initramfs" maintainer="Juan RP " @@ -34,7 +35,6 @@ Add_dependency full module-init-tools Add_dependency build klibc Add_dependency run klibc-utils Add_dependency full busybox-initramfs -Add_dependency run xbps do_install() { diff --git a/templates/inputproto/template b/srcpkgs/inputproto/template similarity index 100% rename from templates/inputproto/template rename to srcpkgs/inputproto/template diff --git a/templates/intltool/template b/srcpkgs/intltool/template similarity index 100% rename from templates/intltool/template rename to srcpkgs/intltool/template diff --git a/templates/iputils/patches/fix_install.diff b/srcpkgs/iputils/patches/fix_install.diff similarity index 100% rename from templates/iputils/patches/fix_install.diff rename to srcpkgs/iputils/patches/fix_install.diff diff --git a/templates/iputils/patches/fix_rdisc.c.diff b/srcpkgs/iputils/patches/fix_rdisc.c.diff similarity index 100% rename from templates/iputils/patches/fix_rdisc.c.diff rename to srcpkgs/iputils/patches/fix_rdisc.c.diff diff --git a/templates/iputils/template b/srcpkgs/iputils/template similarity index 100% rename from templates/iputils/template rename to srcpkgs/iputils/template diff --git a/templates/irssi-devel b/srcpkgs/irssi-devel similarity index 100% rename from templates/irssi-devel rename to srcpkgs/irssi-devel diff --git a/templates/irssi/devel.template b/srcpkgs/irssi/irssi-devel.template similarity index 100% rename from templates/irssi/devel.template rename to srcpkgs/irssi/irssi-devel.template diff --git a/templates/irssi/template b/srcpkgs/irssi/template similarity index 96% rename from templates/irssi/template rename to srcpkgs/irssi/template index e5622a57e02..1f252138cb5 100644 --- a/templates/irssi/template +++ b/srcpkgs/irssi/template @@ -15,7 +15,7 @@ long_desc=" protocols like ICQ could be created some day too." conf_files="/etc/irssi.conf" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full glib diff --git a/templates/iso-codes/template b/srcpkgs/iso-codes/template similarity index 100% rename from templates/iso-codes/template rename to srcpkgs/iso-codes/template diff --git a/templates/jasper-devel b/srcpkgs/jasper-devel similarity index 100% rename from templates/jasper-devel rename to srcpkgs/jasper-devel diff --git a/templates/jasper/depends b/srcpkgs/jasper/depends similarity index 100% rename from templates/jasper/depends rename to srcpkgs/jasper/depends diff --git a/templates/jasper/devel.template b/srcpkgs/jasper/jasper-devel.template similarity index 100% rename from templates/jasper/devel.template rename to srcpkgs/jasper/jasper-devel.template diff --git a/templates/jasper/template b/srcpkgs/jasper/template similarity index 97% rename from templates/jasper/template rename to srcpkgs/jasper/template index 80024bf4b68..cbe7625e737 100644 --- a/templates/jasper/template +++ b/srcpkgs/jasper/template @@ -16,7 +16,7 @@ long_desc=" software has also been submitted to the ISO for inclusion in the JPEG-2000 Part-5 standard (as an official reference implementation)." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build unzip Add_dependency full glibc Add_dependency full jpeg diff --git a/templates/jpeg-devel b/srcpkgs/jpeg-devel similarity index 100% rename from templates/jpeg-devel rename to srcpkgs/jpeg-devel diff --git a/templates/jpeg/depends b/srcpkgs/jpeg/depends similarity index 100% rename from templates/jpeg/depends rename to srcpkgs/jpeg/depends diff --git a/templates/jpeg/devel.template b/srcpkgs/jpeg/jpeg-devel.template similarity index 100% rename from templates/jpeg/devel.template rename to srcpkgs/jpeg/jpeg-devel.template diff --git a/templates/jpeg/template b/srcpkgs/jpeg/template similarity index 97% rename from templates/jpeg/template rename to srcpkgs/jpeg/template index 9909918a83f..b2baaf38f3d 100644 --- a/templates/jpeg/template +++ b/srcpkgs/jpeg/template @@ -19,7 +19,7 @@ long_desc=" files. Rdjpgcom displays any text comments included in a JPEG file. Wrjpgcom inserts text comments into a JPEG file." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc post_install() diff --git a/templates/kbd/patches/fix_build.diff b/srcpkgs/kbd/patches/fix_build.diff similarity index 100% rename from templates/kbd/patches/fix_build.diff rename to srcpkgs/kbd/patches/fix_build.diff diff --git a/templates/kbd/template b/srcpkgs/kbd/template similarity index 100% rename from templates/kbd/template rename to srcpkgs/kbd/template diff --git a/templates/kbproto/template b/srcpkgs/kbproto/template similarity index 100% rename from templates/kbproto/template rename to srcpkgs/kbproto/template diff --git a/templates/kernel-firmware b/srcpkgs/kernel-firmware similarity index 100% rename from templates/kernel-firmware rename to srcpkgs/kernel-firmware diff --git a/templates/kernel-headers b/srcpkgs/kernel-headers similarity index 100% rename from templates/kernel-headers rename to srcpkgs/kernel-headers diff --git a/templates/kernel-libc-headers/patches/fix_scsi_varlen_cdb_hdr.diff b/srcpkgs/kernel-libc-headers/patches/fix_scsi_varlen_cdb_hdr.diff similarity index 100% rename from templates/kernel-libc-headers/patches/fix_scsi_varlen_cdb_hdr.diff rename to srcpkgs/kernel-libc-headers/patches/fix_scsi_varlen_cdb_hdr.diff diff --git a/templates/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template similarity index 100% rename from templates/kernel-libc-headers/template rename to srcpkgs/kernel-libc-headers/template diff --git a/templates/kernel/INSTALL b/srcpkgs/kernel/INSTALL similarity index 100% rename from templates/kernel/INSTALL rename to srcpkgs/kernel/INSTALL diff --git a/templates/kernel/i386-dotconfig b/srcpkgs/kernel/files/i386-dotconfig similarity index 100% rename from templates/kernel/i386-dotconfig rename to srcpkgs/kernel/files/i386-dotconfig diff --git a/templates/kernel/x86_64-dotconfig b/srcpkgs/kernel/files/x86_64-dotconfig similarity index 100% rename from templates/kernel/x86_64-dotconfig rename to srcpkgs/kernel/files/x86_64-dotconfig diff --git a/templates/kernel/firmware.template b/srcpkgs/kernel/kernel-firmware.template similarity index 100% rename from templates/kernel/firmware.template rename to srcpkgs/kernel/kernel-firmware.template diff --git a/templates/kernel/headers.template b/srcpkgs/kernel/kernel-headers.template similarity index 100% rename from templates/kernel/headers.template rename to srcpkgs/kernel/kernel-headers.template diff --git a/templates/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz b/srcpkgs/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz similarity index 100% rename from templates/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz rename to srcpkgs/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz diff --git a/templates/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz.args b/srcpkgs/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz.args similarity index 100% rename from templates/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz.args rename to srcpkgs/kernel/patches/unionfs-2.5.3_for_2.6.31.diff.gz.args diff --git a/templates/kernel/template b/srcpkgs/kernel/template similarity index 97% rename from templates/kernel/template rename to srcpkgs/kernel/template index 74e79cbdf0e..be95c73d249 100644 --- a/templates/kernel/template +++ b/srcpkgs/kernel/template @@ -12,7 +12,7 @@ checksum=7751de380eab755a647c7137949bc6207fd14379e5e8e5c15c421fdc8390c45e long_desc=" This package provides the linux kernel image and associated modules." -subpackages="firmware headers" +subpackages="$pkgname-firmware $pkgname-headers" triggers="initramfs-tools" essential=yes nostrip=yes @@ -43,10 +43,9 @@ do_install() cd ${wrksrc} || return 1 # Configure - if [ -f $XBPS_TEMPLATESDIR/$pkgname/$arch-dotconfig ]; then + if [ -f ${FILESDIR}/$arch-dotconfig ]; then msg_normal "Detected a .config file for your arch, using it." - cp -f $XBPS_TEMPLATESDIR/$pkgname/$arch-dotconfig \ - $wrksrc/.config + cp -f ${FILESDIR}/$arch-dotconfig ${wrksrc}/.config make ${mjobs} oldconfig else make ${mjobs} menuconfig diff --git a/templates/klibc-devel b/srcpkgs/klibc-devel similarity index 100% rename from templates/klibc-devel rename to srcpkgs/klibc-devel diff --git a/templates/klibc-utils b/srcpkgs/klibc-utils similarity index 100% rename from templates/klibc-utils rename to srcpkgs/klibc-utils diff --git a/templates/klibc/depends b/srcpkgs/klibc/depends similarity index 100% rename from templates/klibc/depends rename to srcpkgs/klibc/depends diff --git a/templates/klibc/devel.template b/srcpkgs/klibc/klibc-devel.template similarity index 100% rename from templates/klibc/devel.template rename to srcpkgs/klibc/klibc-devel.template diff --git a/templates/klibc/utils.template b/srcpkgs/klibc/klibc-utils.template similarity index 100% rename from templates/klibc/utils.template rename to srcpkgs/klibc/klibc-utils.template diff --git a/templates/klibc/patches/Kbuild.klibc.diff b/srcpkgs/klibc/patches/Kbuild.klibc.diff similarity index 100% rename from templates/klibc/patches/Kbuild.klibc.diff rename to srcpkgs/klibc/patches/Kbuild.klibc.diff diff --git a/templates/klibc/patches/fix_i386_archsignal_h.diff b/srcpkgs/klibc/patches/fix_i386_archsignal_h.diff similarity index 100% rename from templates/klibc/patches/fix_i386_archsignal_h.diff rename to srcpkgs/klibc/patches/fix_i386_archsignal_h.diff diff --git a/templates/klibc/patches/mntproc_definitions.diff b/srcpkgs/klibc/patches/mntproc_definitions.diff similarity index 100% rename from templates/klibc/patches/mntproc_definitions.diff rename to srcpkgs/klibc/patches/mntproc_definitions.diff diff --git a/templates/klibc/patches/shared_by_default.diff b/srcpkgs/klibc/patches/shared_by_default.diff similarity index 100% rename from templates/klibc/patches/shared_by_default.diff rename to srcpkgs/klibc/patches/shared_by_default.diff diff --git a/templates/klibc/template b/srcpkgs/klibc/template similarity index 95% rename from templates/klibc/template rename to srcpkgs/klibc/template index 951e3844b10..ee565878725 100644 --- a/templates/klibc/template +++ b/srcpkgs/klibc/template @@ -13,8 +13,7 @@ long_desc=" portability, not speed. It is definitely a work in progress and a lot of things are still missing." -subpackages="devel utils" - +subpackages="$pkgname-devel $pkgname-utils" Add_dependency build kernel Add_dependency build bison Add_dependency build perl diff --git a/templates/lcms-devel b/srcpkgs/lcms-devel similarity index 100% rename from templates/lcms-devel rename to srcpkgs/lcms-devel diff --git a/templates/lcms/depends b/srcpkgs/lcms/depends similarity index 100% rename from templates/lcms/depends rename to srcpkgs/lcms/depends diff --git a/templates/lcms/devel.template b/srcpkgs/lcms/lcms-devel.template similarity index 100% rename from templates/lcms/devel.template rename to srcpkgs/lcms/lcms-devel.template diff --git a/templates/lcms/template b/srcpkgs/lcms/template similarity index 96% rename from templates/lcms/template rename to srcpkgs/lcms/template index 998d966b0ad..1bc4166a986 100644 --- a/templates/lcms/template +++ b/srcpkgs/lcms/template @@ -17,7 +17,7 @@ long_desc=" as images are transferred from scanners or cameras to monitors and printers." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full zlib Add_dependency full jpeg diff --git a/templates/less/template b/srcpkgs/less/template similarity index 100% rename from templates/less/template rename to srcpkgs/less/template diff --git a/templates/lftp/template b/srcpkgs/lftp/template similarity index 100% rename from templates/lftp/template rename to srcpkgs/lftp/template diff --git a/templates/libICE-devel b/srcpkgs/libICE-devel similarity index 100% rename from templates/libICE-devel rename to srcpkgs/libICE-devel diff --git a/templates/libICE/depends b/srcpkgs/libICE/depends similarity index 100% rename from templates/libICE/depends rename to srcpkgs/libICE/depends diff --git a/templates/libICE/devel.template b/srcpkgs/libICE/libICE-devel.template similarity index 100% rename from templates/libICE/devel.template rename to srcpkgs/libICE/libICE-devel.template diff --git a/templates/libICE/template b/srcpkgs/libICE/template similarity index 89% rename from templates/libICE/template rename to srcpkgs/libICE/template index b1fa80bf7e9..afdcdf13037 100644 --- a/templates/libICE/template +++ b/srcpkgs/libICE/template @@ -1,7 +1,6 @@ # Template build file for 'libICE'. pkgname=libICE version=1.0.6 -patch_files="configure_sh_assignment_broken.diff" distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Inter Client Exchange (ICE) library for X" @@ -13,7 +12,7 @@ long_desc=" This is part of modular X.org project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xtrans Add_dependency full glibc diff --git a/templates/libIDL-devel b/srcpkgs/libIDL-devel similarity index 100% rename from templates/libIDL-devel rename to srcpkgs/libIDL-devel diff --git a/templates/libIDL/depends b/srcpkgs/libIDL/depends similarity index 100% rename from templates/libIDL/depends rename to srcpkgs/libIDL/depends diff --git a/templates/libIDL/devel.template b/srcpkgs/libIDL/libIDL-devel.template similarity index 100% rename from templates/libIDL/devel.template rename to srcpkgs/libIDL/libIDL-devel.template diff --git a/templates/libIDL/template b/srcpkgs/libIDL/template similarity index 98% rename from templates/libIDL/template rename to srcpkgs/libIDL/template index bbe1a3811bf..a34032f5374 100644 --- a/templates/libIDL/template +++ b/srcpkgs/libIDL/template @@ -29,7 +29,7 @@ long_desc=" full semantic analysis with some optimizations, and will attempt to generate meaningful errors and warnings for invalid or deprecated IDL." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build flex Add_dependency full glibc diff --git a/templates/libSM-devel b/srcpkgs/libSM-devel similarity index 100% rename from templates/libSM-devel rename to srcpkgs/libSM-devel diff --git a/templates/libSM/depends b/srcpkgs/libSM/depends similarity index 100% rename from templates/libSM/depends rename to srcpkgs/libSM/depends diff --git a/templates/libSM/devel.template b/srcpkgs/libSM/libSM-devel.template similarity index 100% rename from templates/libSM/devel.template rename to srcpkgs/libSM/libSM-devel.template diff --git a/templates/libSM/template b/srcpkgs/libSM/template similarity index 95% rename from templates/libSM/template rename to srcpkgs/libSM/template index 599ac5b3069..4a7617019a3 100644 --- a/templates/libSM/template +++ b/srcpkgs/libSM/template @@ -10,7 +10,7 @@ long_desc=" This package contains the library and header files for the X Session Management Library. This is from the modular X.org project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xtrans Add_dependency full glibc diff --git a/templates/libX11-devel b/srcpkgs/libX11-devel similarity index 100% rename from templates/libX11-devel rename to srcpkgs/libX11-devel diff --git a/templates/libX11/depends b/srcpkgs/libX11/depends similarity index 100% rename from templates/libX11/depends rename to srcpkgs/libX11/depends diff --git a/templates/libX11/devel.template b/srcpkgs/libX11/libX11-devel.template similarity index 100% rename from templates/libX11/devel.template rename to srcpkgs/libX11/libX11-devel.template diff --git a/templates/libX11/template b/srcpkgs/libX11/template similarity index 97% rename from templates/libX11/template rename to srcpkgs/libX11/template index 3b804e4b780..75cb1297c73 100644 --- a/templates/libX11/template +++ b/srcpkgs/libX11/template @@ -13,7 +13,7 @@ long_desc=" This is from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXScrnSaver-devel b/srcpkgs/libXScrnSaver-devel similarity index 100% rename from templates/libXScrnSaver-devel rename to srcpkgs/libXScrnSaver-devel diff --git a/templates/libXScrnSaver/depends b/srcpkgs/libXScrnSaver/depends similarity index 100% rename from templates/libXScrnSaver/depends rename to srcpkgs/libXScrnSaver/depends diff --git a/templates/libXScrnSaver/devel.template b/srcpkgs/libXScrnSaver/libXScrnSaver-devel.template similarity index 100% rename from templates/libXScrnSaver/devel.template rename to srcpkgs/libXScrnSaver/libXScrnSaver-devel.template diff --git a/templates/libXScrnSaver/template b/srcpkgs/libXScrnSaver/template similarity index 95% rename from templates/libXScrnSaver/template rename to srcpkgs/libXScrnSaver/template index fe45329653c..4cfcf904ab0 100644 --- a/templates/libXScrnSaver/template +++ b/srcpkgs/libXScrnSaver/template @@ -10,7 +10,7 @@ long_desc=" This package contains the library for the X11 Screen Saver extension. This is from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xextproto Add_dependency build scrnsaverproto diff --git a/templates/libXau-devel b/srcpkgs/libXau-devel similarity index 100% rename from templates/libXau-devel rename to srcpkgs/libXau-devel diff --git a/templates/libXau/depends b/srcpkgs/libXau/depends similarity index 100% rename from templates/libXau/depends rename to srcpkgs/libXau/depends diff --git a/templates/libXau/devel.template b/srcpkgs/libXau/libXau-devel.template similarity index 100% rename from templates/libXau/devel.template rename to srcpkgs/libXau/libXau-devel.template diff --git a/templates/libXau/template b/srcpkgs/libXau/template similarity index 94% rename from templates/libXau/template rename to srcpkgs/libXau/template index 12e42c837ce..5b2b4b0f893 100644 --- a/templates/libXau/template +++ b/srcpkgs/libXau/template @@ -10,7 +10,7 @@ long_desc=" LibXau is an authorization protocol for X from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency build pkg-config Add_dependency build xproto diff --git a/templates/libXaw-devel b/srcpkgs/libXaw-devel similarity index 100% rename from templates/libXaw-devel rename to srcpkgs/libXaw-devel diff --git a/templates/libXaw/depends b/srcpkgs/libXaw/depends similarity index 100% rename from templates/libXaw/depends rename to srcpkgs/libXaw/depends diff --git a/templates/libXaw/devel.template b/srcpkgs/libXaw/libXaw-devel.template similarity index 100% rename from templates/libXaw/devel.template rename to srcpkgs/libXaw/libXaw-devel.template diff --git a/templates/libXaw/template b/srcpkgs/libXaw/template similarity index 96% rename from templates/libXaw/template rename to srcpkgs/libXaw/template index b702d9d24b8..44be6314040 100644 --- a/templates/libXaw/template +++ b/srcpkgs/libXaw/template @@ -12,7 +12,7 @@ long_desc=" This libXaw is from the modular Xorg X11." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXcomposite-devel b/srcpkgs/libXcomposite-devel similarity index 100% rename from templates/libXcomposite-devel rename to srcpkgs/libXcomposite-devel diff --git a/templates/libXcomposite/depends b/srcpkgs/libXcomposite/depends similarity index 100% rename from templates/libXcomposite/depends rename to srcpkgs/libXcomposite/depends diff --git a/templates/libXcomposite/devel.template b/srcpkgs/libXcomposite/libXcomposite-devel.template similarity index 100% rename from templates/libXcomposite/devel.template rename to srcpkgs/libXcomposite/libXcomposite-devel.template diff --git a/templates/libXcomposite/template b/srcpkgs/libXcomposite/template similarity index 95% rename from templates/libXcomposite/template rename to srcpkgs/libXcomposite/template index 16bb0365d8a..5f8e73657dc 100644 --- a/templates/libXcomposite/template +++ b/srcpkgs/libXcomposite/template @@ -10,7 +10,7 @@ long_desc=" This package contains the library and header files for the X Composite Library. This is from the modular X.org project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build fixesproto diff --git a/templates/libXcursor-devel b/srcpkgs/libXcursor-devel similarity index 100% rename from templates/libXcursor-devel rename to srcpkgs/libXcursor-devel diff --git a/templates/libXcursor/depends b/srcpkgs/libXcursor/depends similarity index 100% rename from templates/libXcursor/depends rename to srcpkgs/libXcursor/depends diff --git a/templates/libXcursor/devel.template b/srcpkgs/libXcursor/libXcursor-devel.template similarity index 100% rename from templates/libXcursor/devel.template rename to srcpkgs/libXcursor/libXcursor-devel.template diff --git a/templates/libXcursor/template b/srcpkgs/libXcursor/template similarity index 96% rename from templates/libXcursor/template rename to srcpkgs/libXcursor/template index ef9877e2500..22b9fdb132e 100644 --- a/templates/libXcursor/template +++ b/srcpkgs/libXcursor/template @@ -13,7 +13,7 @@ long_desc=" This is from the modular X.org project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency full glibc diff --git a/templates/libXdamage-devel b/srcpkgs/libXdamage-devel similarity index 100% rename from templates/libXdamage-devel rename to srcpkgs/libXdamage-devel diff --git a/templates/libXdamage/depends b/srcpkgs/libXdamage/depends similarity index 100% rename from templates/libXdamage/depends rename to srcpkgs/libXdamage/depends diff --git a/templates/libXdamage/devel.template b/srcpkgs/libXdamage/libXdamage-devel.template similarity index 100% rename from templates/libXdamage/devel.template rename to srcpkgs/libXdamage/libXdamage-devel.template diff --git a/templates/libXdamage/template b/srcpkgs/libXdamage/template similarity index 94% rename from templates/libXdamage/template rename to srcpkgs/libXdamage/template index b041f8044d6..0bed4ea2ea2 100644 --- a/templates/libXdamage/template +++ b/srcpkgs/libXdamage/template @@ -9,7 +9,7 @@ checksum=a56a10acb34827c4d1a0ee282a338cbb04baa03d7fc7bc69e5690915c8fc7c0a long_desc=" This package contains the Xdamage extension." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build damageproto diff --git a/templates/libXdmcp-devel b/srcpkgs/libXdmcp-devel similarity index 100% rename from templates/libXdmcp-devel rename to srcpkgs/libXdmcp-devel diff --git a/templates/libXdmcp/depends b/srcpkgs/libXdmcp/depends similarity index 100% rename from templates/libXdmcp/depends rename to srcpkgs/libXdmcp/depends diff --git a/templates/libXdmcp/devel.template b/srcpkgs/libXdmcp/libXdmcp-devel.template similarity index 100% rename from templates/libXdmcp/devel.template rename to srcpkgs/libXdmcp/libXdmcp-devel.template diff --git a/templates/libXdmcp/template b/srcpkgs/libXdmcp/template similarity index 94% rename from templates/libXdmcp/template rename to srcpkgs/libXdmcp/template index 9f1e9af227a..8bfbe6c97d9 100644 --- a/templates/libXdmcp/template +++ b/srcpkgs/libXdmcp/template @@ -10,7 +10,7 @@ long_desc=" This is the X Display Manager Control Protocol library. This is from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency build pkg-config Add_dependency build xproto diff --git a/templates/libXevie-devel b/srcpkgs/libXevie-devel similarity index 100% rename from templates/libXevie-devel rename to srcpkgs/libXevie-devel diff --git a/templates/libXevie/depends b/srcpkgs/libXevie/depends similarity index 100% rename from templates/libXevie/depends rename to srcpkgs/libXevie/depends diff --git a/templates/libXevie/devel.template b/srcpkgs/libXevie/devel.template similarity index 100% rename from templates/libXevie/devel.template rename to srcpkgs/libXevie/devel.template diff --git a/templates/libXevie/template b/srcpkgs/libXevie/template similarity index 100% rename from templates/libXevie/template rename to srcpkgs/libXevie/template diff --git a/templates/libXext-devel b/srcpkgs/libXext-devel similarity index 100% rename from templates/libXext-devel rename to srcpkgs/libXext-devel diff --git a/templates/libXext/depends b/srcpkgs/libXext/depends similarity index 100% rename from templates/libXext/depends rename to srcpkgs/libXext/depends diff --git a/templates/libXext/devel.template b/srcpkgs/libXext/libXext-devel.template similarity index 100% rename from templates/libXext/devel.template rename to srcpkgs/libXext/libXext-devel.template diff --git a/templates/libXext/template b/srcpkgs/libXext/template similarity index 94% rename from templates/libXext/template rename to srcpkgs/libXext/template index 211f0f783db..a72ca7c8e85 100644 --- a/templates/libXext/template +++ b/srcpkgs/libXext/template @@ -10,7 +10,7 @@ long_desc=" This package contains the X Extension library from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXfixes-devel b/srcpkgs/libXfixes-devel similarity index 100% rename from templates/libXfixes-devel rename to srcpkgs/libXfixes-devel diff --git a/templates/libXfixes/depends b/srcpkgs/libXfixes/depends similarity index 100% rename from templates/libXfixes/depends rename to srcpkgs/libXfixes/depends diff --git a/templates/libXfixes/devel.template b/srcpkgs/libXfixes/libXfixes-devel.template similarity index 100% rename from templates/libXfixes/devel.template rename to srcpkgs/libXfixes/libXfixes-devel.template diff --git a/templates/libXfixes/template b/srcpkgs/libXfixes/template similarity index 96% rename from templates/libXfixes/template rename to srcpkgs/libXfixes/template index 9a62c071989..ad12220e786 100644 --- a/templates/libXfixes/template +++ b/srcpkgs/libXfixes/template @@ -15,7 +15,7 @@ long_desc=" This package provides the libXFixes library from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build fixesproto diff --git a/templates/libXfont-devel b/srcpkgs/libXfont-devel similarity index 100% rename from templates/libXfont-devel rename to srcpkgs/libXfont-devel diff --git a/templates/libXfont/depends b/srcpkgs/libXfont/depends similarity index 100% rename from templates/libXfont/depends rename to srcpkgs/libXfont/depends diff --git a/templates/libXfont/devel.template b/srcpkgs/libXfont/libXfont-devel.template similarity index 100% rename from templates/libXfont/devel.template rename to srcpkgs/libXfont/libXfont-devel.template diff --git a/templates/libXfont/template b/srcpkgs/libXfont/template similarity index 95% rename from templates/libXfont/template rename to srcpkgs/libXfont/template index 0c4db6c5456..79728fa2387 100644 --- a/templates/libXfont/template +++ b/srcpkgs/libXfont/template @@ -10,7 +10,7 @@ long_desc=" This package provides the X font Library from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xtrans diff --git a/templates/libXfontcache-devel b/srcpkgs/libXfontcache-devel similarity index 100% rename from templates/libXfontcache-devel rename to srcpkgs/libXfontcache-devel diff --git a/templates/libXfontcache/depends b/srcpkgs/libXfontcache/depends similarity index 100% rename from templates/libXfontcache/depends rename to srcpkgs/libXfontcache/depends diff --git a/templates/libXfontcache/devel.template b/srcpkgs/libXfontcache/libXfontcache-devel.template similarity index 100% rename from templates/libXfontcache/devel.template rename to srcpkgs/libXfontcache/libXfontcache-devel.template diff --git a/templates/libXfontcache/template b/srcpkgs/libXfontcache/template similarity index 95% rename from templates/libXfontcache/template rename to srcpkgs/libXfontcache/template index aa4cac44c5c..24db786f4c9 100644 --- a/templates/libXfontcache/template +++ b/srcpkgs/libXfontcache/template @@ -11,7 +11,7 @@ long_desc=" This is from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build fontcacheproto diff --git a/templates/libXft-devel b/srcpkgs/libXft-devel similarity index 100% rename from templates/libXft-devel rename to srcpkgs/libXft-devel diff --git a/templates/libXft/depends b/srcpkgs/libXft/depends similarity index 100% rename from templates/libXft/depends rename to srcpkgs/libXft/depends diff --git a/templates/libXft/devel.template b/srcpkgs/libXft/libXft-devel.template similarity index 100% rename from templates/libXft/devel.template rename to srcpkgs/libXft/libXft-devel.template diff --git a/templates/libXft/template b/srcpkgs/libXft/template similarity index 97% rename from templates/libXft/template rename to srcpkgs/libXft/template index e2ce5534576..8f989e198e5 100644 --- a/templates/libXft/template +++ b/srcpkgs/libXft/template @@ -18,7 +18,7 @@ long_desc=" can confidently use its API to access client-side fonts in any X environment." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency full glibc diff --git a/templates/libXi-devel b/srcpkgs/libXi-devel similarity index 100% rename from templates/libXi-devel rename to srcpkgs/libXi-devel diff --git a/templates/libXi/depends b/srcpkgs/libXi/depends similarity index 100% rename from templates/libXi/depends rename to srcpkgs/libXi/depends diff --git a/templates/libXi/devel.template b/srcpkgs/libXi/libXi-devel.template similarity index 100% rename from templates/libXi/devel.template rename to srcpkgs/libXi/libXi-devel.template diff --git a/templates/libXi/template b/srcpkgs/libXi/template similarity index 95% rename from templates/libXi/template rename to srcpkgs/libXi/template index d0a7e5f6d94..098b9ae9f26 100644 --- a/templates/libXi/template +++ b/srcpkgs/libXi/template @@ -13,7 +13,7 @@ long_desc=" This is part of the X Libraries and Protocol Headers Project at freedesktop.org." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXinerama-devel b/srcpkgs/libXinerama-devel similarity index 100% rename from templates/libXinerama-devel rename to srcpkgs/libXinerama-devel diff --git a/templates/libXinerama/depends b/srcpkgs/libXinerama/depends similarity index 100% rename from templates/libXinerama/depends rename to srcpkgs/libXinerama/depends diff --git a/templates/libXinerama/devel.template b/srcpkgs/libXinerama/libXinerama-devel.template similarity index 100% rename from templates/libXinerama/devel.template rename to srcpkgs/libXinerama/libXinerama-devel.template diff --git a/templates/libXinerama/template b/srcpkgs/libXinerama/template similarity index 95% rename from templates/libXinerama/template rename to srcpkgs/libXinerama/template index 750fdd95639..efe89542388 100644 --- a/templates/libXinerama/template +++ b/srcpkgs/libXinerama/template @@ -9,7 +9,7 @@ checksum=e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34 long_desc=" libXinerama provides X PanoramiX extension library." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXmu-devel b/srcpkgs/libXmu-devel similarity index 100% rename from templates/libXmu-devel rename to srcpkgs/libXmu-devel diff --git a/templates/libXmu/depends b/srcpkgs/libXmu/depends similarity index 100% rename from templates/libXmu/depends rename to srcpkgs/libXmu/depends diff --git a/templates/libXmu/devel.template b/srcpkgs/libXmu/libXmu-devel.template similarity index 100% rename from templates/libXmu/devel.template rename to srcpkgs/libXmu/libXmu-devel.template diff --git a/templates/libXmu/template b/srcpkgs/libXmu/template similarity index 97% rename from templates/libXmu/template rename to srcpkgs/libXmu/template index 49d993703d0..7d75abd522e 100644 --- a/templates/libXmu/template +++ b/srcpkgs/libXmu/template @@ -16,7 +16,7 @@ long_desc=" This is from the modular X.org project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXp-devel b/srcpkgs/libXp-devel similarity index 100% rename from templates/libXp-devel rename to srcpkgs/libXp-devel diff --git a/templates/libXp/depends b/srcpkgs/libXp/depends similarity index 100% rename from templates/libXp/depends rename to srcpkgs/libXp/depends diff --git a/templates/libXp/devel.template b/srcpkgs/libXp/libXp-devel.template similarity index 100% rename from templates/libXp/devel.template rename to srcpkgs/libXp/libXp-devel.template diff --git a/templates/libXp/template b/srcpkgs/libXp/template similarity index 96% rename from templates/libXp/template rename to srcpkgs/libXp/template index 42156f51ced..ff602231c62 100644 --- a/templates/libXp/template +++ b/srcpkgs/libXp/template @@ -13,7 +13,7 @@ long_desc=" This is from the modular X.org." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXpm-devel b/srcpkgs/libXpm-devel similarity index 100% rename from templates/libXpm-devel rename to srcpkgs/libXpm-devel diff --git a/templates/libXpm/depends b/srcpkgs/libXpm/depends similarity index 100% rename from templates/libXpm/depends rename to srcpkgs/libXpm/depends diff --git a/templates/libXpm/devel.template b/srcpkgs/libXpm/libXpm-devel.template similarity index 100% rename from templates/libXpm/devel.template rename to srcpkgs/libXpm/libXpm-devel.template diff --git a/templates/libXpm/template b/srcpkgs/libXpm/template similarity index 95% rename from templates/libXpm/template rename to srcpkgs/libXpm/template index a4ae7dbd845..6bd23e98da8 100644 --- a/templates/libXpm/template +++ b/srcpkgs/libXpm/template @@ -12,7 +12,7 @@ long_desc=" This libXpm is from the modular Xorg X11." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build gettext Add_dependency build xproto diff --git a/templates/libXrandr-devel b/srcpkgs/libXrandr-devel similarity index 100% rename from templates/libXrandr-devel rename to srcpkgs/libXrandr-devel diff --git a/templates/libXrandr/depends b/srcpkgs/libXrandr/depends similarity index 100% rename from templates/libXrandr/depends rename to srcpkgs/libXrandr/depends diff --git a/templates/libXrandr/devel.template b/srcpkgs/libXrandr/libXrandr-devel.template similarity index 100% rename from templates/libXrandr/devel.template rename to srcpkgs/libXrandr/libXrandr-devel.template diff --git a/templates/libXrandr/template b/srcpkgs/libXrandr/template similarity index 96% rename from templates/libXrandr/template rename to srcpkgs/libXrandr/template index ea4b1bc1b53..e68ff162ad3 100644 --- a/templates/libXrandr/template +++ b/srcpkgs/libXrandr/template @@ -15,7 +15,7 @@ long_desc=" the size and rotation of the root window of a screen, along with the ability to reflect the screen about either axis." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXrender-devel b/srcpkgs/libXrender-devel similarity index 100% rename from templates/libXrender-devel rename to srcpkgs/libXrender-devel diff --git a/templates/libXrender/depends b/srcpkgs/libXrender/depends similarity index 100% rename from templates/libXrender/depends rename to srcpkgs/libXrender/depends diff --git a/templates/libXrender/devel.template b/srcpkgs/libXrender/libXrender-devel.template similarity index 100% rename from templates/libXrender/devel.template rename to srcpkgs/libXrender/libXrender-devel.template diff --git a/templates/libXrender/template b/srcpkgs/libXrender/template similarity index 96% rename from templates/libXrender/template rename to srcpkgs/libXrender/template index f6f39945dfa..8ca3577dbbe 100644 --- a/templates/libXrender/template +++ b/srcpkgs/libXrender/template @@ -18,7 +18,7 @@ long_desc=" This is the modular X.org X11 project version." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build renderproto Add_dependency full glibc diff --git a/templates/libXres-devel b/srcpkgs/libXres-devel similarity index 100% rename from templates/libXres-devel rename to srcpkgs/libXres-devel diff --git a/templates/libXres/depends b/srcpkgs/libXres/depends similarity index 100% rename from templates/libXres/depends rename to srcpkgs/libXres/depends diff --git a/templates/libXres/devel.template b/srcpkgs/libXres/libXres-devel.template similarity index 100% rename from templates/libXres/devel.template rename to srcpkgs/libXres/libXres-devel.template diff --git a/templates/libXres/template b/srcpkgs/libXres/template similarity index 96% rename from templates/libXres/template rename to srcpkgs/libXres/template index 772555b35a9..b56a32bce1a 100644 --- a/templates/libXres/template +++ b/srcpkgs/libXres/template @@ -13,7 +13,7 @@ long_desc=" X-Resource is an extension that allows a client to query the X server about its usage of various resources." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXt-devel b/srcpkgs/libXt-devel similarity index 100% rename from templates/libXt-devel rename to srcpkgs/libXt-devel diff --git a/templates/libXt/depends b/srcpkgs/libXt/depends similarity index 100% rename from templates/libXt/depends rename to srcpkgs/libXt/depends diff --git a/templates/libXt/devel.template b/srcpkgs/libXt/libXt-devel.template similarity index 100% rename from templates/libXt/devel.template rename to srcpkgs/libXt/libXt-devel.template diff --git a/templates/libXt/template b/srcpkgs/libXt/template similarity index 96% rename from templates/libXt/template rename to srcpkgs/libXt/template index c473ad1a2d2..517be8fac79 100644 --- a/templates/libXt/template +++ b/srcpkgs/libXt/template @@ -14,7 +14,7 @@ long_desc=" This is from the modular X.org project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build kbproto diff --git a/templates/libXtst-devel b/srcpkgs/libXtst-devel similarity index 100% rename from templates/libXtst-devel rename to srcpkgs/libXtst-devel diff --git a/templates/libXtst/depends b/srcpkgs/libXtst/depends similarity index 100% rename from templates/libXtst/depends rename to srcpkgs/libXtst/depends diff --git a/templates/libXtst/devel.template b/srcpkgs/libXtst/libXtst-devel.template similarity index 100% rename from templates/libXtst/devel.template rename to srcpkgs/libXtst/libXtst-devel.template diff --git a/templates/libXtst/template b/srcpkgs/libXtst/template similarity index 95% rename from templates/libXtst/template rename to srcpkgs/libXtst/template index 408a12f5376..44dc0689ddc 100644 --- a/templates/libXtst/template +++ b/srcpkgs/libXtst/template @@ -9,7 +9,7 @@ checksum=bd440f4779e06957211ba83782a5a1cfbf1d42b14fd3510a6dce440489a4eb26 long_desc=" This package provides the X Tst Library from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXv-devel b/srcpkgs/libXv-devel similarity index 100% rename from templates/libXv-devel rename to srcpkgs/libXv-devel diff --git a/templates/libXv/depends b/srcpkgs/libXv/depends similarity index 100% rename from templates/libXv/depends rename to srcpkgs/libXv/depends diff --git a/templates/libXv/devel.template b/srcpkgs/libXv/libXv-devel.template similarity index 100% rename from templates/libXv/devel.template rename to srcpkgs/libXv/libXv-devel.template diff --git a/templates/libXv/template b/srcpkgs/libXv/template similarity index 95% rename from templates/libXv/template rename to srcpkgs/libXv/template index 27a5532c9c0..d74e75db0ec 100644 --- a/templates/libXv/template +++ b/srcpkgs/libXv/template @@ -10,7 +10,7 @@ long_desc=" This package provides the X Window System video extension from the modular X.org project" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXvMC-devel b/srcpkgs/libXvMC-devel similarity index 100% rename from templates/libXvMC-devel rename to srcpkgs/libXvMC-devel diff --git a/templates/libXvMC/depends b/srcpkgs/libXvMC/depends similarity index 100% rename from templates/libXvMC/depends rename to srcpkgs/libXvMC/depends diff --git a/templates/libXvMC/devel.template b/srcpkgs/libXvMC/libXvMC-devel.template similarity index 100% rename from templates/libXvMC/devel.template rename to srcpkgs/libXvMC/libXvMC-devel.template diff --git a/templates/libXvMC/template b/srcpkgs/libXvMC/template similarity index 96% rename from templates/libXvMC/template rename to srcpkgs/libXvMC/template index 26a77d73de4..f7a3536e507 100644 --- a/templates/libXvMC/template +++ b/srcpkgs/libXvMC/template @@ -11,7 +11,7 @@ long_desc=" playback by offloading video decoding to hardware. It is an extension of the X video extension for the X Window System." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXxf86dga-devel b/srcpkgs/libXxf86dga-devel similarity index 100% rename from templates/libXxf86dga-devel rename to srcpkgs/libXxf86dga-devel diff --git a/templates/libXxf86dga/depends b/srcpkgs/libXxf86dga/depends similarity index 100% rename from templates/libXxf86dga/depends rename to srcpkgs/libXxf86dga/depends diff --git a/templates/libXxf86dga/devel.template b/srcpkgs/libXxf86dga/libXxf86dga-devel.template similarity index 100% rename from templates/libXxf86dga/devel.template rename to srcpkgs/libXxf86dga/libXxf86dga-devel.template diff --git a/templates/libXxf86dga/template b/srcpkgs/libXxf86dga/template similarity index 96% rename from templates/libXxf86dga/template rename to srcpkgs/libXxf86dga/template index 73c45ce27e4..56322e0b8f2 100644 --- a/templates/libXxf86dga/template +++ b/srcpkgs/libXxf86dga/template @@ -13,7 +13,7 @@ long_desc=" This library is from the modular X.org project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXxf86misc-devel b/srcpkgs/libXxf86misc-devel similarity index 100% rename from templates/libXxf86misc-devel rename to srcpkgs/libXxf86misc-devel diff --git a/templates/libXxf86misc/depends b/srcpkgs/libXxf86misc/depends similarity index 100% rename from templates/libXxf86misc/depends rename to srcpkgs/libXxf86misc/depends diff --git a/templates/libXxf86misc/devel.template b/srcpkgs/libXxf86misc/libXxf86misc-devel.template similarity index 100% rename from templates/libXxf86misc/devel.template rename to srcpkgs/libXxf86misc/libXxf86misc-devel.template diff --git a/templates/libXxf86misc/template b/srcpkgs/libXxf86misc/template similarity index 96% rename from templates/libXxf86misc/template rename to srcpkgs/libXxf86misc/template index f70bddb66da..58054e4a614 100644 --- a/templates/libXxf86misc/template +++ b/srcpkgs/libXxf86misc/template @@ -11,7 +11,7 @@ long_desc=" to the XFree86-Misc extension which allows various server settings to be queried and changed dynamically." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libXxf86vm-devel b/srcpkgs/libXxf86vm-devel similarity index 100% rename from templates/libXxf86vm-devel rename to srcpkgs/libXxf86vm-devel diff --git a/templates/libXxf86vm/depends b/srcpkgs/libXxf86vm/depends similarity index 100% rename from templates/libXxf86vm/depends rename to srcpkgs/libXxf86vm/depends diff --git a/templates/libXxf86vm/devel.template b/srcpkgs/libXxf86vm/libXxf86vm-devel.template similarity index 100% rename from templates/libXxf86vm/devel.template rename to srcpkgs/libXxf86vm/libXxf86vm-devel.template diff --git a/templates/libXxf86vm/template b/srcpkgs/libXxf86vm/template similarity index 96% rename from templates/libXxf86vm/template rename to srcpkgs/libXxf86vm/template index 0a6cc23c635..aecc4fcff46 100644 --- a/templates/libXxf86vm/template +++ b/srcpkgs/libXxf86vm/template @@ -13,7 +13,7 @@ long_desc=" This library is from the modular X.org project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libarchive-devel b/srcpkgs/libarchive-devel similarity index 100% rename from templates/libarchive-devel rename to srcpkgs/libarchive-devel diff --git a/templates/libarchive/depends b/srcpkgs/libarchive/depends similarity index 100% rename from templates/libarchive/depends rename to srcpkgs/libarchive/depends diff --git a/templates/libarchive/devel.template b/srcpkgs/libarchive/libarchive-devel.template similarity index 100% rename from templates/libarchive/devel.template rename to srcpkgs/libarchive/libarchive-devel.template diff --git a/templates/libarchive/template b/srcpkgs/libarchive/template similarity index 96% rename from templates/libarchive/template rename to srcpkgs/libarchive/template index 08ff821a80d..54c7b2c29c1 100644 --- a/templates/libarchive/template +++ b/srcpkgs/libarchive/template @@ -13,7 +13,7 @@ long_desc=" several cpio formats, and both BSD and GNU ar variants. It can also write shar archives and read ISO9660 CDROM images and ZIP archives." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full bzip2 Add_dependency full zlib Add_dependency full attr diff --git a/templates/libart-devel b/srcpkgs/libart-devel similarity index 100% rename from templates/libart-devel rename to srcpkgs/libart-devel diff --git a/templates/libart/depends b/srcpkgs/libart/depends similarity index 100% rename from templates/libart/depends rename to srcpkgs/libart/depends diff --git a/templates/libart/devel.template b/srcpkgs/libart/libart-devel.template similarity index 100% rename from templates/libart/devel.template rename to srcpkgs/libart/libart-devel.template diff --git a/templates/libart/template b/srcpkgs/libart/template similarity index 97% rename from templates/libart/template rename to srcpkgs/libart/template index 89b9d120550..60b587dfc5a 100644 --- a/templates/libart/template +++ b/srcpkgs/libart/template @@ -21,6 +21,6 @@ long_desc=" of Region of Interest, as well as a two-phase rendering pipeline optimized for interactive display." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency run glibc diff --git a/templates/libblkid-devel b/srcpkgs/libblkid-devel similarity index 100% rename from templates/libblkid-devel rename to srcpkgs/libblkid-devel diff --git a/templates/libblkid/depends b/srcpkgs/libblkid/depends similarity index 100% rename from templates/libblkid/depends rename to srcpkgs/libblkid/depends diff --git a/templates/libblkid/devel.template b/srcpkgs/libblkid/libblkid-devel.template similarity index 100% rename from templates/libblkid/devel.template rename to srcpkgs/libblkid/libblkid-devel.template diff --git a/templates/libblkid/patches/Makefile_only_shlibs_target.diff b/srcpkgs/libblkid/patches/Makefile_only_shlibs_target.diff similarity index 100% rename from templates/libblkid/patches/Makefile_only_shlibs_target.diff rename to srcpkgs/libblkid/patches/Makefile_only_shlibs_target.diff diff --git a/templates/libblkid/template b/srcpkgs/libblkid/template similarity index 95% rename from templates/libblkid/template rename to srcpkgs/libblkid/template index bed7d145a6c..752e2eae751 100644 --- a/templates/libblkid/template +++ b/srcpkgs/libblkid/template @@ -13,7 +13,7 @@ long_desc=" The libblkid package contains a library to handle device identification and token extraction." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full zlib Add_dependency full libuuid diff --git a/templates/libcap-devel b/srcpkgs/libcap-devel similarity index 100% rename from templates/libcap-devel rename to srcpkgs/libcap-devel diff --git a/templates/libcap-pam b/srcpkgs/libcap-pam similarity index 100% rename from templates/libcap-pam rename to srcpkgs/libcap-pam diff --git a/templates/libcap-progs b/srcpkgs/libcap-progs similarity index 100% rename from templates/libcap-progs rename to srcpkgs/libcap-progs diff --git a/templates/libcap/depends b/srcpkgs/libcap/depends similarity index 100% rename from templates/libcap/depends rename to srcpkgs/libcap/depends diff --git a/templates/libcap/devel.template b/srcpkgs/libcap/libcap-devel.template similarity index 100% rename from templates/libcap/devel.template rename to srcpkgs/libcap/libcap-devel.template diff --git a/templates/libcap/pam.template b/srcpkgs/libcap/libcap-pam.template similarity index 100% rename from templates/libcap/pam.template rename to srcpkgs/libcap/libcap-pam.template diff --git a/templates/libcap/progs.template b/srcpkgs/libcap/libcap-progs.template similarity index 100% rename from templates/libcap/progs.template rename to srcpkgs/libcap/libcap-progs.template diff --git a/templates/libcap/template b/srcpkgs/libcap/template similarity index 92% rename from templates/libcap/template rename to srcpkgs/libcap/template index 86ac417e3c5..927e17ecf08 100644 --- a/templates/libcap/template +++ b/srcpkgs/libcap/template @@ -11,12 +11,12 @@ long_desc=" libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities." -subpackages="devel pam progs" +subpackages="$pkgname-devel $pkgname-pam $pkgname-progs" Add_dependency build perl Add_dependency build pam Add_dependency full glibc -pre_configure() +pre_build() { sed -i -e "s|LIBDIR=\$(FAKEROOT)\$(lib_prefix)\/lib|LIBDIR=\$(FAKEROOT)/\$(lib)|g" \ ${wrksrc}/Make.Rules diff --git a/templates/libcroco-devel b/srcpkgs/libcroco-devel similarity index 100% rename from templates/libcroco-devel rename to srcpkgs/libcroco-devel diff --git a/templates/libcroco/depends b/srcpkgs/libcroco/depends similarity index 100% rename from templates/libcroco/depends rename to srcpkgs/libcroco/depends diff --git a/templates/libcroco/devel.template b/srcpkgs/libcroco/libcroco-devel.template similarity index 100% rename from templates/libcroco/devel.template rename to srcpkgs/libcroco/libcroco-devel.template diff --git a/templates/libcroco/template b/srcpkgs/libcroco/template similarity index 96% rename from templates/libcroco/template rename to srcpkgs/libcroco/template index 18af2efca6a..d6a5ce42f15 100644 --- a/templates/libcroco/template +++ b/srcpkgs/libcroco/template @@ -12,7 +12,7 @@ long_desc=" and Cascading Style Sheet Object Model parser, a CSS2 selection engine, and an XML/CSS layout/rendering engine." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full glib diff --git a/templates/libdmx-devel b/srcpkgs/libdmx-devel similarity index 100% rename from templates/libdmx-devel rename to srcpkgs/libdmx-devel diff --git a/templates/libdmx/depends b/srcpkgs/libdmx/depends similarity index 100% rename from templates/libdmx/depends rename to srcpkgs/libdmx/depends diff --git a/templates/libdmx/devel.template b/srcpkgs/libdmx/libdmx-devel.template similarity index 100% rename from templates/libdmx/devel.template rename to srcpkgs/libdmx/libdmx-devel.template diff --git a/templates/libdmx/template b/srcpkgs/libdmx/template similarity index 95% rename from templates/libdmx/template rename to srcpkgs/libdmx/template index 804e5b350be..3d2988e4997 100644 --- a/templates/libdmx/template +++ b/srcpkgs/libdmx/template @@ -11,7 +11,7 @@ long_desc=" This is from the modular X.org project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build dmxproto diff --git a/templates/libdrm-devel b/srcpkgs/libdrm-devel similarity index 100% rename from templates/libdrm-devel rename to srcpkgs/libdrm-devel diff --git a/templates/libdrm/depends b/srcpkgs/libdrm/depends similarity index 100% rename from templates/libdrm/depends rename to srcpkgs/libdrm/depends diff --git a/templates/libdrm/devel.template b/srcpkgs/libdrm/libdrm-devel.template similarity index 100% rename from templates/libdrm/devel.template rename to srcpkgs/libdrm/libdrm-devel.template diff --git a/templates/libdrm/patches/configure_no_pthread_stubs.diff b/srcpkgs/libdrm/patches/configure_no_pthread_stubs.diff similarity index 100% rename from templates/libdrm/patches/configure_no_pthread_stubs.diff rename to srcpkgs/libdrm/patches/configure_no_pthread_stubs.diff diff --git a/templates/libdrm/template b/srcpkgs/libdrm/template similarity index 95% rename from templates/libdrm/template rename to srcpkgs/libdrm/template index df55aaffd8f..3330a64cc21 100644 --- a/templates/libdrm/template +++ b/srcpkgs/libdrm/template @@ -13,6 +13,6 @@ long_desc=" to kernel DRM (Direct Rendering Manager) services for access to graphics hardware." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full udev diff --git a/templates/libevent-devel b/srcpkgs/libevent-devel similarity index 100% rename from templates/libevent-devel rename to srcpkgs/libevent-devel diff --git a/templates/libevent/depends b/srcpkgs/libevent/depends similarity index 100% rename from templates/libevent/depends rename to srcpkgs/libevent/depends diff --git a/templates/libevent/devel.template b/srcpkgs/libevent/libevent-devel.template similarity index 100% rename from templates/libevent/devel.template rename to srcpkgs/libevent/libevent-devel.template diff --git a/templates/libevent/template b/srcpkgs/libevent/template similarity index 96% rename from templates/libevent/template rename to srcpkgs/libevent/template index d1d5ea07fd5..e4ef0ab9679 100644 --- a/templates/libevent/template +++ b/srcpkgs/libevent/template @@ -15,5 +15,5 @@ long_desc=" to call event_dispatch() and can then add or remove events dynamically without having to change the event loop." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/libexif-devel b/srcpkgs/libexif-devel similarity index 100% rename from templates/libexif-devel rename to srcpkgs/libexif-devel diff --git a/templates/libexif/depends b/srcpkgs/libexif/depends similarity index 100% rename from templates/libexif/depends rename to srcpkgs/libexif/depends diff --git a/templates/libexif/devel.template b/srcpkgs/libexif/libexif-devel.template similarity index 100% rename from templates/libexif/devel.template rename to srcpkgs/libexif/libexif-devel.template diff --git a/templates/libexif/template b/srcpkgs/libexif/template similarity index 95% rename from templates/libexif/template rename to srcpkgs/libexif/template index 798501f85e6..c92ff28e11c 100644 --- a/templates/libexif/template +++ b/srcpkgs/libexif/template @@ -13,5 +13,5 @@ long_desc=" library allows you to parse an EXIF file and read the data from those tags." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/libffi-devel b/srcpkgs/libffi-devel similarity index 100% rename from templates/libffi-devel rename to srcpkgs/libffi-devel diff --git a/templates/libffi/depends b/srcpkgs/libffi/depends similarity index 100% rename from templates/libffi/depends rename to srcpkgs/libffi/depends diff --git a/templates/libffi/devel.template b/srcpkgs/libffi/libffi-devel.template similarity index 100% rename from templates/libffi/devel.template rename to srcpkgs/libffi/libffi-devel.template diff --git a/templates/libffi/patches/fix_includedir_path.diff b/srcpkgs/libffi/patches/fix_includedir_path.diff similarity index 100% rename from templates/libffi/patches/fix_includedir_path.diff rename to srcpkgs/libffi/patches/fix_includedir_path.diff diff --git a/templates/libffi/template b/srcpkgs/libffi/template similarity index 97% rename from templates/libffi/template rename to srcpkgs/libffi/template index ebe4d0a737a..a209413104c 100644 --- a/templates/libffi/template +++ b/srcpkgs/libffi/template @@ -25,6 +25,6 @@ long_desc=" exist above libffi that handles type conversions for values passed between the two languages." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency build texinfo diff --git a/templates/libfontenc-devel b/srcpkgs/libfontenc-devel similarity index 100% rename from templates/libfontenc-devel rename to srcpkgs/libfontenc-devel diff --git a/templates/libfontenc/depends b/srcpkgs/libfontenc/depends similarity index 100% rename from templates/libfontenc/depends rename to srcpkgs/libfontenc/depends diff --git a/templates/libfontenc/devel.template b/srcpkgs/libfontenc/libfontenc-devel.template similarity index 100% rename from templates/libfontenc/devel.template rename to srcpkgs/libfontenc/libfontenc-devel.template diff --git a/templates/libfontenc/template b/srcpkgs/libfontenc/template similarity index 94% rename from templates/libfontenc/template rename to srcpkgs/libfontenc/template index dbd23f361c4..d834880112c 100644 --- a/templates/libfontenc/template +++ b/srcpkgs/libfontenc/template @@ -9,7 +9,7 @@ checksum=7f3cde0331e9ad3da720b1a8255e121673701199df0802b62380436e74222700 long_desc=" This provides the fontenc Library from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency full glibc diff --git a/templates/gcc-libgcc b/srcpkgs/libgcc similarity index 100% rename from templates/gcc-libgcc rename to srcpkgs/libgcc diff --git a/templates/libgcrypt-devel b/srcpkgs/libgcrypt-devel similarity index 100% rename from templates/libgcrypt-devel rename to srcpkgs/libgcrypt-devel diff --git a/templates/libgcrypt/depends b/srcpkgs/libgcrypt/depends similarity index 100% rename from templates/libgcrypt/depends rename to srcpkgs/libgcrypt/depends diff --git a/templates/libgcrypt/devel.template b/srcpkgs/libgcrypt/libgcrypt-devel.template similarity index 100% rename from templates/libgcrypt/devel.template rename to srcpkgs/libgcrypt/libgcrypt-devel.template diff --git a/templates/libgcrypt/template b/srcpkgs/libgcrypt/template similarity index 96% rename from templates/libgcrypt/template rename to srcpkgs/libgcrypt/template index 8300c0725e5..1729b3c6139 100644 --- a/templates/libgcrypt/template +++ b/srcpkgs/libgcrypt/template @@ -14,7 +14,7 @@ long_desc=" algorithms (RSA, ElGamal, DSA), large integer functions, random numbers and a lot of supporting functions." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full libgpg-error Add_dependency build texinfo diff --git a/templates/libglade-devel b/srcpkgs/libglade-devel similarity index 100% rename from templates/libglade-devel rename to srcpkgs/libglade-devel diff --git a/templates/libglade/depends b/srcpkgs/libglade/depends similarity index 100% rename from templates/libglade/depends rename to srcpkgs/libglade/depends diff --git a/templates/libglade/devel.template b/srcpkgs/libglade/libglade-devel.template similarity index 100% rename from templates/libglade/devel.template rename to srcpkgs/libglade/libglade-devel.template diff --git a/templates/libglade/template b/srcpkgs/libglade/template similarity index 97% rename from templates/libglade/template rename to srcpkgs/libglade/template index b0f3ab486fd..cd1748b29b9 100644 --- a/templates/libglade/template +++ b/srcpkgs/libglade/template @@ -18,7 +18,7 @@ long_desc=" with support for keyboard accelerators and automatic signal connection." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build python Add_dependency full glibc diff --git a/templates/gcc-libgomp b/srcpkgs/libgomp similarity index 100% rename from templates/gcc-libgomp rename to srcpkgs/libgomp diff --git a/templates/libgpg-error-devel b/srcpkgs/libgpg-error-devel similarity index 100% rename from templates/libgpg-error-devel rename to srcpkgs/libgpg-error-devel diff --git a/templates/libgpg-error/depends b/srcpkgs/libgpg-error/depends similarity index 100% rename from templates/libgpg-error/depends rename to srcpkgs/libgpg-error/depends diff --git a/templates/libgpg-error/devel.template b/srcpkgs/libgpg-error/libgpg-error-devel.template similarity index 100% rename from templates/libgpg-error/devel.template rename to srcpkgs/libgpg-error/libgpg-error-devel.template diff --git a/templates/libgpg-error/template b/srcpkgs/libgpg-error/template similarity index 95% rename from templates/libgpg-error/template rename to srcpkgs/libgpg-error/template index d9f218b0f86..ddcb71dfbaf 100644 --- a/templates/libgpg-error/template +++ b/srcpkgs/libgpg-error/template @@ -11,7 +11,7 @@ long_desc=" GnuPG components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, pinentry, SmartCard Daemon and possibly more in the future." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency build gettext diff --git a/templates/libgsf-devel b/srcpkgs/libgsf-devel similarity index 100% rename from templates/libgsf-devel rename to srcpkgs/libgsf-devel diff --git a/templates/libgsf/depends b/srcpkgs/libgsf/depends similarity index 100% rename from templates/libgsf/depends rename to srcpkgs/libgsf/depends diff --git a/templates/libgsf/devel.template b/srcpkgs/libgsf/libgsf-devel.template similarity index 100% rename from templates/libgsf/devel.template rename to srcpkgs/libgsf/libgsf-devel.template diff --git a/templates/libgsf/template b/srcpkgs/libgsf/template similarity index 97% rename from templates/libgsf/template rename to srcpkgs/libgsf/template index 3d842c8a782..39789e01c00 100644 --- a/templates/libgsf/template +++ b/srcpkgs/libgsf/template @@ -13,7 +13,7 @@ long_desc=" different structured file formats. It has support for Microsoft OLE2 streams and Zip import. The aim of this library is to replace libole2." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency build python diff --git a/templates/udev-devel b/srcpkgs/libgudev similarity index 100% rename from templates/udev-devel rename to srcpkgs/libgudev diff --git a/templates/udev-glib b/srcpkgs/libgudev-devel similarity index 100% rename from templates/udev-glib rename to srcpkgs/libgudev-devel diff --git a/templates/libidn-devel b/srcpkgs/libidn-devel similarity index 100% rename from templates/libidn-devel rename to srcpkgs/libidn-devel diff --git a/templates/libidn/depends b/srcpkgs/libidn/depends similarity index 100% rename from templates/libidn/depends rename to srcpkgs/libidn/depends diff --git a/templates/libidn/devel.template b/srcpkgs/libidn/libidn-devel.template similarity index 100% rename from templates/libidn/devel.template rename to srcpkgs/libidn/libidn-devel.template diff --git a/templates/libidn/template b/srcpkgs/libidn/template similarity index 97% rename from templates/libidn/template rename to srcpkgs/libidn/template index 020dd28743b..aefade24715 100644 --- a/templates/libidn/template +++ b/srcpkgs/libidn/template @@ -21,8 +21,7 @@ long_desc=" SASL, and XMPP are included. Punycode and ASCII Compatible Encoding (ACE) via IDNA are supported." -subpackages="devel" - +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency build perl Add_dependency build pkg-config diff --git a/templates/libtool-ltdl b/srcpkgs/libltdl similarity index 100% rename from templates/libtool-ltdl rename to srcpkgs/libltdl diff --git a/templates/libmng-devel b/srcpkgs/libmng-devel similarity index 100% rename from templates/libmng-devel rename to srcpkgs/libmng-devel diff --git a/templates/libmng/depends b/srcpkgs/libmng/depends similarity index 100% rename from templates/libmng/depends rename to srcpkgs/libmng/depends diff --git a/templates/libmng/devel.template b/srcpkgs/libmng/devel.template similarity index 100% rename from templates/libmng/devel.template rename to srcpkgs/libmng/devel.template diff --git a/templates/libmng/template b/srcpkgs/libmng/template similarity index 100% rename from templates/libmng/template rename to srcpkgs/libmng/template diff --git a/templates/gcc-libmudflap b/srcpkgs/libmudflap similarity index 100% rename from templates/gcc-libmudflap rename to srcpkgs/libmudflap diff --git a/templates/gcc-libmudflap-devel b/srcpkgs/libmudflap-devel similarity index 100% rename from templates/gcc-libmudflap-devel rename to srcpkgs/libmudflap-devel diff --git a/templates/libnl-devel b/srcpkgs/libnl-devel similarity index 100% rename from templates/libnl-devel rename to srcpkgs/libnl-devel diff --git a/templates/libnl/depends b/srcpkgs/libnl/depends similarity index 100% rename from templates/libnl/depends rename to srcpkgs/libnl/depends diff --git a/templates/libnl/devel.template b/srcpkgs/libnl/libnl-devel.template similarity index 100% rename from templates/libnl/devel.template rename to srcpkgs/libnl/libnl-devel.template diff --git a/templates/libnl/patches/fix_include_netlink_local_h.diff b/srcpkgs/libnl/patches/fix_include_netlink_local_h.diff similarity index 100% rename from templates/libnl/patches/fix_include_netlink_local_h.diff rename to srcpkgs/libnl/patches/fix_include_netlink_local_h.diff diff --git a/templates/libnl/template b/srcpkgs/libnl/template similarity index 95% rename from templates/libnl/template rename to srcpkgs/libnl/template index 789631a70f7..476c7a798a0 100644 --- a/templates/libnl/template +++ b/srcpkgs/libnl/template @@ -11,6 +11,5 @@ long_desc=" The library provides an interface for raw netlink messaging and various netlink family specific interfaces." -subpackages="devel" - +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/libnotify-devel b/srcpkgs/libnotify-devel similarity index 100% rename from templates/libnotify-devel rename to srcpkgs/libnotify-devel diff --git a/templates/libnotify/depends b/srcpkgs/libnotify/depends similarity index 100% rename from templates/libnotify/depends rename to srcpkgs/libnotify/depends diff --git a/templates/libnotify/devel.template b/srcpkgs/libnotify/libnotify-devel.template similarity index 100% rename from templates/libnotify/devel.template rename to srcpkgs/libnotify/libnotify-devel.template diff --git a/templates/libnotify/template b/srcpkgs/libnotify/template similarity index 95% rename from templates/libnotify/template rename to srcpkgs/libnotify/template index ac5e81eda9d..21afe67c342 100644 --- a/templates/libnotify/template +++ b/srcpkgs/libnotify/template @@ -10,7 +10,7 @@ long_desc=" libnotify is an implementation of the freedesktop.org desktop notification specification." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full dbus-glib diff --git a/templates/gcc-libobjc b/srcpkgs/libobjc similarity index 100% rename from templates/gcc-libobjc rename to srcpkgs/libobjc diff --git a/templates/gcc-libobjc-devel b/srcpkgs/libobjc-devel similarity index 100% rename from templates/gcc-libobjc-devel rename to srcpkgs/libobjc-devel diff --git a/templates/libogg-devel b/srcpkgs/libogg-devel similarity index 100% rename from templates/libogg-devel rename to srcpkgs/libogg-devel diff --git a/templates/libogg/depends b/srcpkgs/libogg/depends similarity index 100% rename from templates/libogg/depends rename to srcpkgs/libogg/depends diff --git a/templates/libogg/devel.template b/srcpkgs/libogg/libogg-devel.template similarity index 100% rename from templates/libogg/devel.template rename to srcpkgs/libogg/libogg-devel.template diff --git a/templates/libogg/template b/srcpkgs/libogg/template similarity index 94% rename from templates/libogg/template rename to srcpkgs/libogg/template index a8ac629dd49..e1d4d8d8b9a 100644 --- a/templates/libogg/template +++ b/srcpkgs/libogg/template @@ -11,5 +11,5 @@ long_desc=" Libogg supports both making Ogg bitstreams and getting packets from Ogg bitstreams." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/liboil-devel b/srcpkgs/liboil-devel similarity index 100% rename from templates/liboil-devel rename to srcpkgs/liboil-devel diff --git a/templates/liboil/depends b/srcpkgs/liboil/depends similarity index 100% rename from templates/liboil/depends rename to srcpkgs/liboil/depends diff --git a/templates/liboil/devel.template b/srcpkgs/liboil/liboil-devel.template similarity index 100% rename from templates/liboil/devel.template rename to srcpkgs/liboil/liboil-devel.template diff --git a/templates/liboil/template b/srcpkgs/liboil/template similarity index 96% rename from templates/liboil/template rename to srcpkgs/liboil/template index 3e27de2272b..080e7f4cc7d 100644 --- a/templates/liboil/template +++ b/srcpkgs/liboil/template @@ -14,6 +14,6 @@ long_desc=" significant optimization using various techniques, especially by using extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.)." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc diff --git a/templates/libpciaccess-devel b/srcpkgs/libpciaccess-devel similarity index 100% rename from templates/libpciaccess-devel rename to srcpkgs/libpciaccess-devel diff --git a/templates/libpciaccess/depends b/srcpkgs/libpciaccess/depends similarity index 100% rename from templates/libpciaccess/depends rename to srcpkgs/libpciaccess/depends diff --git a/templates/libpciaccess/devel.template b/srcpkgs/libpciaccess/libpciaccess-devel.template similarity index 100% rename from templates/libpciaccess/devel.template rename to srcpkgs/libpciaccess/libpciaccess-devel.template diff --git a/templates/libpciaccess/template b/srcpkgs/libpciaccess/template similarity index 93% rename from templates/libpciaccess/template rename to srcpkgs/libpciaccess/template index a12328d8c01..c30be433eba 100644 --- a/templates/libpciaccess/template +++ b/srcpkgs/libpciaccess/template @@ -10,5 +10,5 @@ long_desc=" libpciaccess is a library for portable PCI access routines across multiple operating systems." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/libpng-devel b/srcpkgs/libpng-devel similarity index 100% rename from templates/libpng-devel rename to srcpkgs/libpng-devel diff --git a/templates/libpng/depends b/srcpkgs/libpng/depends similarity index 100% rename from templates/libpng/depends rename to srcpkgs/libpng/depends diff --git a/templates/libpng/devel.template b/srcpkgs/libpng/libpng-devel.template similarity index 100% rename from templates/libpng/devel.template rename to srcpkgs/libpng/libpng-devel.template diff --git a/templates/libpng/template b/srcpkgs/libpng/template similarity index 96% rename from templates/libpng/template rename to srcpkgs/libpng/template index d020d9a3e71..9d5b4f5032f 100644 --- a/templates/libpng/template +++ b/srcpkgs/libpng/template @@ -16,6 +16,6 @@ long_desc=" keeping the code easy to understand. Currently, this library only supports C. Support for other languages is being considered." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full zlib diff --git a/templates/libproxy-devel b/srcpkgs/libproxy-devel similarity index 100% rename from templates/libproxy-devel rename to srcpkgs/libproxy-devel diff --git a/templates/libproxy-python b/srcpkgs/libproxy-python similarity index 100% rename from templates/libproxy-python rename to srcpkgs/libproxy-python diff --git a/templates/libproxy/depends b/srcpkgs/libproxy/depends similarity index 100% rename from templates/libproxy/depends rename to srcpkgs/libproxy/depends diff --git a/templates/libproxy/devel.template b/srcpkgs/libproxy/libproxy-devel.template similarity index 100% rename from templates/libproxy/devel.template rename to srcpkgs/libproxy/libproxy-devel.template diff --git a/templates/libproxy/python.template b/srcpkgs/libproxy/libproxy-python.template similarity index 100% rename from templates/libproxy/python.template rename to srcpkgs/libproxy/libproxy-python.template diff --git a/templates/libproxy/template b/srcpkgs/libproxy/template similarity index 95% rename from templates/libproxy/template rename to srcpkgs/libproxy/template index ce331925e8a..c0bd38fabb4 100644 --- a/templates/libproxy/template +++ b/srcpkgs/libproxy/template @@ -21,7 +21,7 @@ long_desc=" * a standard way of dealing with proxy settings across all scenarios * a sublime sense of joy and accomplishment" -subpackages="devel python" +subpackages="$pkgname-devel $pkgname-python" Add_dependency build pkg-config Add_dependency build python Add_dependency run glibc diff --git a/templates/librsvg-devel b/srcpkgs/librsvg-devel similarity index 100% rename from templates/librsvg-devel rename to srcpkgs/librsvg-devel diff --git a/templates/librsvg/depends b/srcpkgs/librsvg/depends similarity index 100% rename from templates/librsvg/depends rename to srcpkgs/librsvg/depends diff --git a/templates/librsvg/devel.template b/srcpkgs/librsvg/librsvg-devel.template similarity index 100% rename from templates/librsvg/devel.template rename to srcpkgs/librsvg/librsvg-devel.template diff --git a/templates/librsvg/template b/srcpkgs/librsvg/template similarity index 97% rename from templates/librsvg/template rename to srcpkgs/librsvg/template index e8846d4cdb0..79fd4b3e321 100644 --- a/templates/librsvg/template +++ b/srcpkgs/librsvg/template @@ -17,7 +17,7 @@ long_desc=" triggers="gtk-immodules gtk-pixbuf-loaders" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency build python diff --git a/templates/libsmbios-devel b/srcpkgs/libsmbios-devel similarity index 100% rename from templates/libsmbios-devel rename to srcpkgs/libsmbios-devel diff --git a/templates/libsmbios-utils b/srcpkgs/libsmbios-utils similarity index 100% rename from templates/libsmbios-utils rename to srcpkgs/libsmbios-utils diff --git a/templates/libsmbios/depends b/srcpkgs/libsmbios/depends similarity index 100% rename from templates/libsmbios/depends rename to srcpkgs/libsmbios/depends diff --git a/templates/libsmbios/devel.template b/srcpkgs/libsmbios/libsmbios-devel.template similarity index 100% rename from templates/libsmbios/devel.template rename to srcpkgs/libsmbios/libsmbios-devel.template diff --git a/templates/libsmbios/utils.template b/srcpkgs/libsmbios/libsmbios-utils.template similarity index 100% rename from templates/libsmbios/utils.template rename to srcpkgs/libsmbios/libsmbios-utils.template diff --git a/templates/libsmbios/template b/srcpkgs/libsmbios/template similarity index 92% rename from templates/libsmbios/template rename to srcpkgs/libsmbios/template index 56789f01e38..25568b6fffd 100644 --- a/templates/libsmbios/template +++ b/srcpkgs/libsmbios/template @@ -1,6 +1,7 @@ # Template file for 'libsmbios' pkgname=libsmbios version=2.2.16 +revision=1 distfiles="http://linux.dell.com/$pkgname/download/$pkgname/$pkgname-$version/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-static --disable-python" @@ -11,9 +12,9 @@ long_desc=" Libsmbios is a library and utilities that can be used by client programs to get information from standard BIOS tables, such as the SMBIOS table." -subpackages="devel utils" +subpackages="$pkgname-devel $pkgname-utils" Add_dependency full glibc -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ post_install() { diff --git a/templates/libsoup-devel b/srcpkgs/libsoup-devel similarity index 100% rename from templates/libsoup-devel rename to srcpkgs/libsoup-devel diff --git a/templates/libsoup/depends b/srcpkgs/libsoup/depends similarity index 100% rename from templates/libsoup/depends rename to srcpkgs/libsoup/depends diff --git a/templates/libsoup/devel.template b/srcpkgs/libsoup/libsoup-devel.template similarity index 100% rename from templates/libsoup/devel.template rename to srcpkgs/libsoup/libsoup-devel.template diff --git a/templates/libsoup/template b/srcpkgs/libsoup/template similarity index 98% rename from templates/libsoup/template rename to srcpkgs/libsoup/template index ff588e7f524..ddfa3d483ba 100644 --- a/templates/libsoup/template +++ b/srcpkgs/libsoup/template @@ -28,7 +28,7 @@ long_desc=" * HTTP server * Server support for Digest and Basic authentication" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full libxml2 diff --git a/templates/gcc-libstdc++ b/srcpkgs/libstdc++ similarity index 100% rename from templates/gcc-libstdc++ rename to srcpkgs/libstdc++ diff --git a/templates/gcc-libstdc++-devel b/srcpkgs/libstdc++-devel similarity index 100% rename from templates/gcc-libstdc++-devel rename to srcpkgs/libstdc++-devel diff --git a/templates/libtasn1-devel b/srcpkgs/libtasn1-devel similarity index 100% rename from templates/libtasn1-devel rename to srcpkgs/libtasn1-devel diff --git a/templates/libtasn1-tools b/srcpkgs/libtasn1-tools similarity index 100% rename from templates/libtasn1-tools rename to srcpkgs/libtasn1-tools diff --git a/templates/libtasn1/depends b/srcpkgs/libtasn1/depends similarity index 100% rename from templates/libtasn1/depends rename to srcpkgs/libtasn1/depends diff --git a/templates/libtasn1/devel.template b/srcpkgs/libtasn1/libtasn1-devel.template similarity index 100% rename from templates/libtasn1/devel.template rename to srcpkgs/libtasn1/libtasn1-devel.template diff --git a/templates/libtasn1/tools.template b/srcpkgs/libtasn1/libtasn1-tools.template similarity index 100% rename from templates/libtasn1/tools.template rename to srcpkgs/libtasn1/libtasn1-tools.template diff --git a/templates/libtasn1/template b/srcpkgs/libtasn1/template similarity index 94% rename from templates/libtasn1/template rename to srcpkgs/libtasn1/template index 79e29937dcb..83dc6d75ed3 100644 --- a/templates/libtasn1/template +++ b/srcpkgs/libtasn1/template @@ -18,6 +18,6 @@ long_desc=" - DER (Distinguish Encoding Rules) encoding. - no limits for INTEGER and ENUMERATED values." -subpackages="devel tools" +subpackages="$pkgname-devel $pkgname-tools" Add_dependency full glibc Add_dependency build texinfo diff --git a/templates/libtheora-devel b/srcpkgs/libtheora-devel similarity index 100% rename from templates/libtheora-devel rename to srcpkgs/libtheora-devel diff --git a/templates/libtheora/depends b/srcpkgs/libtheora/depends similarity index 100% rename from templates/libtheora/depends rename to srcpkgs/libtheora/depends diff --git a/templates/libtheora/devel.template b/srcpkgs/libtheora/libtheora-devel.template similarity index 100% rename from templates/libtheora/devel.template rename to srcpkgs/libtheora/libtheora-devel.template diff --git a/templates/libtheora/template b/srcpkgs/libtheora/template similarity index 96% rename from templates/libtheora/template rename to srcpkgs/libtheora/template index b121b15a8ca..7f6679da5df 100644 --- a/templates/libtheora/template +++ b/srcpkgs/libtheora/template @@ -15,7 +15,7 @@ long_desc=" bitstream headers, but Theora will make use of this extra freedom in the future to improve over what is possible with VP3." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full libogg diff --git a/templates/libtool/depends b/srcpkgs/libtool/depends similarity index 100% rename from templates/libtool/depends rename to srcpkgs/libtool/depends diff --git a/templates/libtool/ltdl.template b/srcpkgs/libtool/libltdl.template similarity index 94% rename from templates/libtool/ltdl.template rename to srcpkgs/libtool/libltdl.template index 6e6430f737a..4359fe3d8c9 100644 --- a/templates/libtool/ltdl.template +++ b/srcpkgs/libtool/libltdl.template @@ -10,6 +10,9 @@ long_desc=" system-installed ltdl libraries; they are not needed by software built using the rest of the GNU Autotools (including GNU Autoconf and GNU Automake)." +replaces="libtool-ltdl" +revision=1 + Add_dependency run glibc do_install() diff --git a/templates/libtool/template b/srcpkgs/libtool/template similarity index 96% rename from templates/libtool/template rename to srcpkgs/libtool/template index 57bf86fb66f..d425f30a8d3 100644 --- a/templates/libtool/template +++ b/srcpkgs/libtool/template @@ -12,5 +12,5 @@ long_desc=" the complexity of generating special library types (such as shared libraries) befind a consistent interface." -subpackages="ltdl" +subpackages="libltdl" Add_dependency run glibc diff --git a/templates/libungif/template b/srcpkgs/libungif/template similarity index 100% rename from templates/libungif/template rename to srcpkgs/libungif/template diff --git a/templates/libunique-devel b/srcpkgs/libunique-devel similarity index 100% rename from templates/libunique-devel rename to srcpkgs/libunique-devel diff --git a/templates/libunique/depends b/srcpkgs/libunique/depends similarity index 100% rename from templates/libunique/depends rename to srcpkgs/libunique/depends diff --git a/templates/libunique/devel.template b/srcpkgs/libunique/libunique-devel.template similarity index 100% rename from templates/libunique/devel.template rename to srcpkgs/libunique/libunique-devel.template diff --git a/templates/libunique/template b/srcpkgs/libunique/template similarity index 97% rename from templates/libunique/template rename to srcpkgs/libunique/template index b7e7b2f37fe..1fadc4c338a 100644 --- a/templates/libunique/template +++ b/srcpkgs/libunique/template @@ -18,7 +18,7 @@ long_desc=" Unique aims to replace the BaconMessageConnection code that has been copied by many projects and the code using Bonobo and D-Bus." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full gtk+ Add_dependency full dbus-glib diff --git a/templates/libusb-compat-devel b/srcpkgs/libusb-compat-devel similarity index 100% rename from templates/libusb-compat-devel rename to srcpkgs/libusb-compat-devel diff --git a/templates/libusb-compat/depends b/srcpkgs/libusb-compat/depends similarity index 100% rename from templates/libusb-compat/depends rename to srcpkgs/libusb-compat/depends diff --git a/templates/libusb-compat/devel.template b/srcpkgs/libusb-compat/libusb-compat-devel.template similarity index 100% rename from templates/libusb-compat/devel.template rename to srcpkgs/libusb-compat/libusb-compat-devel.template diff --git a/templates/libusb-compat/template b/srcpkgs/libusb-compat/template similarity index 95% rename from templates/libusb-compat/template rename to srcpkgs/libusb-compat/template index f22cf902a6f..c633078945f 100644 --- a/templates/libusb-compat/template +++ b/srcpkgs/libusb-compat/template @@ -11,6 +11,6 @@ long_desc=" implementation, libusb-0.1 is more of a compatibility layer (or wrapper) which just converts libusb-0.1 calls into their libusb-1.0 equivalents." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full libusb diff --git a/templates/libusb-devel b/srcpkgs/libusb-devel similarity index 100% rename from templates/libusb-devel rename to srcpkgs/libusb-devel diff --git a/templates/libusb/depends b/srcpkgs/libusb/depends similarity index 100% rename from templates/libusb/depends rename to srcpkgs/libusb/depends diff --git a/templates/libusb/devel.template b/srcpkgs/libusb/libusb-devel.template similarity index 100% rename from templates/libusb/devel.template rename to srcpkgs/libusb/libusb-devel.template diff --git a/templates/libusb/template b/srcpkgs/libusb/template similarity index 94% rename from templates/libusb/template rename to srcpkgs/libusb/template index 367132c01f7..a52cbb1e262 100644 --- a/templates/libusb/template +++ b/srcpkgs/libusb/template @@ -11,5 +11,5 @@ checksum=c9bdc5820bc283dcfefba4d4f632c9083adffe5a06c21e089ee123209d229ecf long_desc=" This package provides a way for applications to access USB devices." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/libuuid-devel b/srcpkgs/libuuid-devel similarity index 100% rename from templates/libuuid-devel rename to srcpkgs/libuuid-devel diff --git a/templates/libuuid/depends b/srcpkgs/libuuid/depends similarity index 100% rename from templates/libuuid/depends rename to srcpkgs/libuuid/depends diff --git a/templates/libuuid/devel.template b/srcpkgs/libuuid/libuuid-devel.template similarity index 100% rename from templates/libuuid/devel.template rename to srcpkgs/libuuid/libuuid-devel.template diff --git a/templates/libuuid/patches/Makefile_in_only_shlibs.diff b/srcpkgs/libuuid/patches/Makefile_in_only_shlibs.diff similarity index 100% rename from templates/libuuid/patches/Makefile_in_only_shlibs.diff rename to srcpkgs/libuuid/patches/Makefile_in_only_shlibs.diff diff --git a/templates/libuuid/template b/srcpkgs/libuuid/template similarity index 95% rename from templates/libuuid/template rename to srcpkgs/libuuid/template index 648049cfe6e..6a8d5c96e96 100644 --- a/templates/libuuid/template +++ b/srcpkgs/libuuid/template @@ -14,5 +14,5 @@ long_desc=" libuuid generates and parses 128-bit universally unique id's (UUIDs). See RFC 4122 for more information," -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/libvisual-devel b/srcpkgs/libvisual-devel similarity index 100% rename from templates/libvisual-devel rename to srcpkgs/libvisual-devel diff --git a/templates/libvisual/depends b/srcpkgs/libvisual/depends similarity index 100% rename from templates/libvisual/depends rename to srcpkgs/libvisual/depends diff --git a/templates/libvisual/devel.template b/srcpkgs/libvisual/libvisual-devel.template similarity index 100% rename from templates/libvisual/devel.template rename to srcpkgs/libvisual/libvisual-devel.template diff --git a/templates/libvisual/template b/srcpkgs/libvisual/template similarity index 97% rename from templates/libvisual/template rename to srcpkgs/libvisual/template index 0fdf0bb8f01..a17f441c456 100644 --- a/templates/libvisual/template +++ b/srcpkgs/libvisual/template @@ -19,6 +19,6 @@ long_desc=" done by the application it also enables the developer to draw the visual anywhere he wants." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc diff --git a/templates/libvorbis-devel b/srcpkgs/libvorbis-devel similarity index 100% rename from templates/libvorbis-devel rename to srcpkgs/libvorbis-devel diff --git a/templates/libvorbis/depends b/srcpkgs/libvorbis/depends similarity index 100% rename from templates/libvorbis/depends rename to srcpkgs/libvorbis/depends diff --git a/templates/libvorbis/devel.template b/srcpkgs/libvorbis/libvorbis-devel.template similarity index 100% rename from templates/libvorbis/devel.template rename to srcpkgs/libvorbis/libvorbis-devel.template diff --git a/templates/libvorbis/template b/srcpkgs/libvorbis/template similarity index 96% rename from templates/libvorbis/template rename to srcpkgs/libvorbis/template index e1ff8787033..38432bc96d0 100644 --- a/templates/libvorbis/template +++ b/srcpkgs/libvorbis/template @@ -14,7 +14,7 @@ long_desc=" The libvorbis package contains runtime libraries for use in programs that support Ogg Vorbis." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full libogg diff --git a/templates/libwmf-devel b/srcpkgs/libwmf-devel similarity index 100% rename from templates/libwmf-devel rename to srcpkgs/libwmf-devel diff --git a/templates/libwmf/depends b/srcpkgs/libwmf/depends similarity index 100% rename from templates/libwmf/depends rename to srcpkgs/libwmf/depends diff --git a/templates/libwmf/devel.template b/srcpkgs/libwmf/libwmf-devel.template similarity index 100% rename from templates/libwmf/devel.template rename to srcpkgs/libwmf/libwmf-devel.template diff --git a/templates/libwmf/template b/srcpkgs/libwmf/template similarity index 97% rename from templates/libwmf/template rename to srcpkgs/libwmf/template index c915c95f8d3..117692b9ff3 100644 --- a/templates/libwmf/template +++ b/srcpkgs/libwmf/template @@ -22,7 +22,7 @@ long_desc=" triggers="gtk-pixbuf-loaders" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full freetype diff --git a/templates/libwnck-devel b/srcpkgs/libwnck-devel similarity index 100% rename from templates/libwnck-devel rename to srcpkgs/libwnck-devel diff --git a/templates/libwnck/depends b/srcpkgs/libwnck/depends similarity index 100% rename from templates/libwnck/depends rename to srcpkgs/libwnck/depends diff --git a/templates/libwnck/devel.template b/srcpkgs/libwnck/libwnck-devel.template similarity index 100% rename from templates/libwnck/devel.template rename to srcpkgs/libwnck/libwnck-devel.template diff --git a/templates/libwnck/template b/srcpkgs/libwnck/template similarity index 96% rename from templates/libwnck/template rename to srcpkgs/libwnck/template index b52b654cc91..9e3949dfb3f 100644 --- a/templates/libwnck/template +++ b/srcpkgs/libwnck/template @@ -11,7 +11,7 @@ long_desc=" libwnck is Window Navigator Construction Kit, i.e. a library to use for writing pagers and taskslists and stuff." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency build libXt diff --git a/templates/libx86-devel b/srcpkgs/libx86-devel similarity index 100% rename from templates/libx86-devel rename to srcpkgs/libx86-devel diff --git a/templates/libx86/depends b/srcpkgs/libx86/depends similarity index 100% rename from templates/libx86/depends rename to srcpkgs/libx86/depends diff --git a/templates/libx86/devel.template b/srcpkgs/libx86/libx86-devel.template similarity index 100% rename from templates/libx86/devel.template rename to srcpkgs/libx86/libx86-devel.template diff --git a/templates/libx86/template b/srcpkgs/libx86/template similarity index 94% rename from templates/libx86/template rename to srcpkgs/libx86/template index ba414fa9286..5eec9012251 100644 --- a/templates/libx86/template +++ b/srcpkgs/libx86/template @@ -11,5 +11,5 @@ long_desc=" A library to provide support for making real-mode x86 calls with an emulated x86 processor." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/libxcb-devel b/srcpkgs/libxcb-devel similarity index 100% rename from templates/libxcb-devel rename to srcpkgs/libxcb-devel diff --git a/templates/libxcb/depends b/srcpkgs/libxcb/depends similarity index 100% rename from templates/libxcb/depends rename to srcpkgs/libxcb/depends diff --git a/templates/libxcb/devel.template b/srcpkgs/libxcb/libxcb-devel.template similarity index 100% rename from templates/libxcb/devel.template rename to srcpkgs/libxcb/libxcb-devel.template diff --git a/templates/libxcb/patches/configure_no_pthread_stubs.diff b/srcpkgs/libxcb/patches/configure_no_pthread_stubs.diff similarity index 100% rename from templates/libxcb/patches/configure_no_pthread_stubs.diff rename to srcpkgs/libxcb/patches/configure_no_pthread_stubs.diff diff --git a/templates/libxcb/template b/srcpkgs/libxcb/template similarity index 97% rename from templates/libxcb/template rename to srcpkgs/libxcb/template index 3b4e70ab0b4..7221f540b13 100644 --- a/templates/libxcb/template +++ b/srcpkgs/libxcb/template @@ -19,7 +19,7 @@ long_desc=" Xlib can also use XCB as a transport layer, allowing software to make requests and receive responses with both, which eases porting to XCB." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build python Add_dependency build libxslt diff --git a/templates/libxfce4menu-devel b/srcpkgs/libxfce4menu-devel similarity index 100% rename from templates/libxfce4menu-devel rename to srcpkgs/libxfce4menu-devel diff --git a/templates/libxfce4menu/depends b/srcpkgs/libxfce4menu/depends similarity index 100% rename from templates/libxfce4menu/depends rename to srcpkgs/libxfce4menu/depends diff --git a/templates/libxfce4menu/devel.template b/srcpkgs/libxfce4menu/libxfce4menu-devel.template similarity index 100% rename from templates/libxfce4menu/devel.template rename to srcpkgs/libxfce4menu/libxfce4menu-devel.template diff --git a/templates/libxfce4menu/template b/srcpkgs/libxfce4menu/template similarity index 95% rename from templates/libxfce4menu/template rename to srcpkgs/libxfce4menu/template index a96084b8196..88adaa1deb7 100644 --- a/templates/libxfce4menu/template +++ b/srcpkgs/libxfce4menu/template @@ -10,7 +10,7 @@ long_desc=" This package includes a freedesktop.org compliant menu implementation for XFCE." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency full glibc diff --git a/templates/libxfce4util-devel b/srcpkgs/libxfce4util-devel similarity index 100% rename from templates/libxfce4util-devel rename to srcpkgs/libxfce4util-devel diff --git a/templates/libxfce4util/depends b/srcpkgs/libxfce4util/depends similarity index 100% rename from templates/libxfce4util/depends rename to srcpkgs/libxfce4util/depends diff --git a/templates/libxfce4util/devel.template b/srcpkgs/libxfce4util/libxfce4util-devel.template similarity index 100% rename from templates/libxfce4util/devel.template rename to srcpkgs/libxfce4util/libxfce4util-devel.template diff --git a/templates/libxfce4util/template b/srcpkgs/libxfce4util/template similarity index 94% rename from templates/libxfce4util/template rename to srcpkgs/libxfce4util/template index 3237b40ca04..eb89b0c6861 100644 --- a/templates/libxfce4util/template +++ b/srcpkgs/libxfce4util/template @@ -9,7 +9,7 @@ checksum=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b long_desc=" This package includes basic utility non-GUI functions for Xfce4." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full glib diff --git a/templates/libxfcegui4-devel b/srcpkgs/libxfcegui4-devel similarity index 100% rename from templates/libxfcegui4-devel rename to srcpkgs/libxfcegui4-devel diff --git a/templates/libxfcegui4/depends b/srcpkgs/libxfcegui4/depends similarity index 100% rename from templates/libxfcegui4/depends rename to srcpkgs/libxfcegui4/depends diff --git a/templates/libxfcegui4/devel.template b/srcpkgs/libxfcegui4/libxfcegui4-devel.template similarity index 100% rename from templates/libxfcegui4/devel.template rename to srcpkgs/libxfcegui4/libxfcegui4-devel.template diff --git a/templates/libxfcegui4/template b/srcpkgs/libxfcegui4/template similarity index 96% rename from templates/libxfcegui4/template rename to srcpkgs/libxfcegui4/template index 4efbee3ef32..f6c5e8fa9f5 100644 --- a/templates/libxfcegui4/template +++ b/srcpkgs/libxfcegui4/template @@ -13,7 +13,7 @@ conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.x gtk_iconcache_dirs="/usr/share/icons/hicolor" triggers="gtk-icon-cache" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency full glibc diff --git a/templates/libxkbfile-devel b/srcpkgs/libxkbfile-devel similarity index 100% rename from templates/libxkbfile-devel rename to srcpkgs/libxkbfile-devel diff --git a/templates/libxkbfile/depends b/srcpkgs/libxkbfile/depends similarity index 100% rename from templates/libxkbfile/depends rename to srcpkgs/libxkbfile/depends diff --git a/templates/libxkbfile/devel.template b/srcpkgs/libxkbfile/libxkbfile-devel.template similarity index 100% rename from templates/libxkbfile/devel.template rename to srcpkgs/libxkbfile/libxkbfile-devel.template diff --git a/templates/libxkbfile/template b/srcpkgs/libxkbfile/template similarity index 94% rename from templates/libxkbfile/template rename to srcpkgs/libxkbfile/template index eb13b22fe16..90d8fda357b 100644 --- a/templates/libxkbfile/template +++ b/srcpkgs/libxkbfile/template @@ -8,7 +8,7 @@ checksum=2ca43c1f6b2782994167a328471aa859d366cd7303c6dcbc8bda951a84a06039 long_desc=" The xkbfile library is from the modular X.org X11 project." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libxkbui-devel b/srcpkgs/libxkbui-devel similarity index 100% rename from templates/libxkbui-devel rename to srcpkgs/libxkbui-devel diff --git a/templates/libxkbui/depends b/srcpkgs/libxkbui/depends similarity index 100% rename from templates/libxkbui/depends rename to srcpkgs/libxkbui/depends diff --git a/templates/libxkbui/devel.template b/srcpkgs/libxkbui/libxkbui-devel.template similarity index 100% rename from templates/libxkbui/devel.template rename to srcpkgs/libxkbui/libxkbui-devel.template diff --git a/templates/libxkbui/template b/srcpkgs/libxkbui/template similarity index 95% rename from templates/libxkbui/template rename to srcpkgs/libxkbui/template index 5f1fb206a4b..3a91431b9aa 100644 --- a/templates/libxkbui/template +++ b/srcpkgs/libxkbui/template @@ -9,7 +9,7 @@ checksum=20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214 long_desc=" This is the xkbui library from modular X.org." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xextproto diff --git a/templates/libxklavier-devel b/srcpkgs/libxklavier-devel similarity index 100% rename from templates/libxklavier-devel rename to srcpkgs/libxklavier-devel diff --git a/templates/libxklavier/depends b/srcpkgs/libxklavier/depends similarity index 100% rename from templates/libxklavier/depends rename to srcpkgs/libxklavier/depends diff --git a/templates/libxklavier/devel.template b/srcpkgs/libxklavier/libxklavier-devel.template similarity index 100% rename from templates/libxklavier/devel.template rename to srcpkgs/libxklavier/libxklavier-devel.template diff --git a/templates/libxklavier/template b/srcpkgs/libxklavier/template similarity index 96% rename from templates/libxklavier/template rename to srcpkgs/libxklavier/template index d33b05cafc9..dcc37032fae 100644 --- a/templates/libxklavier/template +++ b/srcpkgs/libxklavier/template @@ -13,7 +13,7 @@ long_desc=" commercial X servers. It is useful for creating XKB-related software (layout indicators etc)." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full libxkbfile diff --git a/templates/libxml2-devel b/srcpkgs/libxml2-devel similarity index 100% rename from templates/libxml2-devel rename to srcpkgs/libxml2-devel diff --git a/templates/libxml2-python b/srcpkgs/libxml2-python similarity index 100% rename from templates/libxml2-python rename to srcpkgs/libxml2-python diff --git a/templates/libxml2/depends b/srcpkgs/libxml2/depends similarity index 100% rename from templates/libxml2/depends rename to srcpkgs/libxml2/depends diff --git a/templates/libxml2/devel.template b/srcpkgs/libxml2/libxml2-devel.template similarity index 100% rename from templates/libxml2/devel.template rename to srcpkgs/libxml2/libxml2-devel.template diff --git a/templates/libxml2/python.template b/srcpkgs/libxml2/libxml2-python.template similarity index 100% rename from templates/libxml2/python.template rename to srcpkgs/libxml2/libxml2-python.template diff --git a/templates/libxml2/template b/srcpkgs/libxml2/template similarity index 95% rename from templates/libxml2/template rename to srcpkgs/libxml2/template index a0f77fb5a27..9c3b6aebad6 100644 --- a/templates/libxml2/template +++ b/srcpkgs/libxml2/template @@ -17,7 +17,7 @@ long_desc=" available, with existing HTTP and FTP modules and combined to an URI library." -subpackages="devel python" +subpackages="$pkgname-devel $pkgname-python" Add_dependency full glibc Add_dependency full zlib Add_dependency build python diff --git a/templates/libxslt-devel b/srcpkgs/libxslt-devel similarity index 100% rename from templates/libxslt-devel rename to srcpkgs/libxslt-devel diff --git a/templates/libxslt-python b/srcpkgs/libxslt-python similarity index 100% rename from templates/libxslt-python rename to srcpkgs/libxslt-python diff --git a/templates/libxslt/depends b/srcpkgs/libxslt/depends similarity index 100% rename from templates/libxslt/depends rename to srcpkgs/libxslt/depends diff --git a/templates/libxslt/devel.template b/srcpkgs/libxslt/libxslt-devel.template similarity index 100% rename from templates/libxslt/devel.template rename to srcpkgs/libxslt/libxslt-devel.template diff --git a/templates/libxslt/python.template b/srcpkgs/libxslt/libxslt-python.template similarity index 100% rename from templates/libxslt/python.template rename to srcpkgs/libxslt/libxslt-python.template diff --git a/templates/libxslt/template b/srcpkgs/libxslt/template similarity index 94% rename from templates/libxslt/template rename to srcpkgs/libxslt/template index 7180bd6f34d..03f8da57936 100644 --- a/templates/libxslt/template +++ b/srcpkgs/libxslt/template @@ -13,7 +13,7 @@ long_desc=" the EXSLT set of extensions functions and some of Saxon's evaluate and expressions extensions." -subpackages="devel python" +subpackages="$pkgname-devel $pkgname-python" Add_dependency full glibc Add_dependency full libxml2 Add_dependency full libgcrypt diff --git a/templates/logrotate/files/logrotate.conf b/srcpkgs/logrotate/files/logrotate.conf similarity index 100% rename from templates/logrotate/files/logrotate.conf rename to srcpkgs/logrotate/files/logrotate.conf diff --git a/templates/logrotate/files/logrotate.cron-daily b/srcpkgs/logrotate/files/logrotate.cron-daily similarity index 100% rename from templates/logrotate/files/logrotate.cron-daily rename to srcpkgs/logrotate/files/logrotate.cron-daily diff --git a/templates/logrotate/template b/srcpkgs/logrotate/template similarity index 98% rename from templates/logrotate/template rename to srcpkgs/logrotate/template index 85f5207b05d..d44c6b550e4 100644 --- a/templates/logrotate/template +++ b/srcpkgs/logrotate/template @@ -21,7 +21,7 @@ Add_dependency full glibc Add_dependency full popt Add_dependency full gzip -pre_configure() +pre_build() { sed -i "s|CFLAGS = -Wall|CFLAGS += -Wall|" $wrksrc/Makefile sed -i 's|$(BASEDIR)/man|$(BASEDIR)/share/man|' $wrksrc/Makefile diff --git a/templates/lvm2/device-mapper.template b/srcpkgs/lvm2/device-mapper.template similarity index 94% rename from templates/lvm2/device-mapper.template rename to srcpkgs/lvm2/device-mapper.template index 45fd7b51659..46f061dd700 100644 --- a/templates/lvm2/device-mapper.template +++ b/srcpkgs/lvm2/device-mapper.template @@ -4,6 +4,9 @@ long_desc=" This package contains the supporting userspace utility, dmsetup, for the kernel device-mapper and its required library, libdevmapper." +replaces="lvm2-device-mapper" +revision=1 + Add_dependency run glibc Add_dependency run readline diff --git a/templates/lvm2/files/lvm2.initramfs-hook b/srcpkgs/lvm2/files/lvm2.initramfs-hook similarity index 100% rename from templates/lvm2/files/lvm2.initramfs-hook rename to srcpkgs/lvm2/files/lvm2.initramfs-hook diff --git a/templates/lvm2/files/lvm2.initramfs-local-top b/srcpkgs/lvm2/files/lvm2.initramfs-local-top similarity index 100% rename from templates/lvm2/files/lvm2.initramfs-local-top rename to srcpkgs/lvm2/files/lvm2.initramfs-local-top diff --git a/templates/lvm2/files/lvm2.rc b/srcpkgs/lvm2/files/lvm2.rc similarity index 100% rename from templates/lvm2/files/lvm2.rc rename to srcpkgs/lvm2/files/lvm2.rc diff --git a/templates/lvm2/template b/srcpkgs/lvm2/template similarity index 96% rename from templates/lvm2/template rename to srcpkgs/lvm2/template index fb5d0829131..9663c0a6b91 100644 --- a/templates/lvm2/template +++ b/srcpkgs/lvm2/template @@ -1,6 +1,7 @@ # Template file for 'lvm2' pkgname=lvm2 version=2.02.54 +revision=1 wrksrc=LVM2.${version} distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz" build_style=gnu_configure @@ -30,7 +31,7 @@ openrc_services="lvm2 shutdown" Add_dependency full glibc Add_dependency full bash Add_dependency full readline -Add_dependency run lvm2-device-mapper ">=${version}" +Add_dependency run device-mapper ">=${version}" post_install() { diff --git a/templates/lzo-devel b/srcpkgs/lzo-devel similarity index 100% rename from templates/lzo-devel rename to srcpkgs/lzo-devel diff --git a/templates/lzo/depends b/srcpkgs/lzo/depends similarity index 100% rename from templates/lzo/depends rename to srcpkgs/lzo/depends diff --git a/templates/lzo/devel.template b/srcpkgs/lzo/lzo-devel.template similarity index 100% rename from templates/lzo/devel.template rename to srcpkgs/lzo/lzo-devel.template diff --git a/templates/lzo/template b/srcpkgs/lzo/template similarity index 96% rename from templates/lzo/template rename to srcpkgs/lzo/template index 3e6585a09aa..828e0aa67d3 100644 --- a/templates/lzo/template +++ b/srcpkgs/lzo/template @@ -19,5 +19,5 @@ long_desc=" The LZO algorithms and implementations are copyrighted OpenSource distributed under the GNU General Public License." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/m4/template b/srcpkgs/m4/template similarity index 100% rename from templates/m4/template rename to srcpkgs/m4/template diff --git a/templates/make/template b/srcpkgs/make/template similarity index 100% rename from templates/make/template rename to srcpkgs/make/template diff --git a/templates/makedepend/template b/srcpkgs/makedepend/template similarity index 100% rename from templates/makedepend/template rename to srcpkgs/makedepend/template diff --git a/templates/man-db/files/man-db.cron-daily b/srcpkgs/man-db/files/man-db.cron-daily similarity index 100% rename from templates/man-db/files/man-db.cron-daily rename to srcpkgs/man-db/files/man-db.cron-daily diff --git a/templates/man-db/template b/srcpkgs/man-db/template similarity index 100% rename from templates/man-db/template rename to srcpkgs/man-db/template diff --git a/templates/man-pages/template b/srcpkgs/man-pages/template similarity index 100% rename from templates/man-pages/template rename to srcpkgs/man-pages/template diff --git a/templates/mc/template b/srcpkgs/mc/template similarity index 100% rename from templates/mc/template rename to srcpkgs/mc/template diff --git a/templates/metalog/files/metalog.conf b/srcpkgs/metalog/files/metalog.conf similarity index 100% rename from templates/metalog/files/metalog.conf rename to srcpkgs/metalog/files/metalog.conf diff --git a/templates/metalog/files/metalog.rc b/srcpkgs/metalog/files/metalog.rc similarity index 100% rename from templates/metalog/files/metalog.rc rename to srcpkgs/metalog/files/metalog.rc diff --git a/templates/metalog/template b/srcpkgs/metalog/template similarity index 100% rename from templates/metalog/template rename to srcpkgs/metalog/template diff --git a/templates/midori/template b/srcpkgs/midori/template similarity index 100% rename from templates/midori/template rename to srcpkgs/midori/template diff --git a/templates/mkfontdir/template b/srcpkgs/mkfontdir/template similarity index 100% rename from templates/mkfontdir/template rename to srcpkgs/mkfontdir/template diff --git a/templates/mkfontscale/template b/srcpkgs/mkfontscale/template similarity index 100% rename from templates/mkfontscale/template rename to srcpkgs/mkfontscale/template diff --git a/templates/module-init-tools/template b/srcpkgs/module-init-tools/template similarity index 100% rename from templates/module-init-tools/template rename to srcpkgs/module-init-tools/template diff --git a/templates/mousepad/template b/srcpkgs/mousepad/template similarity index 100% rename from templates/mousepad/template rename to srcpkgs/mousepad/template diff --git a/templates/mpfr-devel b/srcpkgs/mpfr-devel similarity index 100% rename from templates/mpfr-devel rename to srcpkgs/mpfr-devel diff --git a/templates/mpfr/depends b/srcpkgs/mpfr/depends similarity index 100% rename from templates/mpfr/depends rename to srcpkgs/mpfr/depends diff --git a/templates/mpfr/devel.template b/srcpkgs/mpfr/mpfr-devel.template similarity index 85% rename from templates/mpfr/devel.template rename to srcpkgs/mpfr/mpfr-devel.template index 48911fe90fe..2dc2fe114ef 100644 --- a/templates/mpfr/devel.template +++ b/srcpkgs/mpfr/mpfr-devel.template @@ -1,10 +1,11 @@ # Template file for 'mpfr-devel'. # -short_desc="${short_desc} (development files)" +short_desc="${sourcepkg} development files" long_desc="${long_desc} This package contains files for development: headers, static libs, etc." +revision=1 Add_dependency run mpfr do_install() diff --git a/templates/mpfr/template b/srcpkgs/mpfr/template similarity index 97% rename from templates/mpfr/template rename to srcpkgs/mpfr/template index 8f0feace64e..e416b175ad7 100644 --- a/templates/mpfr/template +++ b/srcpkgs/mpfr/template @@ -16,6 +16,5 @@ long_desc=" library." base_chroot=yes -subpackages="devel" - +subpackages="mpfr-devel" Add_dependency full gmp diff --git a/templates/nasm/template b/srcpkgs/nasm/template similarity index 100% rename from templates/nasm/template rename to srcpkgs/nasm/template diff --git a/templates/ncurses-base b/srcpkgs/ncurses-base similarity index 100% rename from templates/ncurses-base rename to srcpkgs/ncurses-base diff --git a/templates/ncurses-devel b/srcpkgs/ncurses-devel similarity index 100% rename from templates/ncurses-devel rename to srcpkgs/ncurses-devel diff --git a/templates/ncurses-libs b/srcpkgs/ncurses-libs similarity index 100% rename from templates/ncurses-libs rename to srcpkgs/ncurses-libs diff --git a/templates/ncurses-term b/srcpkgs/ncurses-term similarity index 100% rename from templates/ncurses-term rename to srcpkgs/ncurses-term diff --git a/templates/ncurses/base-files b/srcpkgs/ncurses/base-files similarity index 100% rename from templates/ncurses/base-files rename to srcpkgs/ncurses/base-files diff --git a/templates/ncurses/depends b/srcpkgs/ncurses/depends similarity index 100% rename from templates/ncurses/depends rename to srcpkgs/ncurses/depends diff --git a/templates/ncurses/base.template b/srcpkgs/ncurses/ncurses-base.template similarity index 84% rename from templates/ncurses/base.template rename to srcpkgs/ncurses/ncurses-base.template index cda1e35be35..8b38c762151 100644 --- a/templates/ncurses/base.template +++ b/srcpkgs/ncurses/ncurses-base.template @@ -1,13 +1,16 @@ # Template file for 'ncurses-base'. # -short_desc="${short_desc} (base files)" +short_desc="${sourcepkg} base files" long_desc="${long_desc} This package contains the base files." +noarch=yes +revision=1 + do_install() { - cat $XBPS_TEMPLATESDIR/ncurses/base-files | while read line; do + cat $XBPS_SRCPKGDIR/ncurses/base-files | while read line; do if [ -f ${SRCPKGDESTDIR}/${line} ]; then install -D ${SRCPKGDESTDIR}/${line} ${DESTDIR}/${line} rm -f ${SRCPKGDESTDIR}/${line} diff --git a/templates/ncurses/devel.template b/srcpkgs/ncurses/ncurses-devel.template similarity index 91% rename from templates/ncurses/devel.template rename to srcpkgs/ncurses/ncurses-devel.template index 402c7fc8af0..6667a3e2141 100644 --- a/templates/ncurses/devel.template +++ b/srcpkgs/ncurses/ncurses-devel.template @@ -1,11 +1,11 @@ # Template file for 'ncurses-devel'. # -short_desc="${short_desc} (development files)" +short_desc="${sourcepkg} development files" long_desc="${long_desc} This package contains files for development: headers, static libs, etc." -revision=1 +revision=2 Add_dependency run ncurses do_install() diff --git a/templates/ncurses/libs.template b/srcpkgs/ncurses/ncurses-libs.template similarity index 86% rename from templates/ncurses/libs.template rename to srcpkgs/ncurses/ncurses-libs.template index 9f5801d3915..a8aaaefa241 100644 --- a/templates/ncurses/libs.template +++ b/srcpkgs/ncurses/ncurses-libs.template @@ -1,10 +1,12 @@ # Template file for 'ncurses-libs'. # -short_desc="${short_desc} (shared libraries)" +short_desc="${sourcepkg} shared libraries" long_desc="${long_desc} This package contains the shared libraries." +revision=1 + Add_dependency run glibc Add_dependency run ncurses-base diff --git a/templates/ncurses/term.template b/srcpkgs/ncurses/ncurses-term.template similarity index 81% rename from templates/ncurses/term.template rename to srcpkgs/ncurses/ncurses-term.template index 694f423b91b..b9f587ce509 100644 --- a/templates/ncurses/term.template +++ b/srcpkgs/ncurses/ncurses-term.template @@ -1,10 +1,13 @@ # Template file for 'ncurses-term'. # -short_desc="${short_desc} (terminal descriptions)" +short_desc="${sourcepkg} full terminal descriptions" long_desc="${long_desc} This package contains all available terminal descriptions." +noarch=yes +revision=1 + Add_dependency run ncurses-base do_install() diff --git a/templates/ncurses/template b/srcpkgs/ncurses/template similarity index 94% rename from templates/ncurses/template rename to srcpkgs/ncurses/template index 05f799fb70d..98547aaeabf 100644 --- a/templates/ncurses/template +++ b/srcpkgs/ncurses/template @@ -17,7 +17,7 @@ long_desc=" Full manual pages are provided for the library and tools." base_chroot=yes -subpackages="base devel libs term" +subpackages="ncurses-base ncurses-devel ncurses-libs ncurses-term" Add_dependency run glibc Add_dependency run ncurses-libs diff --git a/templates/net-tools/patches/misc_fixes.diff b/srcpkgs/net-tools/patches/misc_fixes.diff similarity index 100% rename from templates/net-tools/patches/misc_fixes.diff rename to srcpkgs/net-tools/patches/misc_fixes.diff diff --git a/templates/net-tools/template b/srcpkgs/net-tools/template similarity index 100% rename from templates/net-tools/template rename to srcpkgs/net-tools/template diff --git a/templates/nfs-utils/files/exports b/srcpkgs/nfs-utils/files/exports similarity index 100% rename from templates/nfs-utils/files/exports rename to srcpkgs/nfs-utils/files/exports diff --git a/templates/nfs-utils/files/mountd.rc b/srcpkgs/nfs-utils/files/mountd.rc similarity index 100% rename from templates/nfs-utils/files/mountd.rc rename to srcpkgs/nfs-utils/files/mountd.rc diff --git a/templates/nfs-utils/files/nfsd.rc b/srcpkgs/nfs-utils/files/nfsd.rc similarity index 100% rename from templates/nfs-utils/files/nfsd.rc rename to srcpkgs/nfs-utils/files/nfsd.rc diff --git a/templates/nfs-utils/files/nfslock.rc b/srcpkgs/nfs-utils/files/nfslock.rc similarity index 100% rename from templates/nfs-utils/files/nfslock.rc rename to srcpkgs/nfs-utils/files/nfslock.rc diff --git a/templates/nfs-utils/template b/srcpkgs/nfs-utils/template similarity index 100% rename from templates/nfs-utils/template rename to srcpkgs/nfs-utils/template diff --git a/templates/nspr-devel b/srcpkgs/nspr-devel similarity index 100% rename from templates/nspr-devel rename to srcpkgs/nspr-devel diff --git a/templates/nspr/depends b/srcpkgs/nspr/depends similarity index 100% rename from templates/nspr/depends rename to srcpkgs/nspr/depends diff --git a/templates/nspr/devel.template b/srcpkgs/nspr/nspr-devel.template similarity index 100% rename from templates/nspr/devel.template rename to srcpkgs/nspr/nspr-devel.template diff --git a/templates/nspr/template b/srcpkgs/nspr/template similarity index 98% rename from templates/nspr/template rename to srcpkgs/nspr/template index ca2e464617d..f4a281d519b 100644 --- a/templates/nspr/template +++ b/srcpkgs/nspr/template @@ -17,8 +17,7 @@ long_desc=" level and libc like functions. The API is used in the Mozilla client, many of Netscape/AOL/iPlanet's and other software offerings." -subpackages="devel" - +subpackages="$pkgname-devel" Add_dependency run glibc post_install() diff --git a/templates/nss-devel b/srcpkgs/nss-devel similarity index 100% rename from templates/nss-devel rename to srcpkgs/nss-devel diff --git a/templates/nss/depends b/srcpkgs/nss/depends similarity index 100% rename from templates/nss/depends rename to srcpkgs/nss/depends diff --git a/templates/nss/devel.template b/srcpkgs/nss/nss-devel.template similarity index 100% rename from templates/nss/devel.template rename to srcpkgs/nss/nss-devel.template diff --git a/templates/nss/template b/srcpkgs/nss/template similarity index 98% rename from templates/nss/template rename to srcpkgs/nss/template index 1fcceffe7ec..b5ee15b41d0 100644 --- a/templates/nss/template +++ b/srcpkgs/nss/template @@ -13,8 +13,7 @@ long_desc=" PKCS \#7, PKCS \#11, PKCS \#12, S/MIME, X.509 v3 certificates, and other security standards." -subpackages="devel" - +subpackages="$pkgname-devel" Add_dependency run glibc Add_dependency run zlib Add_dependency full nspr diff --git a/templates/ntp-perl b/srcpkgs/ntp-perl similarity index 100% rename from templates/ntp-perl rename to srcpkgs/ntp-perl diff --git a/templates/ntp/INSTALL b/srcpkgs/ntp/INSTALL similarity index 100% rename from templates/ntp/INSTALL rename to srcpkgs/ntp/INSTALL diff --git a/templates/ntp/REMOVE b/srcpkgs/ntp/REMOVE similarity index 100% rename from templates/ntp/REMOVE rename to srcpkgs/ntp/REMOVE diff --git a/templates/ntp/files/ntp.conf b/srcpkgs/ntp/files/ntp.conf similarity index 100% rename from templates/ntp/files/ntp.conf rename to srcpkgs/ntp/files/ntp.conf diff --git a/templates/ntp/files/ntpd.confd b/srcpkgs/ntp/files/ntpd.confd similarity index 100% rename from templates/ntp/files/ntpd.confd rename to srcpkgs/ntp/files/ntpd.confd diff --git a/templates/ntp/files/ntpd.cron-hourly b/srcpkgs/ntp/files/ntpd.cron-hourly similarity index 100% rename from templates/ntp/files/ntpd.cron-hourly rename to srcpkgs/ntp/files/ntpd.cron-hourly diff --git a/templates/ntp/files/ntpd.rc b/srcpkgs/ntp/files/ntpd.rc similarity index 100% rename from templates/ntp/files/ntpd.rc rename to srcpkgs/ntp/files/ntpd.rc diff --git a/templates/ntp/perl.template b/srcpkgs/ntp/ntp-perl.template similarity index 100% rename from templates/ntp/perl.template rename to srcpkgs/ntp/ntp-perl.template diff --git a/templates/ntp/patches/fix_build.diff b/srcpkgs/ntp/patches/fix_build.diff similarity index 100% rename from templates/ntp/patches/fix_build.diff rename to srcpkgs/ntp/patches/fix_build.diff diff --git a/templates/ntp/template b/srcpkgs/ntp/template similarity index 98% rename from templates/ntp/template rename to srcpkgs/ntp/template index 755c1ef7ff7..37beeb65dc7 100644 --- a/templates/ntp/template +++ b/srcpkgs/ntp/template @@ -16,7 +16,7 @@ long_desc=" (a daemon which continuously adjusts system time) and utilities used to query and configure the ntpd daemon." -subpackages="perl" +subpackages="$pkgname-perl" conf_files="/etc/ntp.conf" openrc_services="ntpd default" diff --git a/templates/opencdk-devel b/srcpkgs/opencdk-devel similarity index 100% rename from templates/opencdk-devel rename to srcpkgs/opencdk-devel diff --git a/templates/opencdk/depends b/srcpkgs/opencdk/depends similarity index 100% rename from templates/opencdk/depends rename to srcpkgs/opencdk/depends diff --git a/templates/opencdk/devel.template b/srcpkgs/opencdk/devel.template similarity index 100% rename from templates/opencdk/devel.template rename to srcpkgs/opencdk/devel.template diff --git a/templates/opencdk/template b/srcpkgs/opencdk/template similarity index 100% rename from templates/opencdk/template rename to srcpkgs/opencdk/template diff --git a/templates/openssh-client b/srcpkgs/openssh-client similarity index 100% rename from templates/openssh-client rename to srcpkgs/openssh-client diff --git a/templates/openssh-server b/srcpkgs/openssh-server similarity index 100% rename from templates/openssh-server rename to srcpkgs/openssh-server diff --git a/templates/openssh/files/sshd.rc b/srcpkgs/openssh/files/sshd.rc similarity index 100% rename from templates/openssh/files/sshd.rc rename to srcpkgs/openssh/files/sshd.rc diff --git a/templates/openssh/client.template b/srcpkgs/openssh/openssh-client.template similarity index 100% rename from templates/openssh/client.template rename to srcpkgs/openssh/openssh-client.template diff --git a/templates/openssh/server.template b/srcpkgs/openssh/openssh-server.template similarity index 100% rename from templates/openssh/server.template rename to srcpkgs/openssh/openssh-server.template diff --git a/templates/openssh/patches/disable_check_config.diff b/srcpkgs/openssh/patches/disable_check_config.diff similarity index 100% rename from templates/openssh/patches/disable_check_config.diff rename to srcpkgs/openssh/patches/disable_check_config.diff diff --git a/templates/openssh/template b/srcpkgs/openssh/template similarity index 98% rename from templates/openssh/template rename to srcpkgs/openssh/template index d4f6515d475..d3d6dcbc2cc 100644 --- a/templates/openssh/template +++ b/srcpkgs/openssh/template @@ -28,7 +28,7 @@ long_desc=" install openssh-client, openssh-server, or both." conf_files="/etc/ssh/moduli" -subpackages="client server" +subpackages="$pkgname-client $pkgname-server" Add_dependency full glibc Add_dependency full zlib diff --git a/templates/openssl-devel b/srcpkgs/openssl-devel similarity index 100% rename from templates/openssl-devel rename to srcpkgs/openssl-devel diff --git a/templates/openssl/depends b/srcpkgs/openssl/depends similarity index 100% rename from templates/openssl/depends rename to srcpkgs/openssl/depends diff --git a/templates/openssl/devel.template b/srcpkgs/openssl/openssl-devel.template similarity index 100% rename from templates/openssl/devel.template rename to srcpkgs/openssl/openssl-devel.template diff --git a/templates/openssl/patches/fix_mandir_path.diff b/srcpkgs/openssl/patches/fix_mandir_path.diff similarity index 100% rename from templates/openssl/patches/fix_mandir_path.diff rename to srcpkgs/openssl/patches/fix_mandir_path.diff diff --git a/templates/openssl/patches/fix_sharedlib.diff b/srcpkgs/openssl/patches/fix_sharedlib.diff similarity index 100% rename from templates/openssl/patches/fix_sharedlib.diff rename to srcpkgs/openssl/patches/fix_sharedlib.diff diff --git a/templates/openssl/template b/srcpkgs/openssl/template similarity index 98% rename from templates/openssl/template rename to srcpkgs/openssl/template index a4cb2e91c93..f2de2e61d1b 100644 --- a/templates/openssl/template +++ b/srcpkgs/openssl/template @@ -21,7 +21,7 @@ long_desc=" # Does not build with -j. disable_parallel_build=yes conf_files="/etc/ssl/openssl.cnf" -subpackages="devel" +subpackages="openssl-devel" Add_dependency full glibc Add_dependency full zlib diff --git a/templates/orage/template b/srcpkgs/orage/template similarity index 100% rename from templates/orage/template rename to srcpkgs/orage/template diff --git a/templates/pam-devel b/srcpkgs/pam-devel similarity index 100% rename from templates/pam-devel rename to srcpkgs/pam-devel diff --git a/templates/pam/depends b/srcpkgs/pam/depends similarity index 100% rename from templates/pam/depends rename to srcpkgs/pam/depends diff --git a/templates/pam/devel.template b/srcpkgs/pam/pam-devel.template similarity index 100% rename from templates/pam/devel.template rename to srcpkgs/pam/pam-devel.template diff --git a/templates/pam/template b/srcpkgs/pam/template similarity index 97% rename from templates/pam/template rename to srcpkgs/pam/template index 95d5d3aa45b..5497cfe2842 100644 --- a/templates/pam/template +++ b/srcpkgs/pam/template @@ -19,7 +19,7 @@ conf_files="/etc/security/access.conf /etc/security/environment /etc/security/group.conf /etc/security/limits.conf /etc/security/namespace.conf /etc/security/pam_env.conf /etc/security/time.conf" -subpackages="devel" +subpackages="pam-devel" Add_dependency full glibc Add_dependency full cracklib diff --git a/templates/pango-devel b/srcpkgs/pango-devel similarity index 100% rename from templates/pango-devel rename to srcpkgs/pango-devel diff --git a/templates/pango/depends b/srcpkgs/pango/depends similarity index 100% rename from templates/pango/depends rename to srcpkgs/pango/depends diff --git a/templates/pango/devel.template b/srcpkgs/pango/pango-devel.template similarity index 100% rename from templates/pango/devel.template rename to srcpkgs/pango/pango-devel.template diff --git a/templates/pango/template b/srcpkgs/pango/template similarity index 98% rename from templates/pango/template rename to srcpkgs/pango/template index 650b6cb9060..1b70b78cfba 100644 --- a/templates/pango/template +++ b/srcpkgs/pango/template @@ -29,7 +29,7 @@ long_desc=" PangoLayout, a high level driver for laying out entire blocks of text, and routines to assist in editing internationalized text." -subpackages="devel" +subpackages="$pkgname-devel" triggers="pango-modules" Add_dependency build pkg-config diff --git a/templates/patch/template b/srcpkgs/patch/template similarity index 100% rename from templates/patch/template rename to srcpkgs/patch/template diff --git a/templates/pbzip2/patches/fix_Makefile.diff b/srcpkgs/pbzip2/patches/fix_Makefile.diff similarity index 100% rename from templates/pbzip2/patches/fix_Makefile.diff rename to srcpkgs/pbzip2/patches/fix_Makefile.diff diff --git a/templates/pbzip2/template b/srcpkgs/pbzip2/template similarity index 100% rename from templates/pbzip2/template rename to srcpkgs/pbzip2/template diff --git a/templates/pciutils/depends b/srcpkgs/pciutils/depends similarity index 100% rename from templates/pciutils/depends rename to srcpkgs/pciutils/depends diff --git a/templates/pciutils/template b/srcpkgs/pciutils/template similarity index 100% rename from templates/pciutils/template rename to srcpkgs/pciutils/template diff --git a/templates/pcre-devel b/srcpkgs/pcre-devel similarity index 100% rename from templates/pcre-devel rename to srcpkgs/pcre-devel diff --git a/templates/pcre/depends b/srcpkgs/pcre/depends similarity index 100% rename from templates/pcre/depends rename to srcpkgs/pcre/depends diff --git a/templates/pcre/devel.template b/srcpkgs/pcre/pcre-devel.template similarity index 100% rename from templates/pcre/devel.template rename to srcpkgs/pcre/pcre-devel.template diff --git a/templates/pcre/template b/srcpkgs/pcre/template similarity index 92% rename from templates/pcre/template rename to srcpkgs/pcre/template index c6f644816c3..6a287f966d6 100644 --- a/templates/pcre/template +++ b/srcpkgs/pcre/template @@ -1,6 +1,7 @@ # Template file for 'pcre' pkgname=pcre version=7.9 +revision=1 distfiles="$SOURCEFORGE_SITE/pcre/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-utf8 --enable-unicode-properties @@ -16,9 +17,8 @@ long_desc=" correspond to the POSIX regular expression API. The PCRE library is free, even for building commercial software." -subpackages="devel" - -Add_dependency run gcc-libstdc++ +subpackages="pcre-devel" +Add_dependency run libstdc++ Add_dependency full glibc Add_dependency full zlib Add_dependency full bzip2 diff --git a/templates/pekwm/template b/srcpkgs/pekwm/template similarity index 96% rename from templates/pekwm/template rename to srcpkgs/pekwm/template index f1dcd15f0cc..6e32d53eee9 100644 --- a/templates/pekwm/template +++ b/srcpkgs/pekwm/template @@ -1,7 +1,7 @@ # Template build file for 'pekwm'. pkgname=pekwm version=0.1.11 -revision=1 +revision=2 distfiles="http://www.pekwm.org/projects/3/files/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Window manager based on aewm++" @@ -24,7 +24,7 @@ conf_files="/etc/pekwm/keys /etc/pekwm/vars /etc/pekwm/autoproperties /etc/pekwm/mouse /etc/pekwm/config /etc/pekwm/menu /etc/pekwm/start" Add_dependency full glibc -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ Add_dependency full jpeg Add_dependency full libpng Add_dependency full libXft diff --git a/templates/perl-ExtUtils-Depends/template b/srcpkgs/perl-ExtUtils-Depends/template similarity index 100% rename from templates/perl-ExtUtils-Depends/template rename to srcpkgs/perl-ExtUtils-Depends/template diff --git a/templates/perl-ExtUtils-PkgConfig/template b/srcpkgs/perl-ExtUtils-PkgConfig/template similarity index 100% rename from templates/perl-ExtUtils-PkgConfig/template rename to srcpkgs/perl-ExtUtils-PkgConfig/template diff --git a/templates/perl-Glib/template b/srcpkgs/perl-Glib/template similarity index 100% rename from templates/perl-Glib/template rename to srcpkgs/perl-Glib/template diff --git a/templates/perl-MIME-Base64/template b/srcpkgs/perl-MIME-Base64/template similarity index 100% rename from templates/perl-MIME-Base64/template rename to srcpkgs/perl-MIME-Base64/template diff --git a/templates/perl-Storable/template b/srcpkgs/perl-Storable/template similarity index 100% rename from templates/perl-Storable/template rename to srcpkgs/perl-Storable/template diff --git a/templates/perl-Test-Simple/template b/srcpkgs/perl-Test-Simple/template similarity index 100% rename from templates/perl-Test-Simple/template rename to srcpkgs/perl-Test-Simple/template diff --git a/templates/perl-URI/template b/srcpkgs/perl-URI/template similarity index 100% rename from templates/perl-URI/template rename to srcpkgs/perl-URI/template diff --git a/templates/perl-XML-NamespaceSupport/template b/srcpkgs/perl-XML-NamespaceSupport/template similarity index 100% rename from templates/perl-XML-NamespaceSupport/template rename to srcpkgs/perl-XML-NamespaceSupport/template diff --git a/templates/perl-XML-Parser/template b/srcpkgs/perl-XML-Parser/template similarity index 100% rename from templates/perl-XML-Parser/template rename to srcpkgs/perl-XML-Parser/template diff --git a/templates/perl-XML-SAX/INSTALL b/srcpkgs/perl-XML-SAX/INSTALL similarity index 100% rename from templates/perl-XML-SAX/INSTALL rename to srcpkgs/perl-XML-SAX/INSTALL diff --git a/templates/perl-XML-SAX/REMOVE b/srcpkgs/perl-XML-SAX/REMOVE similarity index 100% rename from templates/perl-XML-SAX/REMOVE rename to srcpkgs/perl-XML-SAX/REMOVE diff --git a/templates/perl-XML-SAX/patches/disable_install_stuff.diff b/srcpkgs/perl-XML-SAX/patches/disable_install_stuff.diff similarity index 100% rename from templates/perl-XML-SAX/patches/disable_install_stuff.diff rename to srcpkgs/perl-XML-SAX/patches/disable_install_stuff.diff diff --git a/templates/perl-XML-SAX/template b/srcpkgs/perl-XML-SAX/template similarity index 100% rename from templates/perl-XML-SAX/template rename to srcpkgs/perl-XML-SAX/template diff --git a/templates/perl-XML-Simple/template b/srcpkgs/perl-XML-Simple/template similarity index 100% rename from templates/perl-XML-Simple/template rename to srcpkgs/perl-XML-Simple/template diff --git a/templates/perl/depends b/srcpkgs/perl/depends similarity index 100% rename from templates/perl/depends rename to srcpkgs/perl/depends diff --git a/templates/perl/template b/srcpkgs/perl/template similarity index 100% rename from templates/perl/template rename to srcpkgs/perl/template diff --git a/templates/pixman-devel b/srcpkgs/pixman-devel similarity index 100% rename from templates/pixman-devel rename to srcpkgs/pixman-devel diff --git a/templates/pixman/depends b/srcpkgs/pixman/depends similarity index 100% rename from templates/pixman/depends rename to srcpkgs/pixman/depends diff --git a/templates/pixman/devel.template b/srcpkgs/pixman/pixman-devel.template similarity index 100% rename from templates/pixman/devel.template rename to srcpkgs/pixman/pixman-devel.template diff --git a/templates/pixman/template b/srcpkgs/pixman/template similarity index 94% rename from templates/pixman/template rename to srcpkgs/pixman/template index 19c006bd3a2..4346cd58988 100644 --- a/templates/pixman/template +++ b/srcpkgs/pixman/template @@ -9,7 +9,7 @@ checksum=80b2fa3392e97c257ea251f99f827cc0f3dda06b876c27a0fcb54b971c296760 long_desc=" Pixel manipulation library for modular X.org." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build perl Add_dependency full glibc diff --git a/templates/pkg-config/template b/srcpkgs/pkg-config/template similarity index 100% rename from templates/pkg-config/template rename to srcpkgs/pkg-config/template diff --git a/templates/pm-utils/depends b/srcpkgs/pm-utils/depends similarity index 100% rename from templates/pm-utils/depends rename to srcpkgs/pm-utils/depends diff --git a/templates/pm-utils/files/pm-utils.logrotate b/srcpkgs/pm-utils/files/pm-utils.logrotate similarity index 100% rename from templates/pm-utils/files/pm-utils.logrotate rename to srcpkgs/pm-utils/files/pm-utils.logrotate diff --git a/templates/pm-utils/template b/srcpkgs/pm-utils/template similarity index 100% rename from templates/pm-utils/template rename to srcpkgs/pm-utils/template diff --git a/templates/poppler-devel b/srcpkgs/poppler-devel similarity index 100% rename from templates/poppler-devel rename to srcpkgs/poppler-devel diff --git a/templates/poppler-glib b/srcpkgs/poppler-glib similarity index 100% rename from templates/poppler-glib rename to srcpkgs/poppler-glib diff --git a/templates/poppler-glib-devel b/srcpkgs/poppler-glib-devel similarity index 100% rename from templates/poppler-glib-devel rename to srcpkgs/poppler-glib-devel diff --git a/templates/poppler-utils b/srcpkgs/poppler-utils similarity index 100% rename from templates/poppler-utils rename to srcpkgs/poppler-utils diff --git a/templates/poppler/depends b/srcpkgs/poppler/depends similarity index 100% rename from templates/poppler/depends rename to srcpkgs/poppler/depends diff --git a/templates/poppler/devel.template b/srcpkgs/poppler/poppler-devel.template similarity index 100% rename from templates/poppler/devel.template rename to srcpkgs/poppler/poppler-devel.template diff --git a/templates/poppler/glib-devel.template b/srcpkgs/poppler/poppler-glib-devel.template similarity index 100% rename from templates/poppler/glib-devel.template rename to srcpkgs/poppler/poppler-glib-devel.template diff --git a/templates/poppler/glib.template b/srcpkgs/poppler/poppler-glib.template similarity index 100% rename from templates/poppler/glib.template rename to srcpkgs/poppler/poppler-glib.template diff --git a/templates/poppler/utils.template b/srcpkgs/poppler/poppler-utils.template similarity index 100% rename from templates/poppler/utils.template rename to srcpkgs/poppler/poppler-utils.template diff --git a/templates/poppler/template b/srcpkgs/poppler/template similarity index 90% rename from templates/poppler/template rename to srcpkgs/poppler/template index c74bd936c35..391ae9f9aef 100644 --- a/templates/poppler/template +++ b/srcpkgs/poppler/template @@ -1,6 +1,7 @@ # Template build file for 'poppler'. pkgname=poppler version=0.12.0 +revision=1 distfiles="http://poppler.freedesktop.org/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-zlib --disable-poppler-qt --disable-poppler-qt4 @@ -18,7 +19,7 @@ long_desc=" forward in a number of areas that doesn't fit within the goals of xpdf." -subpackages="devel glib glib-devel utils" +subpackages="$pkgname-devel $pkgname-glib $pkgname-glib-devel $pkgname-utils" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full expat @@ -29,4 +30,4 @@ Add_dependency full fontconfig Add_dependency build glib Add_dependency build cairo Add_dependency build gtk+ -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ diff --git a/templates/popt-devel b/srcpkgs/popt-devel similarity index 100% rename from templates/popt-devel rename to srcpkgs/popt-devel diff --git a/templates/popt/depends b/srcpkgs/popt/depends similarity index 100% rename from templates/popt/depends rename to srcpkgs/popt/depends diff --git a/templates/popt/devel.template b/srcpkgs/popt/popt-devel.template similarity index 100% rename from templates/popt/devel.template rename to srcpkgs/popt/popt-devel.template diff --git a/templates/popt/template b/srcpkgs/popt/template similarity index 96% rename from templates/popt/template rename to srcpkgs/popt/template index 3040dae02c4..7312f21710e 100644 --- a/templates/popt/template +++ b/srcpkgs/popt/template @@ -15,6 +15,5 @@ long_desc=" source), a standard method of option aliasing, ability to exec external option filters, and automatic generation of help and usage messages." -subpackages="devel" - +subpackages="$pkgname-devel" Add_dependency full glibc diff --git a/templates/portmap/files/portmap.rc b/srcpkgs/portmap/files/portmap.rc similarity index 100% rename from templates/portmap/files/portmap.rc rename to srcpkgs/portmap/files/portmap.rc diff --git a/templates/portmap/patches/fix_Makefile.diff b/srcpkgs/portmap/patches/fix_Makefile.diff similarity index 100% rename from templates/portmap/patches/fix_Makefile.diff rename to srcpkgs/portmap/patches/fix_Makefile.diff diff --git a/templates/portmap/template b/srcpkgs/portmap/template similarity index 100% rename from templates/portmap/template rename to srcpkgs/portmap/template diff --git a/templates/ppl-devel b/srcpkgs/ppl-devel similarity index 100% rename from templates/ppl-devel rename to srcpkgs/ppl-devel diff --git a/templates/ppl/depends b/srcpkgs/ppl/depends similarity index 100% rename from templates/ppl/depends rename to srcpkgs/ppl/depends diff --git a/templates/ppl/devel.template b/srcpkgs/ppl/ppl-devel.template similarity index 98% rename from templates/ppl/devel.template rename to srcpkgs/ppl/ppl-devel.template index 3b6542dabf5..e4faa5de063 100644 --- a/templates/ppl/devel.template +++ b/srcpkgs/ppl/ppl-devel.template @@ -6,6 +6,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." Add_dependency run ppl +revision=1 do_install() { diff --git a/templates/ppl/template b/srcpkgs/ppl/template similarity index 95% rename from templates/ppl/template rename to srcpkgs/ppl/template index 68c0c7ccf3c..5941134a20c 100644 --- a/templates/ppl/template +++ b/srcpkgs/ppl/template @@ -1,6 +1,7 @@ # Template file for 'ppl' pkgname=ppl version=0.10.2 +revision=1 distfiles="http://www.cs.unipr.it/ppl/Download/ftp/releases/${version}/ppl-${version}.tar.gz" build_style=gnu_configure configure_args="--disable-rpath --enable-interfaces=c,cxx @@ -24,7 +25,7 @@ long_desc=" exact-arithmetic version of the simplex algorithm." base_chroot=yes -subpackages="devel" +subpackages="ppl-devel" Add_dependency run glibc -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ Add_dependency full gmp ">=4.3.1_1" diff --git a/templates/printproto/template b/srcpkgs/printproto/template similarity index 100% rename from templates/printproto/template rename to srcpkgs/printproto/template diff --git a/templates/procps/patches/fix_Makefile.diff b/srcpkgs/procps/patches/fix_Makefile.diff similarity index 100% rename from templates/procps/patches/fix_Makefile.diff rename to srcpkgs/procps/patches/fix_Makefile.diff diff --git a/templates/procps/template b/srcpkgs/procps/template similarity index 100% rename from templates/procps/template rename to srcpkgs/procps/template diff --git a/templates/proplib-devel b/srcpkgs/proplib-devel similarity index 100% rename from templates/proplib-devel rename to srcpkgs/proplib-devel diff --git a/templates/proplib/depends b/srcpkgs/proplib/depends similarity index 100% rename from templates/proplib/depends rename to srcpkgs/proplib/depends diff --git a/templates/proplib/devel.template b/srcpkgs/proplib/proplib-devel.template similarity index 100% rename from templates/proplib/devel.template rename to srcpkgs/proplib/proplib-devel.template diff --git a/templates/proplib/template b/srcpkgs/proplib/template similarity index 97% rename from templates/proplib/template rename to srcpkgs/proplib/template index b3cde44c450..509a06722ea 100644 --- a/templates/proplib/template +++ b/srcpkgs/proplib/template @@ -22,5 +22,5 @@ long_desc=" with the exception that NetBSD specific code has been removed and it has been converted to be built through the GNU autotools." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency run glibc diff --git a/templates/psmisc/template b/srcpkgs/psmisc/template similarity index 100% rename from templates/psmisc/template rename to srcpkgs/psmisc/template diff --git a/templates/python-devel b/srcpkgs/python-devel similarity index 100% rename from templates/python-devel rename to srcpkgs/python-devel diff --git a/templates/python/depends b/srcpkgs/python/depends similarity index 100% rename from templates/python/depends rename to srcpkgs/python/depends diff --git a/templates/python/patches/python-2.6-db-4.8.patch b/srcpkgs/python/patches/python-2.6-db-4.8.patch similarity index 100% rename from templates/python/patches/python-2.6-db-4.8.patch rename to srcpkgs/python/patches/python-2.6-db-4.8.patch diff --git a/templates/python/patches/python-2.6-gdbm.patch b/srcpkgs/python/patches/python-2.6-gdbm.patch similarity index 100% rename from templates/python/patches/python-2.6-gdbm.patch rename to srcpkgs/python/patches/python-2.6-gdbm.patch diff --git a/templates/python/patches/python-2.6-internal-expat.patch b/srcpkgs/python/patches/python-2.6-internal-expat.patch similarity index 100% rename from templates/python/patches/python-2.6-internal-expat.patch rename to srcpkgs/python/patches/python-2.6-internal-expat.patch diff --git a/templates/python/patches/python-2.6-readline.patch b/srcpkgs/python/patches/python-2.6-readline.patch similarity index 100% rename from templates/python/patches/python-2.6-readline.patch rename to srcpkgs/python/patches/python-2.6-readline.patch diff --git a/templates/python/devel.template b/srcpkgs/python/python-devel.template similarity index 100% rename from templates/python/devel.template rename to srcpkgs/python/python-devel.template diff --git a/templates/python/template b/srcpkgs/python/template similarity index 98% rename from templates/python/template rename to srcpkgs/python/template index 4d80c4b31d7..53d32f2876c 100644 --- a/templates/python/template +++ b/srcpkgs/python/template @@ -22,7 +22,7 @@ long_desc=" C++. On most systems such modules may be dynamically loaded. Python is also adaptable as an extension language for existing applications." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full libffi Add_dependency full zlib diff --git a/templates/randrproto/template b/srcpkgs/randrproto/template similarity index 100% rename from templates/randrproto/template rename to srcpkgs/randrproto/template diff --git a/templates/readline-devel b/srcpkgs/readline-devel similarity index 100% rename from templates/readline-devel rename to srcpkgs/readline-devel diff --git a/templates/readline/depends b/srcpkgs/readline/depends similarity index 100% rename from templates/readline/depends rename to srcpkgs/readline/depends diff --git a/templates/readline/devel.template b/srcpkgs/readline/readline-devel.template similarity index 100% rename from templates/readline/devel.template rename to srcpkgs/readline/readline-devel.template diff --git a/templates/readline/template b/srcpkgs/readline/template similarity index 98% rename from templates/readline/template rename to srcpkgs/readline/template index 0bb621cabdc..aa601ea707d 100644 --- a/templates/readline/template +++ b/srcpkgs/readline/template @@ -20,7 +20,7 @@ long_desc=" those lines, and perform csh-like history expansion on previous commands." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency build ncurses Add_dependency run ncurses-libs diff --git a/templates/recordproto/template b/srcpkgs/recordproto/template similarity index 100% rename from templates/recordproto/template rename to srcpkgs/recordproto/template diff --git a/templates/renderproto/template b/srcpkgs/renderproto/template similarity index 100% rename from templates/renderproto/template rename to srcpkgs/renderproto/template diff --git a/templates/resourceproto/template b/srcpkgs/resourceproto/template similarity index 100% rename from templates/resourceproto/template rename to srcpkgs/resourceproto/template diff --git a/templates/rgb/template b/srcpkgs/rgb/template similarity index 100% rename from templates/rgb/template rename to srcpkgs/rgb/template diff --git a/templates/rsyslog-gnutls b/srcpkgs/rsyslog-gnutls similarity index 100% rename from templates/rsyslog-gnutls rename to srcpkgs/rsyslog-gnutls diff --git a/templates/rsyslog/files/rsyslog.conf b/srcpkgs/rsyslog/files/rsyslog.conf similarity index 100% rename from templates/rsyslog/files/rsyslog.conf rename to srcpkgs/rsyslog/files/rsyslog.conf diff --git a/templates/rsyslog/files/rsyslog.logrotate b/srcpkgs/rsyslog/files/rsyslog.logrotate similarity index 100% rename from templates/rsyslog/files/rsyslog.logrotate rename to srcpkgs/rsyslog/files/rsyslog.logrotate diff --git a/templates/rsyslog/files/rsyslogd.rc b/srcpkgs/rsyslog/files/rsyslogd.rc similarity index 100% rename from templates/rsyslog/files/rsyslogd.rc rename to srcpkgs/rsyslog/files/rsyslogd.rc diff --git a/templates/rsyslog/gnutls.template b/srcpkgs/rsyslog/rsyslog-gnutls.template similarity index 100% rename from templates/rsyslog/gnutls.template rename to srcpkgs/rsyslog/rsyslog-gnutls.template diff --git a/templates/rsyslog/template b/srcpkgs/rsyslog/template similarity index 97% rename from templates/rsyslog/template rename to srcpkgs/rsyslog/template index b910bb15907..6e0585d6b67 100644 --- a/templates/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -12,7 +12,7 @@ long_desc=" others, MySQL, PgSQL, syslog/tcp, RFC 3195, permitted sender lists, filtering on any message part, and fine grain output format control." -subpackages="gnutls" +subpackages="$pkgname-gnutls" conf_files="/etc/rsyslog.conf" openrc_services="rsyslogd default" diff --git a/templates/rt61-firmware/template b/srcpkgs/rt61-firmware/template similarity index 100% rename from templates/rt61-firmware/template rename to srcpkgs/rt61-firmware/template diff --git a/templates/ruby/template b/srcpkgs/ruby/template similarity index 100% rename from templates/ruby/template rename to srcpkgs/ruby/template diff --git a/templates/run-parts/template b/srcpkgs/run-parts/template similarity index 100% rename from templates/run-parts/template rename to srcpkgs/run-parts/template diff --git a/templates/scrnsaverproto/template b/srcpkgs/scrnsaverproto/template similarity index 100% rename from templates/scrnsaverproto/template rename to srcpkgs/scrnsaverproto/template diff --git a/templates/sed/template b/srcpkgs/sed/template similarity index 100% rename from templates/sed/template rename to srcpkgs/sed/template diff --git a/templates/sessreg/template b/srcpkgs/sessreg/template similarity index 100% rename from templates/sessreg/template rename to srcpkgs/sessreg/template diff --git a/templates/setxkbmap/template b/srcpkgs/setxkbmap/template similarity index 100% rename from templates/setxkbmap/template rename to srcpkgs/setxkbmap/template diff --git a/templates/shadow/INSTALL b/srcpkgs/shadow/INSTALL similarity index 100% rename from templates/shadow/INSTALL rename to srcpkgs/shadow/INSTALL diff --git a/templates/shadow/files/chage.pam b/srcpkgs/shadow/files/chage.pam similarity index 100% rename from templates/shadow/files/chage.pam rename to srcpkgs/shadow/files/chage.pam diff --git a/templates/shadow/files/login.defs b/srcpkgs/shadow/files/login.defs similarity index 100% rename from templates/shadow/files/login.defs rename to srcpkgs/shadow/files/login.defs diff --git a/templates/shadow/files/login.pam b/srcpkgs/shadow/files/login.pam similarity index 100% rename from templates/shadow/files/login.pam rename to srcpkgs/shadow/files/login.pam diff --git a/templates/shadow/files/other.pam b/srcpkgs/shadow/files/other.pam similarity index 100% rename from templates/shadow/files/other.pam rename to srcpkgs/shadow/files/other.pam diff --git a/templates/shadow/files/passwd.pam b/srcpkgs/shadow/files/passwd.pam similarity index 100% rename from templates/shadow/files/passwd.pam rename to srcpkgs/shadow/files/passwd.pam diff --git a/templates/shadow/files/shadow.cron-daily b/srcpkgs/shadow/files/shadow.cron-daily similarity index 100% rename from templates/shadow/files/shadow.cron-daily rename to srcpkgs/shadow/files/shadow.cron-daily diff --git a/templates/shadow/files/su.pam b/srcpkgs/shadow/files/su.pam similarity index 100% rename from templates/shadow/files/su.pam rename to srcpkgs/shadow/files/su.pam diff --git a/templates/shadow/template b/srcpkgs/shadow/template similarity index 100% rename from templates/shadow/template rename to srcpkgs/shadow/template diff --git a/templates/shared-mime-info/patches/Makefile_fix_pkgconfig_path.diff b/srcpkgs/shared-mime-info/patches/Makefile_fix_pkgconfig_path.diff similarity index 100% rename from templates/shared-mime-info/patches/Makefile_fix_pkgconfig_path.diff rename to srcpkgs/shared-mime-info/patches/Makefile_fix_pkgconfig_path.diff diff --git a/templates/shared-mime-info/template b/srcpkgs/shared-mime-info/template similarity index 100% rename from templates/shared-mime-info/template rename to srcpkgs/shared-mime-info/template diff --git a/templates/smproxy/template b/srcpkgs/smproxy/template similarity index 100% rename from templates/smproxy/template rename to srcpkgs/smproxy/template diff --git a/templates/splint/template b/srcpkgs/splint/template similarity index 100% rename from templates/splint/template rename to srcpkgs/splint/template diff --git a/templates/sqlite-devel b/srcpkgs/sqlite-devel similarity index 100% rename from templates/sqlite-devel rename to srcpkgs/sqlite-devel diff --git a/templates/sqlite/depends b/srcpkgs/sqlite/depends similarity index 100% rename from templates/sqlite/depends rename to srcpkgs/sqlite/depends diff --git a/templates/sqlite/devel.template b/srcpkgs/sqlite/sqlite-devel.template similarity index 100% rename from templates/sqlite/devel.template rename to srcpkgs/sqlite/sqlite-devel.template diff --git a/templates/sqlite/template b/srcpkgs/sqlite/template similarity index 97% rename from templates/sqlite/template rename to srcpkgs/sqlite/template index b7c5a7782dc..1a8d290e055 100644 --- a/templates/sqlite/template +++ b/srcpkgs/sqlite/template @@ -21,7 +21,7 @@ long_desc=" SQLite is the server. The SQLite library reads and writes directly to and from the database files on disk." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full readline diff --git a/templates/squashfs-tools/template b/srcpkgs/squashfs-tools/template similarity index 100% rename from templates/squashfs-tools/template rename to srcpkgs/squashfs-tools/template diff --git a/templates/startup-notification-devel b/srcpkgs/startup-notification-devel similarity index 100% rename from templates/startup-notification-devel rename to srcpkgs/startup-notification-devel diff --git a/templates/startup-notification/depends b/srcpkgs/startup-notification/depends similarity index 100% rename from templates/startup-notification/depends rename to srcpkgs/startup-notification/depends diff --git a/templates/startup-notification/devel.template b/srcpkgs/startup-notification/startup-notification-devel.template similarity index 100% rename from templates/startup-notification/devel.template rename to srcpkgs/startup-notification/startup-notification-devel.template diff --git a/templates/startup-notification/template b/srcpkgs/startup-notification/template similarity index 96% rename from templates/startup-notification/template rename to srcpkgs/startup-notification/template index 038271a3f4e..a26593a8d22 100644 --- a/templates/startup-notification/template +++ b/srcpkgs/startup-notification/template @@ -13,7 +13,7 @@ long_desc=" environment can track the launch of an application and provide feedback such as a busy cursor, among other features." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency full glibc Add_dependency full libSM diff --git a/templates/strace/template b/srcpkgs/strace/template similarity index 100% rename from templates/strace/template rename to srcpkgs/strace/template diff --git a/templates/sudo/template b/srcpkgs/sudo/template similarity index 100% rename from templates/sudo/template rename to srcpkgs/sudo/template diff --git a/templates/sylpheed/template b/srcpkgs/sylpheed/template similarity index 100% rename from templates/sylpheed/template rename to srcpkgs/sylpheed/template diff --git a/templates/sysklogd/files/klogd b/srcpkgs/sysklogd/files/klogd similarity index 100% rename from templates/sysklogd/files/klogd rename to srcpkgs/sysklogd/files/klogd diff --git a/templates/sysklogd/files/syslog.conf b/srcpkgs/sysklogd/files/syslog.conf similarity index 100% rename from templates/sysklogd/files/syslog.conf rename to srcpkgs/sysklogd/files/syslog.conf diff --git a/templates/sysklogd/files/syslogd b/srcpkgs/sysklogd/files/syslogd similarity index 100% rename from templates/sysklogd/files/syslogd rename to srcpkgs/sysklogd/files/syslogd diff --git a/templates/sysklogd/patches/fix_installation.diff b/srcpkgs/sysklogd/patches/fix_installation.diff similarity index 100% rename from templates/sysklogd/patches/fix_installation.diff rename to srcpkgs/sysklogd/patches/fix_installation.diff diff --git a/templates/sysklogd/template b/srcpkgs/sysklogd/template similarity index 100% rename from templates/sysklogd/template rename to srcpkgs/sysklogd/template diff --git a/templates/syslinux/template b/srcpkgs/syslinux/template similarity index 100% rename from templates/syslinux/template rename to srcpkgs/syslinux/template diff --git a/templates/sysvinit/template b/srcpkgs/sysvinit/template similarity index 100% rename from templates/sysvinit/template rename to srcpkgs/sysvinit/template diff --git a/templates/tango-icon-theme/template b/srcpkgs/tango-icon-theme/template similarity index 100% rename from templates/tango-icon-theme/template rename to srcpkgs/tango-icon-theme/template diff --git a/templates/tar/template b/srcpkgs/tar/template similarity index 100% rename from templates/tar/template rename to srcpkgs/tar/template diff --git a/templates/tcp_wrappers-devel b/srcpkgs/tcp_wrappers-devel similarity index 100% rename from templates/tcp_wrappers-devel rename to srcpkgs/tcp_wrappers-devel diff --git a/templates/tcp_wrappers-libs b/srcpkgs/tcp_wrappers-libs similarity index 100% rename from templates/tcp_wrappers-libs rename to srcpkgs/tcp_wrappers-libs diff --git a/templates/tcp_wrappers/depends b/srcpkgs/tcp_wrappers/depends similarity index 100% rename from templates/tcp_wrappers/depends rename to srcpkgs/tcp_wrappers/depends diff --git a/templates/tcp_wrappers/files/hosts.allow b/srcpkgs/tcp_wrappers/files/hosts.allow similarity index 100% rename from templates/tcp_wrappers/files/hosts.allow rename to srcpkgs/tcp_wrappers/files/hosts.allow diff --git a/templates/tcp_wrappers/files/hosts.deny b/srcpkgs/tcp_wrappers/files/hosts.deny similarity index 100% rename from templates/tcp_wrappers/files/hosts.deny rename to srcpkgs/tcp_wrappers/files/hosts.deny diff --git a/templates/tcp_wrappers/patches/fix_build_scaffold.c.diff b/srcpkgs/tcp_wrappers/patches/fix_build_scaffold.c.diff similarity index 100% rename from templates/tcp_wrappers/patches/fix_build_scaffold.c.diff rename to srcpkgs/tcp_wrappers/patches/fix_build_scaffold.c.diff diff --git a/templates/tcp_wrappers/patches/shared_lib_plus_plus-1.diff b/srcpkgs/tcp_wrappers/patches/shared_lib_plus_plus-1.diff similarity index 100% rename from templates/tcp_wrappers/patches/shared_lib_plus_plus-1.diff rename to srcpkgs/tcp_wrappers/patches/shared_lib_plus_plus-1.diff diff --git a/templates/tcp_wrappers/patches/shared_lib_plus_plus-1.diff.args b/srcpkgs/tcp_wrappers/patches/shared_lib_plus_plus-1.diff.args similarity index 100% rename from templates/tcp_wrappers/patches/shared_lib_plus_plus-1.diff.args rename to srcpkgs/tcp_wrappers/patches/shared_lib_plus_plus-1.diff.args diff --git a/templates/tcp_wrappers/devel.template b/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template similarity index 100% rename from templates/tcp_wrappers/devel.template rename to srcpkgs/tcp_wrappers/tcp_wrappers-devel.template diff --git a/templates/tcp_wrappers/libs.template b/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template similarity index 100% rename from templates/tcp_wrappers/libs.template rename to srcpkgs/tcp_wrappers/tcp_wrappers-libs.template diff --git a/templates/tcp_wrappers/template b/srcpkgs/tcp_wrappers/template similarity index 96% rename from templates/tcp_wrappers/template rename to srcpkgs/tcp_wrappers/template index ccbd1c701aa..a09bf0ff8fa 100644 --- a/templates/tcp_wrappers/template +++ b/srcpkgs/tcp_wrappers/template @@ -13,8 +13,7 @@ long_desc=" monitor and filter incoming requests for systat, finger, FTP, telnet, rlogin, rsh, exec, tftp, talk and other network services." -subpackages="devel libs" - +subpackages="$pkgname-devel $pkgname-libs" Add_dependency run glibc Add_dependency run tcp_wrappers-libs diff --git a/templates/texinfo/template b/srcpkgs/texinfo/template similarity index 100% rename from templates/texinfo/template rename to srcpkgs/texinfo/template diff --git a/templates/thunar-volman/template b/srcpkgs/thunar-volman/template similarity index 100% rename from templates/thunar-volman/template rename to srcpkgs/thunar-volman/template diff --git a/templates/tiff-devel b/srcpkgs/tiff-devel similarity index 100% rename from templates/tiff-devel rename to srcpkgs/tiff-devel diff --git a/templates/tiff/depends b/srcpkgs/tiff/depends similarity index 100% rename from templates/tiff/depends rename to srcpkgs/tiff/depends diff --git a/templates/tiff/template b/srcpkgs/tiff/template similarity index 93% rename from templates/tiff/template rename to srcpkgs/tiff/template index 67627b3a357..98ce41756af 100644 --- a/templates/tiff/template +++ b/srcpkgs/tiff/template @@ -1,6 +1,7 @@ # Template build file for 'tiff'. pkgname=tiff version=3.9.1 +revision=1 distfiles="ftp://ftp.remotesensing.org/pub/libtiff/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-cxx --without-x" @@ -19,8 +20,8 @@ long_desc=" TIFF spec. There is also considerable support for some of the more esoteric portions of the 6.0 TIFF spec." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full zlib Add_dependency full jpeg -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ diff --git a/templates/tiff/devel.template b/srcpkgs/tiff/tiff-devel.template similarity index 100% rename from templates/tiff/devel.template rename to srcpkgs/tiff/tiff-devel.template diff --git a/templates/transmission/template b/srcpkgs/transmission/template similarity index 100% rename from templates/transmission/template rename to srcpkgs/transmission/template diff --git a/templates/tzdata/patches/fix_Makefile.diff b/srcpkgs/tzdata/patches/fix_Makefile.diff similarity index 100% rename from templates/tzdata/patches/fix_Makefile.diff rename to srcpkgs/tzdata/patches/fix_Makefile.diff diff --git a/templates/tzdata/template b/srcpkgs/tzdata/template similarity index 100% rename from templates/tzdata/template rename to srcpkgs/tzdata/template diff --git a/templates/udev-glib-devel b/srcpkgs/udev-devel similarity index 100% rename from templates/udev-glib-devel rename to srcpkgs/udev-devel diff --git a/templates/udev/files/udev.initramfs-bottom b/srcpkgs/udev/files/udev.initramfs-bottom similarity index 100% rename from templates/udev/files/udev.initramfs-bottom rename to srcpkgs/udev/files/udev.initramfs-bottom diff --git a/templates/udev/files/udev.initramfs-hook b/srcpkgs/udev/files/udev.initramfs-hook similarity index 100% rename from templates/udev/files/udev.initramfs-hook rename to srcpkgs/udev/files/udev.initramfs-hook diff --git a/templates/udev/files/udev.initramfs-premount b/srcpkgs/udev/files/udev.initramfs-premount similarity index 100% rename from templates/udev/files/udev.initramfs-premount rename to srcpkgs/udev/files/udev.initramfs-premount diff --git a/templates/udev/files/udev.rc b/srcpkgs/udev/files/udev.rc similarity index 100% rename from templates/udev/files/udev.rc rename to srcpkgs/udev/files/udev.rc diff --git a/templates/udev/glib-devel.template b/srcpkgs/udev/libgudev-devel.template similarity index 91% rename from templates/udev/glib-devel.template rename to srcpkgs/udev/libgudev-devel.template index ffc393d8b3c..8e61f5169ee 100644 --- a/templates/udev/glib-devel.template +++ b/srcpkgs/udev/libgudev-devel.template @@ -6,7 +6,10 @@ long_desc="${long_desc} This package contains the libgudev development files (static libs, headers, etc), a library to interact with udev through the GLib bindings." -Add_dependency run udev-glib +replaces="udev-glib-devel" +revision=1 + +Add_dependency run libgudev do_install() { diff --git a/templates/udev/glib.template b/srcpkgs/udev/libgudev.template similarity index 91% rename from templates/udev/glib.template rename to srcpkgs/udev/libgudev.template index c60e4c05134..16c4f1f3ee0 100644 --- a/templates/udev/glib.template +++ b/srcpkgs/udev/libgudev.template @@ -6,6 +6,9 @@ long_desc="${long_desc} This package contains libgudev, a library to interact with udev through the GLib bindings." +replaces="udev-glib" +revision=1 + Add_dependency run udev Add_dependency run glib diff --git a/templates/udev/template b/srcpkgs/udev/template similarity index 96% rename from templates/udev/template rename to srcpkgs/udev/template index ab0eb4f7ca4..fd5e6c1320e 100644 --- a/templates/udev/template +++ b/srcpkgs/udev/template @@ -14,7 +14,7 @@ long_desc=" openrc_services="udev sysinit" conf_files="/etc/udev/udev.conf" -subpackages="devel glib glib-devel" +subpackages="udev-devel libgudev libgudev-devel" Add_dependency full glibc Add_dependency full procps @@ -25,6 +25,7 @@ Add_dependency full pciutils Add_dependency build glib Add_dependency build gperf Add_dependency build gobject-introspection +Add_dependency build libtool post_install() { diff --git a/templates/udev/devel.template b/srcpkgs/udev/udev-devel.template similarity index 100% rename from templates/udev/devel.template rename to srcpkgs/udev/udev-devel.template diff --git a/templates/unzip/patches/fix_Makefile.diff b/srcpkgs/unzip/patches/fix_Makefile.diff similarity index 100% rename from templates/unzip/patches/fix_Makefile.diff rename to srcpkgs/unzip/patches/fix_Makefile.diff diff --git a/templates/unzip/patches/unzipsfx_no_libz.diff b/srcpkgs/unzip/patches/unzipsfx_no_libz.diff similarity index 100% rename from templates/unzip/patches/unzipsfx_no_libz.diff rename to srcpkgs/unzip/patches/unzipsfx_no_libz.diff diff --git a/templates/unzip/template b/srcpkgs/unzip/template similarity index 100% rename from templates/unzip/template rename to srcpkgs/unzip/template diff --git a/templates/usbutils/template b/srcpkgs/usbutils/template similarity index 100% rename from templates/usbutils/template rename to srcpkgs/usbutils/template diff --git a/templates/util-linux-ng/files/adjtime.cron-hourly b/srcpkgs/util-linux-ng/files/adjtime.cron-hourly similarity index 100% rename from templates/util-linux-ng/files/adjtime.cron-hourly rename to srcpkgs/util-linux-ng/files/adjtime.cron-hourly diff --git a/templates/util-linux-ng/patches/build_blkid_uuid_utils.diff b/srcpkgs/util-linux-ng/patches/build_blkid_uuid_utils.diff similarity index 100% rename from templates/util-linux-ng/patches/build_blkid_uuid_utils.diff rename to srcpkgs/util-linux-ng/patches/build_blkid_uuid_utils.diff diff --git a/templates/util-linux-ng/template b/srcpkgs/util-linux-ng/template similarity index 100% rename from templates/util-linux-ng/template rename to srcpkgs/util-linux-ng/template diff --git a/templates/valgrind-devel b/srcpkgs/valgrind-devel similarity index 100% rename from templates/valgrind-devel rename to srcpkgs/valgrind-devel diff --git a/templates/valgrind/template b/srcpkgs/valgrind/template similarity index 96% rename from templates/valgrind/template rename to srcpkgs/valgrind/template index 93c58d9f3b7..5be3d43e486 100644 --- a/templates/valgrind/template +++ b/srcpkgs/valgrind/template @@ -13,6 +13,6 @@ long_desc=" malloc/new/free/delete are intercepted. As a result, Valgrind can detect a lot of problems that are otherwise very hard to find/diagnose." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full perl diff --git a/templates/valgrind/devel.template b/srcpkgs/valgrind/valgrind-devel.template similarity index 100% rename from templates/valgrind/devel.template rename to srcpkgs/valgrind/valgrind-devel.template diff --git a/templates/vbetool/template b/srcpkgs/vbetool/template similarity index 100% rename from templates/vbetool/template rename to srcpkgs/vbetool/template diff --git a/templates/videoproto/template b/srcpkgs/videoproto/template similarity index 100% rename from templates/videoproto/template rename to srcpkgs/videoproto/template diff --git a/templates/vim/template b/srcpkgs/vim/template similarity index 85% rename from templates/vim/template rename to srcpkgs/vim/template index 2bd2b2e1446..5320a5b88a0 100644 --- a/templates/vim/template +++ b/srcpkgs/vim/template @@ -1,6 +1,7 @@ # Template file for 'vim' pkgname=vim version=7.2 +revision=1 wrksrc=vim72 distfiles="ftp://ftp.vim.org/pub/vim/unix/$pkgname-$version.tar.bz2" build_style=gnu_configure @@ -13,3 +14,6 @@ long_desc=" on-line help, filename completion, block operations, etc." Add_dependency full glibc +Add_dependency build ncurses +Add_dependency run ncurses-libs +Add_dependency full acl diff --git a/templates/vte-devel b/srcpkgs/vte-devel similarity index 100% rename from templates/vte-devel rename to srcpkgs/vte-devel diff --git a/templates/vte/depends b/srcpkgs/vte/depends similarity index 100% rename from templates/vte/depends rename to srcpkgs/vte/depends diff --git a/templates/vte/template b/srcpkgs/vte/template similarity index 96% rename from templates/vte/template rename to srcpkgs/vte/template index 560e865f1a7..985b75b6fe0 100644 --- a/templates/vte/template +++ b/srcpkgs/vte/template @@ -11,7 +11,7 @@ long_desc=" Terminal widget with improved font, internationalization and accessibility support for the GNOME 2 desktop." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency build libXt diff --git a/templates/vte/devel.template b/srcpkgs/vte/vte-devel.template similarity index 100% rename from templates/vte/devel.template rename to srcpkgs/vte/vte-devel.template diff --git a/templates/webkit-gtk-devel b/srcpkgs/webkit-gtk-devel similarity index 100% rename from templates/webkit-gtk-devel rename to srcpkgs/webkit-gtk-devel diff --git a/templates/webkit-gtk/depends b/srcpkgs/webkit-gtk/depends similarity index 100% rename from templates/webkit-gtk/depends rename to srcpkgs/webkit-gtk/depends diff --git a/templates/webkit-gtk/template b/srcpkgs/webkit-gtk/template similarity index 97% rename from templates/webkit-gtk/template rename to srcpkgs/webkit-gtk/template index 372852f280c..b1b798edf59 100644 --- a/templates/webkit-gtk/template +++ b/srcpkgs/webkit-gtk/template @@ -18,7 +18,7 @@ long_desc=" This is the GTK2+ port of the engine." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build intltool Add_dependency build pkg-config Add_dependency build gperf diff --git a/templates/webkit-gtk/devel.template b/srcpkgs/webkit-gtk/webkit-gtk-devel.template similarity index 100% rename from templates/webkit-gtk/devel.template rename to srcpkgs/webkit-gtk/webkit-gtk-devel.template diff --git a/templates/wget/template b/srcpkgs/wget/template similarity index 100% rename from templates/wget/template rename to srcpkgs/wget/template diff --git a/templates/which/template b/srcpkgs/which/template similarity index 100% rename from templates/which/template rename to srcpkgs/which/template diff --git a/templates/wpa_supplicant/files/config b/srcpkgs/wpa_supplicant/files/config similarity index 100% rename from templates/wpa_supplicant/files/config rename to srcpkgs/wpa_supplicant/files/config diff --git a/templates/wpa_supplicant/files/wpa_supplicant.rc b/srcpkgs/wpa_supplicant/files/wpa_supplicant.rc similarity index 100% rename from templates/wpa_supplicant/files/wpa_supplicant.rc rename to srcpkgs/wpa_supplicant/files/wpa_supplicant.rc diff --git a/templates/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template similarity index 100% rename from templates/wpa_supplicant/template rename to srcpkgs/wpa_supplicant/template diff --git a/templates/x11perf/template b/srcpkgs/x11perf/template similarity index 100% rename from templates/x11perf/template rename to srcpkgs/x11perf/template diff --git a/templates/xauth/template b/srcpkgs/xauth/template similarity index 100% rename from templates/xauth/template rename to srcpkgs/xauth/template diff --git a/templates/xbacklight/template b/srcpkgs/xbacklight/template similarity index 100% rename from templates/xbacklight/template rename to srcpkgs/xbacklight/template diff --git a/templates/xbitmaps/template b/srcpkgs/xbitmaps/template similarity index 100% rename from templates/xbitmaps/template rename to srcpkgs/xbitmaps/template diff --git a/templates/xbps-base-chroot/template b/srcpkgs/xbps-base-chroot/template similarity index 93% rename from templates/xbps-base-chroot/template rename to srcpkgs/xbps-base-chroot/template index 2d46c856716..24880d56878 100644 --- a/templates/xbps-base-chroot/template +++ b/srcpkgs/xbps-base-chroot/template @@ -1,6 +1,6 @@ # Template file for 'xbps-base-chroot' pkgname=xbps-base-chroot -version=0.13 +version=0.14 build_style=meta-template short_desc="xbps base packages for the chroot target" maintainer="Juan RP " @@ -23,6 +23,5 @@ Add_dependency full gcc Add_dependency full glibc Add_dependency full busybox-initramfs Add_dependency run gcc-c++ -Add_dependency run gcc-libstdc++-devel Add_dependency run glibc-devel Add_dependency run kernel-libc-headers diff --git a/templates/xbps-base-files/files/DIR_COLORS b/srcpkgs/xbps-base-files/files/DIR_COLORS similarity index 100% rename from templates/xbps-base-files/files/DIR_COLORS rename to srcpkgs/xbps-base-files/files/DIR_COLORS diff --git a/templates/xbps-base-files/files/DIR_COLORS.256color b/srcpkgs/xbps-base-files/files/DIR_COLORS.256color similarity index 100% rename from templates/xbps-base-files/files/DIR_COLORS.256color rename to srcpkgs/xbps-base-files/files/DIR_COLORS.256color diff --git a/templates/xbps-base-files/files/DIR_COLORS.xterm b/srcpkgs/xbps-base-files/files/DIR_COLORS.xterm similarity index 100% rename from templates/xbps-base-files/files/DIR_COLORS.xterm rename to srcpkgs/xbps-base-files/files/DIR_COLORS.xterm diff --git a/templates/xbps-base-files/files/blacklist.conf b/srcpkgs/xbps-base-files/files/blacklist.conf similarity index 100% rename from templates/xbps-base-files/files/blacklist.conf rename to srcpkgs/xbps-base-files/files/blacklist.conf diff --git a/templates/xbps-base-files/files/colorls.sh b/srcpkgs/xbps-base-files/files/colorls.sh similarity index 100% rename from templates/xbps-base-files/files/colorls.sh rename to srcpkgs/xbps-base-files/files/colorls.sh diff --git a/templates/xbps-base-files/files/dot_bash_logout b/srcpkgs/xbps-base-files/files/dot_bash_logout similarity index 100% rename from templates/xbps-base-files/files/dot_bash_logout rename to srcpkgs/xbps-base-files/files/dot_bash_logout diff --git a/templates/xbps-base-files/files/dot_bash_profile b/srcpkgs/xbps-base-files/files/dot_bash_profile similarity index 100% rename from templates/xbps-base-files/files/dot_bash_profile rename to srcpkgs/xbps-base-files/files/dot_bash_profile diff --git a/templates/xbps-base-files/files/dot_bashrc b/srcpkgs/xbps-base-files/files/dot_bashrc similarity index 100% rename from templates/xbps-base-files/files/dot_bashrc rename to srcpkgs/xbps-base-files/files/dot_bashrc diff --git a/templates/xbps-base-files/files/host.conf b/srcpkgs/xbps-base-files/files/host.conf similarity index 100% rename from templates/xbps-base-files/files/host.conf rename to srcpkgs/xbps-base-files/files/host.conf diff --git a/templates/xbps-base-files/files/hosts b/srcpkgs/xbps-base-files/files/hosts similarity index 100% rename from templates/xbps-base-files/files/hosts rename to srcpkgs/xbps-base-files/files/hosts diff --git a/templates/xbps-base-files/files/issue b/srcpkgs/xbps-base-files/files/issue similarity index 100% rename from templates/xbps-base-files/files/issue rename to srcpkgs/xbps-base-files/files/issue diff --git a/templates/xbps-base-files/files/mozplugin.sh b/srcpkgs/xbps-base-files/files/mozplugin.sh similarity index 100% rename from templates/xbps-base-files/files/mozplugin.sh rename to srcpkgs/xbps-base-files/files/mozplugin.sh diff --git a/templates/xbps-base-files/files/profile b/srcpkgs/xbps-base-files/files/profile similarity index 100% rename from templates/xbps-base-files/files/profile rename to srcpkgs/xbps-base-files/files/profile diff --git a/templates/xbps-base-files/files/securetty b/srcpkgs/xbps-base-files/files/securetty similarity index 100% rename from templates/xbps-base-files/files/securetty rename to srcpkgs/xbps-base-files/files/securetty diff --git a/templates/xbps-base-files/files/usb-load-ehci-first b/srcpkgs/xbps-base-files/files/usb-load-ehci-first similarity index 100% rename from templates/xbps-base-files/files/usb-load-ehci-first rename to srcpkgs/xbps-base-files/files/usb-load-ehci-first diff --git a/templates/xbps-base-files/files/vim.sh b/srcpkgs/xbps-base-files/files/vim.sh similarity index 100% rename from templates/xbps-base-files/files/vim.sh rename to srcpkgs/xbps-base-files/files/vim.sh diff --git a/templates/xbps-base-files/files/which2.sh b/srcpkgs/xbps-base-files/files/which2.sh similarity index 100% rename from templates/xbps-base-files/files/which2.sh rename to srcpkgs/xbps-base-files/files/which2.sh diff --git a/templates/xbps-base-files/template b/srcpkgs/xbps-base-files/template similarity index 100% rename from templates/xbps-base-files/template rename to srcpkgs/xbps-base-files/template diff --git a/templates/xbps-casper/files/COPYING b/srcpkgs/xbps-casper/files/COPYING similarity index 100% rename from templates/xbps-casper/files/COPYING rename to srcpkgs/xbps-casper/files/COPYING diff --git a/templates/xbps-casper/files/bin/casper-getty b/srcpkgs/xbps-casper/files/bin/casper-getty similarity index 100% rename from templates/xbps-casper/files/bin/casper-getty rename to srcpkgs/xbps-casper/files/bin/casper-getty diff --git a/templates/xbps-casper/files/bin/casper-login b/srcpkgs/xbps-casper/files/bin/casper-login similarity index 100% rename from templates/xbps-casper/files/bin/casper-login rename to srcpkgs/xbps-casper/files/bin/casper-login diff --git a/templates/xbps-casper/files/bin/casper-new-uuid b/srcpkgs/xbps-casper/files/bin/casper-new-uuid similarity index 100% rename from templates/xbps-casper/files/bin/casper-new-uuid rename to srcpkgs/xbps-casper/files/bin/casper-new-uuid diff --git a/templates/xbps-casper/files/bin/casper-snapshot b/srcpkgs/xbps-casper/files/bin/casper-snapshot similarity index 100% rename from templates/xbps-casper/files/bin/casper-snapshot rename to srcpkgs/xbps-casper/files/bin/casper-snapshot diff --git a/templates/xbps-casper/files/casper.conf b/srcpkgs/xbps-casper/files/casper.conf similarity index 100% rename from templates/xbps-casper/files/casper.conf rename to srcpkgs/xbps-casper/files/casper.conf diff --git a/templates/xbps-casper/files/conf.d/compcache b/srcpkgs/xbps-casper/files/conf.d/compcache similarity index 100% rename from templates/xbps-casper/files/conf.d/compcache rename to srcpkgs/xbps-casper/files/conf.d/compcache diff --git a/templates/xbps-casper/files/hooks/casper b/srcpkgs/xbps-casper/files/hooks/casper similarity index 100% rename from templates/xbps-casper/files/hooks/casper rename to srcpkgs/xbps-casper/files/hooks/casper diff --git a/templates/xbps-casper/files/scripts/casper b/srcpkgs/xbps-casper/files/scripts/casper similarity index 100% rename from templates/xbps-casper/files/scripts/casper rename to srcpkgs/xbps-casper/files/scripts/casper diff --git a/templates/xbps-casper/files/scripts/casper-bottom/05mountpoints b/srcpkgs/xbps-casper/files/scripts/casper-bottom/05mountpoints similarity index 100% rename from templates/xbps-casper/files/scripts/casper-bottom/05mountpoints rename to srcpkgs/xbps-casper/files/scripts/casper-bottom/05mountpoints diff --git a/templates/xbps-casper/files/scripts/casper-bottom/10adduser b/srcpkgs/xbps-casper/files/scripts/casper-bottom/10adduser similarity index 100% rename from templates/xbps-casper/files/scripts/casper-bottom/10adduser rename to srcpkgs/xbps-casper/files/scripts/casper-bottom/10adduser diff --git a/templates/xbps-casper/files/scripts/casper-bottom/11keymap b/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap similarity index 100% rename from templates/xbps-casper/files/scripts/casper-bottom/11keymap rename to srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap diff --git a/templates/xbps-casper/files/scripts/casper-bottom/12fstab b/srcpkgs/xbps-casper/files/scripts/casper-bottom/12fstab similarity index 100% rename from templates/xbps-casper/files/scripts/casper-bottom/12fstab rename to srcpkgs/xbps-casper/files/scripts/casper-bottom/12fstab diff --git a/templates/xbps-casper/files/scripts/casper-bottom/13swap b/srcpkgs/xbps-casper/files/scripts/casper-bottom/13swap similarity index 100% rename from templates/xbps-casper/files/scripts/casper-bottom/13swap rename to srcpkgs/xbps-casper/files/scripts/casper-bottom/13swap diff --git a/templates/xbps-casper/files/scripts/casper-bottom/14locales b/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales similarity index 100% rename from templates/xbps-casper/files/scripts/casper-bottom/14locales rename to srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales diff --git a/templates/xbps-casper/files/scripts/casper-bottom/15autologin b/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin similarity index 100% rename from templates/xbps-casper/files/scripts/casper-bottom/15autologin rename to srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin diff --git a/templates/xbps-casper/files/scripts/casper-bottom/18hostname b/srcpkgs/xbps-casper/files/scripts/casper-bottom/18hostname similarity index 100% rename from templates/xbps-casper/files/scripts/casper-bottom/18hostname rename to srcpkgs/xbps-casper/files/scripts/casper-bottom/18hostname diff --git a/templates/xbps-casper/files/scripts/casper-bottom/30policykit b/srcpkgs/xbps-casper/files/scripts/casper-bottom/30policykit similarity index 100% rename from templates/xbps-casper/files/scripts/casper-bottom/30policykit rename to srcpkgs/xbps-casper/files/scripts/casper-bottom/30policykit diff --git a/templates/xbps-casper/files/scripts/casper-functions b/srcpkgs/xbps-casper/files/scripts/casper-functions similarity index 100% rename from templates/xbps-casper/files/scripts/casper-functions rename to srcpkgs/xbps-casper/files/scripts/casper-functions diff --git a/templates/xbps-casper/files/scripts/casper-helpers b/srcpkgs/xbps-casper/files/scripts/casper-helpers similarity index 100% rename from templates/xbps-casper/files/scripts/casper-helpers rename to srcpkgs/xbps-casper/files/scripts/casper-helpers diff --git a/templates/xbps-casper/template b/srcpkgs/xbps-casper/template similarity index 100% rename from templates/xbps-casper/template rename to srcpkgs/xbps-casper/template diff --git a/templates/xbps-devel/template b/srcpkgs/xbps-devel/template similarity index 100% rename from templates/xbps-devel/template rename to srcpkgs/xbps-devel/template diff --git a/templates/xbps-mklive/files/xbps-mklive.sh b/srcpkgs/xbps-mklive/files/xbps-mklive.sh similarity index 100% rename from templates/xbps-mklive/files/xbps-mklive.sh rename to srcpkgs/xbps-mklive/files/xbps-mklive.sh diff --git a/templates/xbps-mklive/template b/srcpkgs/xbps-mklive/template similarity index 100% rename from templates/xbps-mklive/template rename to srcpkgs/xbps-mklive/template diff --git a/templates/xbps/template b/srcpkgs/xbps/template similarity index 100% rename from templates/xbps/template rename to srcpkgs/xbps/template diff --git a/templates/xcb-proto/template b/srcpkgs/xcb-proto/template similarity index 100% rename from templates/xcb-proto/template rename to srcpkgs/xcb-proto/template diff --git a/templates/xcb-util-devel b/srcpkgs/xcb-util-devel similarity index 100% rename from templates/xcb-util-devel rename to srcpkgs/xcb-util-devel diff --git a/templates/xcb-util/depends b/srcpkgs/xcb-util/depends similarity index 100% rename from templates/xcb-util/depends rename to srcpkgs/xcb-util/depends diff --git a/templates/xcb-util/template b/srcpkgs/xcb-util/template similarity index 97% rename from templates/xcb-util/template rename to srcpkgs/xcb-util/template index 20db4c9e0f4..5744053a836 100644 --- a/templates/xcb-util/template +++ b/srcpkgs/xcb-util/template @@ -26,7 +26,7 @@ long_desc=" image: Port of Xlib's XImage and XShmImage functions. wm: Framework for window manager implementation." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build gperf Add_dependency full glibc diff --git a/templates/xcb-util/devel.template b/srcpkgs/xcb-util/xcb-util-devel.template similarity index 100% rename from templates/xcb-util/devel.template rename to srcpkgs/xcb-util/xcb-util-devel.template diff --git a/templates/xcmiscproto/template b/srcpkgs/xcmiscproto/template similarity index 100% rename from templates/xcmiscproto/template rename to srcpkgs/xcmiscproto/template diff --git a/templates/xcmsdb/template b/srcpkgs/xcmsdb/template similarity index 100% rename from templates/xcmsdb/template rename to srcpkgs/xcmsdb/template diff --git a/templates/xcursorgen/template b/srcpkgs/xcursorgen/template similarity index 100% rename from templates/xcursorgen/template rename to srcpkgs/xcursorgen/template diff --git a/templates/xdpyinfo/template b/srcpkgs/xdpyinfo/template similarity index 100% rename from templates/xdpyinfo/template rename to srcpkgs/xdpyinfo/template diff --git a/templates/xdriinfo/template b/srcpkgs/xdriinfo/template similarity index 100% rename from templates/xdriinfo/template rename to srcpkgs/xdriinfo/template diff --git a/templates/xev/template b/srcpkgs/xev/template similarity index 100% rename from templates/xev/template rename to srcpkgs/xev/template diff --git a/templates/xextproto/template b/srcpkgs/xextproto/template similarity index 100% rename from templates/xextproto/template rename to srcpkgs/xextproto/template diff --git a/templates/xf86-input-acecad/template b/srcpkgs/xf86-input-acecad/template similarity index 100% rename from templates/xf86-input-acecad/template rename to srcpkgs/xf86-input-acecad/template diff --git a/templates/xf86-input-aiptek/template b/srcpkgs/xf86-input-aiptek/template similarity index 100% rename from templates/xf86-input-aiptek/template rename to srcpkgs/xf86-input-aiptek/template diff --git a/templates/xf86-input-evdev-devel b/srcpkgs/xf86-input-evdev-devel similarity index 100% rename from templates/xf86-input-evdev-devel rename to srcpkgs/xf86-input-evdev-devel diff --git a/templates/xf86-input-evdev/depends b/srcpkgs/xf86-input-evdev/depends similarity index 100% rename from templates/xf86-input-evdev/depends rename to srcpkgs/xf86-input-evdev/depends diff --git a/templates/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template similarity index 94% rename from templates/xf86-input-evdev/template rename to srcpkgs/xf86-input-evdev/template index f7df14d460b..dbb311a021b 100644 --- a/templates/xf86-input-evdev/template +++ b/srcpkgs/xf86-input-evdev/template @@ -10,6 +10,6 @@ long_desc=" This package provides the Xorg event device input driver for the Xorg X11 server." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full xorg-server diff --git a/templates/xf86-input-evdev/devel.template b/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template similarity index 100% rename from templates/xf86-input-evdev/devel.template rename to srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template diff --git a/templates/xf86-input-joystick-devel b/srcpkgs/xf86-input-joystick-devel similarity index 100% rename from templates/xf86-input-joystick-devel rename to srcpkgs/xf86-input-joystick-devel diff --git a/templates/xf86-input-joystick/depends b/srcpkgs/xf86-input-joystick/depends similarity index 100% rename from templates/xf86-input-joystick/depends rename to srcpkgs/xf86-input-joystick/depends diff --git a/templates/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template similarity index 94% rename from templates/xf86-input-joystick/template rename to srcpkgs/xf86-input-joystick/template index 73c095a27e2..9dd0c1ac720 100644 --- a/templates/xf86-input-joystick/template +++ b/srcpkgs/xf86-input-joystick/template @@ -9,6 +9,6 @@ checksum=7224e93a8560362d454a104e8bb481213dcb559b41516c7b883c0881e25252bb long_desc=" This is the Joystick Input driver for the Xorg X11 server." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full xorg-server diff --git a/templates/xf86-input-joystick/devel.template b/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template similarity index 100% rename from templates/xf86-input-joystick/devel.template rename to srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template diff --git a/templates/xf86-input-keyboard/template b/srcpkgs/xf86-input-keyboard/template similarity index 100% rename from templates/xf86-input-keyboard/template rename to srcpkgs/xf86-input-keyboard/template diff --git a/templates/xf86-input-mouse/template b/srcpkgs/xf86-input-mouse/template similarity index 100% rename from templates/xf86-input-mouse/template rename to srcpkgs/xf86-input-mouse/template diff --git a/templates/xf86-input-synaptics-devel b/srcpkgs/xf86-input-synaptics-devel similarity index 100% rename from templates/xf86-input-synaptics-devel rename to srcpkgs/xf86-input-synaptics-devel diff --git a/templates/xf86-input-synaptics/depends b/srcpkgs/xf86-input-synaptics/depends similarity index 100% rename from templates/xf86-input-synaptics/depends rename to srcpkgs/xf86-input-synaptics/depends diff --git a/templates/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template similarity index 94% rename from templates/xf86-input-synaptics/template rename to srcpkgs/xf86-input-synaptics/template index 6393544d104..9711ef4176e 100644 --- a/templates/xf86-input-synaptics/template +++ b/srcpkgs/xf86-input-synaptics/template @@ -9,6 +9,6 @@ checksum=ddd5ad4c25ad2f2e46134272bf047522882deba8ac3ac04d5e11f8bd9718620c long_desc=" This is the synaptics input driver for the Xorg X11 server." -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full xorg-server diff --git a/templates/xf86-input-synaptics/devel.template b/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template similarity index 100% rename from templates/xf86-input-synaptics/devel.template rename to srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template diff --git a/templates/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template similarity index 100% rename from templates/xf86-input-vmmouse/template rename to srcpkgs/xf86-input-vmmouse/template diff --git a/templates/xf86-input-void/template b/srcpkgs/xf86-input-void/template similarity index 100% rename from templates/xf86-input-void/template rename to srcpkgs/xf86-input-void/template diff --git a/templates/xf86-video-apm/template b/srcpkgs/xf86-video-apm/template similarity index 100% rename from templates/xf86-video-apm/template rename to srcpkgs/xf86-video-apm/template diff --git a/templates/xf86-video-ark/template b/srcpkgs/xf86-video-ark/template similarity index 100% rename from templates/xf86-video-ark/template rename to srcpkgs/xf86-video-ark/template diff --git a/templates/xf86-video-ast/template b/srcpkgs/xf86-video-ast/template similarity index 100% rename from templates/xf86-video-ast/template rename to srcpkgs/xf86-video-ast/template diff --git a/templates/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template similarity index 100% rename from templates/xf86-video-ati/template rename to srcpkgs/xf86-video-ati/template diff --git a/templates/xf86-video-chips/template b/srcpkgs/xf86-video-chips/template similarity index 100% rename from templates/xf86-video-chips/template rename to srcpkgs/xf86-video-chips/template diff --git a/templates/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template similarity index 100% rename from templates/xf86-video-cirrus/template rename to srcpkgs/xf86-video-cirrus/template diff --git a/templates/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template similarity index 100% rename from templates/xf86-video-fbdev/template rename to srcpkgs/xf86-video-fbdev/template diff --git a/templates/xf86-video-geode/template b/srcpkgs/xf86-video-geode/template similarity index 100% rename from templates/xf86-video-geode/template rename to srcpkgs/xf86-video-geode/template diff --git a/templates/xf86-video-glint/template b/srcpkgs/xf86-video-glint/template similarity index 100% rename from templates/xf86-video-glint/template rename to srcpkgs/xf86-video-glint/template diff --git a/templates/xf86-video-i128/template b/srcpkgs/xf86-video-i128/template similarity index 100% rename from templates/xf86-video-i128/template rename to srcpkgs/xf86-video-i128/template diff --git a/templates/xf86-video-i740/template b/srcpkgs/xf86-video-i740/template similarity index 100% rename from templates/xf86-video-i740/template rename to srcpkgs/xf86-video-i740/template diff --git a/templates/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template similarity index 100% rename from templates/xf86-video-intel/template rename to srcpkgs/xf86-video-intel/template diff --git a/templates/xf86-video-mach64/template b/srcpkgs/xf86-video-mach64/template similarity index 100% rename from templates/xf86-video-mach64/template rename to srcpkgs/xf86-video-mach64/template diff --git a/templates/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template similarity index 100% rename from templates/xf86-video-mga/template rename to srcpkgs/xf86-video-mga/template diff --git a/templates/xf86-video-neomagic/template b/srcpkgs/xf86-video-neomagic/template similarity index 100% rename from templates/xf86-video-neomagic/template rename to srcpkgs/xf86-video-neomagic/template diff --git a/templates/xf86-video-nv/template b/srcpkgs/xf86-video-nv/template similarity index 100% rename from templates/xf86-video-nv/template rename to srcpkgs/xf86-video-nv/template diff --git a/templates/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template similarity index 100% rename from templates/xf86-video-openchrome/template rename to srcpkgs/xf86-video-openchrome/template diff --git a/templates/xf86-video-r128/template b/srcpkgs/xf86-video-r128/template similarity index 100% rename from templates/xf86-video-r128/template rename to srcpkgs/xf86-video-r128/template diff --git a/templates/xf86-video-radeonhd/template b/srcpkgs/xf86-video-radeonhd/template similarity index 100% rename from templates/xf86-video-radeonhd/template rename to srcpkgs/xf86-video-radeonhd/template diff --git a/templates/xf86-video-s3/template b/srcpkgs/xf86-video-s3/template similarity index 100% rename from templates/xf86-video-s3/template rename to srcpkgs/xf86-video-s3/template diff --git a/templates/xf86-video-s3virge/template b/srcpkgs/xf86-video-s3virge/template similarity index 100% rename from templates/xf86-video-s3virge/template rename to srcpkgs/xf86-video-s3virge/template diff --git a/templates/xf86-video-savage/template b/srcpkgs/xf86-video-savage/template similarity index 100% rename from templates/xf86-video-savage/template rename to srcpkgs/xf86-video-savage/template diff --git a/templates/xf86-video-siliconmotion/template b/srcpkgs/xf86-video-siliconmotion/template similarity index 100% rename from templates/xf86-video-siliconmotion/template rename to srcpkgs/xf86-video-siliconmotion/template diff --git a/templates/xf86-video-sis/template b/srcpkgs/xf86-video-sis/template similarity index 100% rename from templates/xf86-video-sis/template rename to srcpkgs/xf86-video-sis/template diff --git a/templates/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template similarity index 100% rename from templates/xf86-video-sisusb/template rename to srcpkgs/xf86-video-sisusb/template diff --git a/templates/xf86-video-tdfx/template b/srcpkgs/xf86-video-tdfx/template similarity index 100% rename from templates/xf86-video-tdfx/template rename to srcpkgs/xf86-video-tdfx/template diff --git a/templates/xf86-video-trident/template b/srcpkgs/xf86-video-trident/template similarity index 100% rename from templates/xf86-video-trident/template rename to srcpkgs/xf86-video-trident/template diff --git a/templates/xf86-video-tseng/template b/srcpkgs/xf86-video-tseng/template similarity index 100% rename from templates/xf86-video-tseng/template rename to srcpkgs/xf86-video-tseng/template diff --git a/templates/xf86-video-v4l/template b/srcpkgs/xf86-video-v4l/template similarity index 100% rename from templates/xf86-video-v4l/template rename to srcpkgs/xf86-video-v4l/template diff --git a/templates/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template similarity index 100% rename from templates/xf86-video-vesa/template rename to srcpkgs/xf86-video-vesa/template diff --git a/templates/xf86-video-vmware/patches/fix_xorg_server_1.7_abi.diff b/srcpkgs/xf86-video-vmware/patches/fix_xorg_server_1.7_abi.diff similarity index 100% rename from templates/xf86-video-vmware/patches/fix_xorg_server_1.7_abi.diff rename to srcpkgs/xf86-video-vmware/patches/fix_xorg_server_1.7_abi.diff diff --git a/templates/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template similarity index 100% rename from templates/xf86-video-vmware/template rename to srcpkgs/xf86-video-vmware/template diff --git a/templates/xf86-video-voodoo/template b/srcpkgs/xf86-video-voodoo/template similarity index 100% rename from templates/xf86-video-voodoo/template rename to srcpkgs/xf86-video-voodoo/template diff --git a/templates/xf86bigfontproto/template b/srcpkgs/xf86bigfontproto/template similarity index 100% rename from templates/xf86bigfontproto/template rename to srcpkgs/xf86bigfontproto/template diff --git a/templates/xf86dgaproto/template b/srcpkgs/xf86dgaproto/template similarity index 100% rename from templates/xf86dgaproto/template rename to srcpkgs/xf86dgaproto/template diff --git a/templates/xf86driproto/template b/srcpkgs/xf86driproto/template similarity index 100% rename from templates/xf86driproto/template rename to srcpkgs/xf86driproto/template diff --git a/templates/xf86miscproto/template b/srcpkgs/xf86miscproto/template similarity index 100% rename from templates/xf86miscproto/template rename to srcpkgs/xf86miscproto/template diff --git a/templates/xf86vidmodeproto/template b/srcpkgs/xf86vidmodeproto/template similarity index 100% rename from templates/xf86vidmodeproto/template rename to srcpkgs/xf86vidmodeproto/template diff --git a/templates/xfce-utils/template b/srcpkgs/xfce-utils/template similarity index 100% rename from templates/xfce-utils/template rename to srcpkgs/xfce-utils/template diff --git a/templates/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template similarity index 100% rename from templates/xfce4-appfinder/template rename to srcpkgs/xfce4-appfinder/template diff --git a/templates/xfce4-mixer/template b/srcpkgs/xfce4-mixer/template similarity index 100% rename from templates/xfce4-mixer/template rename to srcpkgs/xfce4-mixer/template diff --git a/templates/xfce4-panel-devel b/srcpkgs/xfce4-panel-devel similarity index 100% rename from templates/xfce4-panel-devel rename to srcpkgs/xfce4-panel-devel diff --git a/templates/xfce4-panel/depends b/srcpkgs/xfce4-panel/depends similarity index 100% rename from templates/xfce4-panel/depends rename to srcpkgs/xfce4-panel/depends diff --git a/templates/xfce4-panel/template b/srcpkgs/xfce4-panel/template similarity index 97% rename from templates/xfce4-panel/template rename to srcpkgs/xfce4-panel/template index 85845d28cf6..d31a0fa28c7 100644 --- a/templates/xfce4-panel/template +++ b/srcpkgs/xfce4-panel/template @@ -20,7 +20,7 @@ conf_files="/etc/xdg/xfce4/panel/launcher-7.rc gtk_iconcache_dirs="/usr/share/icons/hicolor" triggers="gtk-icon-cache" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency full glibc diff --git a/templates/xfce4-panel/devel.template b/srcpkgs/xfce4-panel/xfce4-panel-devel.template similarity index 100% rename from templates/xfce4-panel/devel.template rename to srcpkgs/xfce4-panel/xfce4-panel-devel.template diff --git a/templates/xfce4-session-devel b/srcpkgs/xfce4-session-devel similarity index 100% rename from templates/xfce4-session-devel rename to srcpkgs/xfce4-session-devel diff --git a/templates/xfce4-session/depends b/srcpkgs/xfce4-session/depends similarity index 100% rename from templates/xfce4-session/depends rename to srcpkgs/xfce4-session/depends diff --git a/templates/xfce4-session/template b/srcpkgs/xfce4-session/template similarity index 96% rename from templates/xfce4-session/template rename to srcpkgs/xfce4-session/template index ae2ca8ecc50..be2a8b0fd35 100644 --- a/templates/xfce4-session/template +++ b/srcpkgs/xfce4-session/template @@ -14,7 +14,7 @@ conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml" gtk_iconcache_dirs="/usr/share/icons/hicolor" triggers="gtk-icon-cache" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency build flex diff --git a/templates/xfce4-session/devel.template b/srcpkgs/xfce4-session/xfce4-session-devel.template similarity index 100% rename from templates/xfce4-session/devel.template rename to srcpkgs/xfce4-session/xfce4-session-devel.template diff --git a/templates/xfce4-settings/template b/srcpkgs/xfce4-settings/template similarity index 100% rename from templates/xfce4-settings/template rename to srcpkgs/xfce4-settings/template diff --git a/templates/xfce4/template b/srcpkgs/xfce4/template similarity index 100% rename from templates/xfce4/template rename to srcpkgs/xfce4/template diff --git a/templates/xfconf-devel b/srcpkgs/xfconf-devel similarity index 100% rename from templates/xfconf-devel rename to srcpkgs/xfconf-devel diff --git a/templates/xfconf-perl b/srcpkgs/xfconf-perl similarity index 100% rename from templates/xfconf-perl rename to srcpkgs/xfconf-perl diff --git a/templates/xfconf/depends b/srcpkgs/xfconf/depends similarity index 100% rename from templates/xfconf/depends rename to srcpkgs/xfconf/depends diff --git a/templates/xfconf/template b/srcpkgs/xfconf/template similarity index 94% rename from templates/xfconf/template rename to srcpkgs/xfconf/template index f06129b2fe3..484b73d6464 100644 --- a/templates/xfconf/template +++ b/srcpkgs/xfconf/template @@ -11,7 +11,7 @@ long_desc=" immediate child nodes of the root are called \"channels\". All settings beneath the channel nodes are called properties." -subpackages="devel perl" +subpackages="$pkgname-devel $pkgname-perl" Add_dependency build pkg-config Add_dependency build perl-Glib Add_dependency full glibc diff --git a/templates/xfconf/devel.template b/srcpkgs/xfconf/xfconf-devel.template similarity index 100% rename from templates/xfconf/devel.template rename to srcpkgs/xfconf/xfconf-devel.template diff --git a/templates/xfconf/perl.template b/srcpkgs/xfconf/xfconf-perl.template similarity index 100% rename from templates/xfconf/perl.template rename to srcpkgs/xfconf/xfconf-perl.template diff --git a/templates/xfd/template b/srcpkgs/xfd/template similarity index 100% rename from templates/xfd/template rename to srcpkgs/xfd/template diff --git a/templates/xfdesktop/template b/srcpkgs/xfdesktop/template similarity index 100% rename from templates/xfdesktop/template rename to srcpkgs/xfdesktop/template diff --git a/templates/xfontsel/template b/srcpkgs/xfontsel/template similarity index 100% rename from templates/xfontsel/template rename to srcpkgs/xfontsel/template diff --git a/templates/xfwm4-themes/template b/srcpkgs/xfwm4-themes/template similarity index 100% rename from templates/xfwm4-themes/template rename to srcpkgs/xfwm4-themes/template diff --git a/templates/xfwm4/template b/srcpkgs/xfwm4/template similarity index 100% rename from templates/xfwm4/template rename to srcpkgs/xfwm4/template diff --git a/templates/xgamma/template b/srcpkgs/xgamma/template similarity index 100% rename from templates/xgamma/template rename to srcpkgs/xgamma/template diff --git a/templates/xhost/template b/srcpkgs/xhost/template similarity index 100% rename from templates/xhost/template rename to srcpkgs/xhost/template diff --git a/templates/xineramaproto/template b/srcpkgs/xineramaproto/template similarity index 100% rename from templates/xineramaproto/template rename to srcpkgs/xineramaproto/template diff --git a/templates/xinit/template b/srcpkgs/xinit/template similarity index 100% rename from templates/xinit/template rename to srcpkgs/xinit/template diff --git a/templates/xinput/template b/srcpkgs/xinput/template similarity index 100% rename from templates/xinput/template rename to srcpkgs/xinput/template diff --git a/templates/xkbcomp/template b/srcpkgs/xkbcomp/template similarity index 100% rename from templates/xkbcomp/template rename to srcpkgs/xkbcomp/template diff --git a/templates/xkbevd/template b/srcpkgs/xkbevd/template similarity index 100% rename from templates/xkbevd/template rename to srcpkgs/xkbevd/template diff --git a/templates/xkbutils/template b/srcpkgs/xkbutils/template similarity index 100% rename from templates/xkbutils/template rename to srcpkgs/xkbutils/template diff --git a/templates/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template similarity index 100% rename from templates/xkeyboard-config/template rename to srcpkgs/xkeyboard-config/template diff --git a/templates/xkill/template b/srcpkgs/xkill/template similarity index 100% rename from templates/xkill/template rename to srcpkgs/xkill/template diff --git a/templates/xlsatoms/template b/srcpkgs/xlsatoms/template similarity index 100% rename from templates/xlsatoms/template rename to srcpkgs/xlsatoms/template diff --git a/templates/xlsclients/template b/srcpkgs/xlsclients/template similarity index 100% rename from templates/xlsclients/template rename to srcpkgs/xlsclients/template diff --git a/templates/xlsfonts/template b/srcpkgs/xlsfonts/template similarity index 100% rename from templates/xlsfonts/template rename to srcpkgs/xlsfonts/template diff --git a/templates/xmlcatmgr/template b/srcpkgs/xmlcatmgr/template similarity index 100% rename from templates/xmlcatmgr/template rename to srcpkgs/xmlcatmgr/template diff --git a/templates/xmodmap/template b/srcpkgs/xmodmap/template similarity index 100% rename from templates/xmodmap/template rename to srcpkgs/xmodmap/template diff --git a/templates/xorg-apps/template b/srcpkgs/xorg-apps/template similarity index 100% rename from templates/xorg-apps/template rename to srcpkgs/xorg-apps/template diff --git a/templates/xorg-fonts/template b/srcpkgs/xorg-fonts/template similarity index 100% rename from templates/xorg-fonts/template rename to srcpkgs/xorg-fonts/template diff --git a/templates/xorg-input-drivers/template b/srcpkgs/xorg-input-drivers/template similarity index 100% rename from templates/xorg-input-drivers/template rename to srcpkgs/xorg-input-drivers/template diff --git a/templates/xorg-server-devel b/srcpkgs/xorg-server-devel similarity index 100% rename from templates/xorg-server-devel rename to srcpkgs/xorg-server-devel diff --git a/templates/xorg-server/depends b/srcpkgs/xorg-server/depends similarity index 100% rename from templates/xorg-server/depends rename to srcpkgs/xorg-server/depends diff --git a/templates/xorg-server/template b/srcpkgs/xorg-server/template similarity index 98% rename from templates/xorg-server/template rename to srcpkgs/xorg-server/template index 71637c804c3..19079cb7e16 100644 --- a/templates/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -15,7 +15,7 @@ long_desc=" The X.org X11 Server from the modularized source tree of X.org X11." conf_files="/etc/dbus-1/system.d/xorg-server.conf" -subpackages="devel" +subpackages="$pkgname-devel" Add_dependency build dri2proto ">=2.1" Add_dependency full glibc diff --git a/templates/xorg-server/devel.template b/srcpkgs/xorg-server/xorg-server-devel.template similarity index 100% rename from templates/xorg-server/devel.template rename to srcpkgs/xorg-server/xorg-server-devel.template diff --git a/templates/xorg-video-drivers/template b/srcpkgs/xorg-video-drivers/template similarity index 100% rename from templates/xorg-video-drivers/template rename to srcpkgs/xorg-video-drivers/template diff --git a/templates/xorg/template b/srcpkgs/xorg/template similarity index 100% rename from templates/xorg/template rename to srcpkgs/xorg/template diff --git a/templates/xpr/template b/srcpkgs/xpr/template similarity index 100% rename from templates/xpr/template rename to srcpkgs/xpr/template diff --git a/templates/xprop/template b/srcpkgs/xprop/template similarity index 100% rename from templates/xprop/template rename to srcpkgs/xprop/template diff --git a/templates/xproto/template b/srcpkgs/xproto/template similarity index 100% rename from templates/xproto/template rename to srcpkgs/xproto/template diff --git a/templates/xrandr/template b/srcpkgs/xrandr/template similarity index 100% rename from templates/xrandr/template rename to srcpkgs/xrandr/template diff --git a/templates/xrdb/template b/srcpkgs/xrdb/template similarity index 100% rename from templates/xrdb/template rename to srcpkgs/xrdb/template diff --git a/templates/xrefresh/template b/srcpkgs/xrefresh/template similarity index 100% rename from templates/xrefresh/template rename to srcpkgs/xrefresh/template diff --git a/templates/xset/template b/srcpkgs/xset/template similarity index 100% rename from templates/xset/template rename to srcpkgs/xset/template diff --git a/templates/xsetmode/template b/srcpkgs/xsetmode/template similarity index 100% rename from templates/xsetmode/template rename to srcpkgs/xsetmode/template diff --git a/templates/xsetroot/template b/srcpkgs/xsetroot/template similarity index 100% rename from templates/xsetroot/template rename to srcpkgs/xsetroot/template diff --git a/templates/xstow/template b/srcpkgs/xstow/template similarity index 100% rename from templates/xstow/template rename to srcpkgs/xstow/template diff --git a/templates/xterm/template b/srcpkgs/xterm/template similarity index 100% rename from templates/xterm/template rename to srcpkgs/xterm/template diff --git a/templates/xtrans/template b/srcpkgs/xtrans/template similarity index 100% rename from templates/xtrans/template rename to srcpkgs/xtrans/template diff --git a/templates/xvinfo/template b/srcpkgs/xvinfo/template similarity index 100% rename from templates/xvinfo/template rename to srcpkgs/xvinfo/template diff --git a/templates/xwd/template b/srcpkgs/xwd/template similarity index 100% rename from templates/xwd/template rename to srcpkgs/xwd/template diff --git a/templates/xwininfo/template b/srcpkgs/xwininfo/template similarity index 100% rename from templates/xwininfo/template rename to srcpkgs/xwininfo/template diff --git a/templates/xwud/template b/srcpkgs/xwud/template similarity index 100% rename from templates/xwud/template rename to srcpkgs/xwud/template diff --git a/templates/xz-devel b/srcpkgs/xz-devel similarity index 100% rename from templates/xz-devel rename to srcpkgs/xz-devel diff --git a/templates/xz/depends b/srcpkgs/xz/depends similarity index 100% rename from templates/xz/depends rename to srcpkgs/xz/depends diff --git a/templates/xz/template b/srcpkgs/xz/template similarity index 96% rename from templates/xz/template rename to srcpkgs/xz/template index 5a03741e4b4..a57f8f6897f 100644 --- a/templates/xz/template +++ b/srcpkgs/xz/template @@ -1,6 +1,7 @@ # Template file for 'xz' pkgname=xz version=4.999.9 +revision=1 wrksrc=${pkgname}-${version}beta distfiles="http://tukaani.org/xz/xz-${version}beta.tar.bz2" build_style=gnu_configure @@ -32,6 +33,6 @@ long_desc=" files easy. The scripts were adapted from gzip and bzip2." replaces="lzma-utils lzma-utils-libs" -subpackages="devel" +subpackages="xz-devel" Add_dependency run glibc -Add_dependency run gcc-libstdc++ +Add_dependency run libstdc++ diff --git a/templates/xz/devel.template b/srcpkgs/xz/xz-devel.template similarity index 100% rename from templates/xz/devel.template rename to srcpkgs/xz/xz-devel.template diff --git a/templates/zip/patches/fix_install.diff b/srcpkgs/zip/patches/fix_install.diff similarity index 100% rename from templates/zip/patches/fix_install.diff rename to srcpkgs/zip/patches/fix_install.diff diff --git a/templates/zip/template b/srcpkgs/zip/template similarity index 100% rename from templates/zip/template rename to srcpkgs/zip/template diff --git a/templates/zisofs-tools/template b/srcpkgs/zisofs-tools/template similarity index 100% rename from templates/zisofs-tools/template rename to srcpkgs/zisofs-tools/template diff --git a/templates/zlib-devel b/srcpkgs/zlib-devel similarity index 100% rename from templates/zlib-devel rename to srcpkgs/zlib-devel diff --git a/templates/zlib/depends b/srcpkgs/zlib/depends similarity index 100% rename from templates/zlib/depends rename to srcpkgs/zlib/depends diff --git a/templates/zlib/patches/configure_build_all_libs.diff b/srcpkgs/zlib/patches/configure_build_all_libs.diff similarity index 100% rename from templates/zlib/patches/configure_build_all_libs.diff rename to srcpkgs/zlib/patches/configure_build_all_libs.diff diff --git a/templates/zlib/template b/srcpkgs/zlib/template similarity index 96% rename from templates/zlib/template rename to srcpkgs/zlib/template index b6e1ee1792c..7f434f68c0c 100644 --- a/templates/zlib/template +++ b/srcpkgs/zlib/template @@ -15,6 +15,6 @@ long_desc=" by RFCs (Request for Comments) 1950 to 1952." base_chroot=yes -subpackages="devel" +subpackages="zlib-devel" Add_dependency run glibc diff --git a/templates/zlib/devel.template b/srcpkgs/zlib/zlib-devel.template similarity index 100% rename from templates/zlib/devel.template rename to srcpkgs/zlib/zlib-devel.template diff --git a/templates/libICE/configure_sh_assignment_broken.diff b/templates/libICE/configure_sh_assignment_broken.diff deleted file mode 100644 index 94e6025c4d9..00000000000 --- a/templates/libICE/configure_sh_assignment_broken.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2009-04-27 01:18:10.646681315 +0200 -+++ configure 2009-04-27 01:18:32.185763370 +0200 -@@ -22132,7 +22132,7 @@ if test "x$GCC" = xyes ; then - -Wbad-function-cast" - case `gcc -dumpversion` in - 3.4.* | 4.*) -- CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement" -+ CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" - ;; - esac - else diff --git a/templates/xbps-base-system/template b/templates/xbps-base-system/template deleted file mode 100644 index 8ef0710126e..00000000000 --- a/templates/xbps-base-system/template +++ /dev/null @@ -1,66 +0,0 @@ -# Template file for 'xbps-base-chroot' -pkgname=xbps-base-system -version=0.21 -build_style=meta-template -short_desc="xbps base system packages" -maintainer="Juan RP " -long_desc=" - This package installs the base system packages for the - lsXL linux system." - -noarch=yes - -Add_dependency full xbps-base-files -Add_dependency full dash -Add_dependency full bash -Add_dependency full coreutils -Add_dependency full grep -Add_dependency full findutils -Add_dependency full sed -Add_dependency full texinfo -Add_dependency full coreutils -Add_dependency full OpenRC -Add_dependency full dash -Add_dependency full zlib -Add_dependency full file -Add_dependency full diffutils -Add_dependency full sed -Add_dependency full findutils -Add_dependency full grep -Add_dependency full gawk -Add_dependency full gzip -Add_dependency full bzip2 -Add_dependency full ncurses -Add_dependency full ncurses-base -Add_dependency full bash -Add_dependency full which -Add_dependency full wget -Add_dependency full man-pages -Add_dependency full man-db -Add_dependency full util-linux-ng -Add_dependency full less -Add_dependency full initramfs-tools -Add_dependency full kbd -Add_dependency full procps -Add_dependency full eject -Add_dependency full shadow -Add_dependency full sudo -Add_dependency full e2fsprogs -Add_dependency full tzdata -Add_dependency full iana-etc -Add_dependency full vim -Add_dependency full dhcpcd -Add_dependency full sysvinit -Add_dependency full net-tools -Add_dependency full iputils -Add_dependency full xbps -Add_dependency full udev -Add_dependency full logrotate -Add_dependency full cronie -Add_dependency full rsyslog -Add_dependency full anacron -Add_dependency full xbps -Add_dependency build openssh -Add_dependency run openssh-client -Add_dependency full lvm2 -Add_dependency full kernel diff --git a/xbps-src/Makefile b/xbps-src/Makefile index 40a075fec74..908dd3cfb49 100644 --- a/xbps-src/Makefile +++ b/xbps-src/Makefile @@ -1,7 +1,7 @@ include vars.mk BIN = xbps-src -SUBDIRS = etc shutils +SUBDIRS = etc common helpers triggers shutils .PHONY: all all: @@ -10,14 +10,14 @@ all: -e "s|@@XBPS_INSTALL_SHAREDIR@@|$(SHAREDIR)|g" \ $(BIN).sh.in > $(BIN) for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir; \ + $(MAKE) -C $$dir || exit 1; \ done .PHONY: clean clean: -rm -f $(BIN) for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir clean; \ + $(MAKE) -C $$dir clean || exit 1; \ done .PHONY: install @@ -25,12 +25,12 @@ install: all install -d $(SBINDIR) install -m 755 $(BIN) $(SBINDIR) for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir install; \ + $(MAKE) -C $$dir install || exit 1; \ done .PHONY: uninstall uninstall: -rm -f $(SBINDIR)/$(BIN) for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir uninstall; \ + $(MAKE) -C $$dir uninstall || exit 1; \ done diff --git a/xbps-src/common/Makefile b/xbps-src/common/Makefile new file mode 100644 index 00000000000..828a990f9c0 --- /dev/null +++ b/xbps-src/common/Makefile @@ -0,0 +1,16 @@ +include ../vars.mk + +.PHONY: all +all: + +.PHONY: clean +clean: + +.PHONY: install +install: + install -d $(DESTDIR)$(SHAREDIR)/common + install -m 644 *.sh $(DESTDIR)$(SHAREDIR)/common + +.PHONY: uninstall +uninstall: + -rm -rf $(DESTDIR)$(SHAREDIR)/common diff --git a/common/fetch_sites.sh b/xbps-src/common/fetch_sites.sh similarity index 100% rename from common/fetch_sites.sh rename to xbps-src/common/fetch_sites.sh diff --git a/xbps-src/etc/xbps-src.conf.in b/xbps-src/etc/xbps-src.conf.in index 9e9d27fd0cc..93733843649 100644 --- a/xbps-src/etc/xbps-src.conf.in +++ b/xbps-src/etc/xbps-src.conf.in @@ -3,14 +3,15 @@ # # -# Directory where XBPS has been installed. By default /usr/local. +# Directory where xbps-src has been installed. By default /usr/local. # XBPS_INSTALLDIR=@@XBPS_INSTALL_PREFIX@@ # -# Directory where you downloaded the GIT xbps-src/templates repository. +# Directory where the xbps-src GIT repository is available. This is +# required to be mounted in the chroot. # -XBPS_DISTRIBUTIONDIR=$HOME/xbps +XBPS_DISTRIBUTIONDIR=$HOME/xbps-templates # # Master directory: this is where all packages files are copied from diff --git a/xbps-src/helpers/Makefile b/xbps-src/helpers/Makefile new file mode 100644 index 00000000000..78499158b34 --- /dev/null +++ b/xbps-src/helpers/Makefile @@ -0,0 +1,16 @@ +include ../vars.mk + +.PHONY: all +all: + +.PHONY: clean +clean: + +.PHONY: install +install: + install -d $(DESTDIR)$(SHAREDIR)/helpers + install -m 644 *.sh $(DESTDIR)$(SHAREDIR)/helpers + +.PHONY: uninstall +uninstall: + -rm -rf $(DESTDIR)$(SHAREDIR)/helpers diff --git a/helpers/perl-module.sh b/xbps-src/helpers/perl-module.sh similarity index 100% rename from helpers/perl-module.sh rename to xbps-src/helpers/perl-module.sh diff --git a/helpers/python-module.sh b/xbps-src/helpers/python-module.sh similarity index 100% rename from helpers/python-module.sh rename to xbps-src/helpers/python-module.sh diff --git a/helpers/replace-interpreter.sh b/xbps-src/helpers/replace-interpreter.sh similarity index 100% rename from helpers/replace-interpreter.sh rename to xbps-src/helpers/replace-interpreter.sh diff --git a/xbps-src/shutils/Makefile b/xbps-src/shutils/Makefile index 36894198b39..fd7d62e9378 100644 --- a/xbps-src/shutils/Makefile +++ b/xbps-src/shutils/Makefile @@ -8,14 +8,9 @@ clean: .PHONY: install install: - if [ ! -d $(DESTDIR)$(SHAREDIR) ]; then \ - install -d $(DESTDIR)$(SHAREDIR); \ - fi - - for f in *.sh; do \ - install -m 755 $$f $(DESTDIR)$(SHAREDIR); \ - done + install -d $(DESTDIR)$(SHAREDIR)/shutils + install -m 644 *.sh $(DESTDIR)$(SHAREDIR)/shutils .PHONY: uninstall uninstall: - -rm -rf $(DESTDIR)$(SHAREDIR) + -rm -rf $(DESTDIR)$(SHAREDIR)/shutils diff --git a/xbps-src/shutils/builddep_funcs.sh b/xbps-src/shutils/builddep_funcs.sh index 19cc6f427ef..d2922eb51bc 100644 --- a/xbps-src/shutils/builddep_funcs.sh +++ b/xbps-src/shutils/builddep_funcs.sh @@ -87,7 +87,7 @@ install_pkg_deps() install_dependencies_pkg() { local pkg="$1" - local lpkgname=$(${XBPS_PKGDB_CMD} getpkgdepname ${pkg}) + local lpkgname=$(${XBPS_PKGDB_CMD} getpkgname ${pkg}) local i pkgn iver reqver notinstalled_deps lver [ -z "$pkg" ] && return 1 diff --git a/xbps-src/shutils/chroot.sh b/xbps-src/shutils/chroot.sh index 3a257f97c3b..f1702e156bd 100644 --- a/xbps-src/shutils/chroot.sh +++ b/xbps-src/shutils/chroot.sh @@ -143,16 +143,13 @@ install_xbps_utils() fi cp -f $fetch_cmd $xbps_prefix/sbin for f in bin cmpver digest pkgdb repo; do - cp -f $XBPS_INSTALLDIR/sbin/xbps-$f.static \ - $xbps_prefix/sbin/ + _cmd="$(which xbps-${f}.static 2>/dev/null)" + if [ -z "$_cmd" ]; then + echo "Unexisting xbps-${f}.static bin!" + exit 1 + fi + cp -f ${_cmd} $xbps_prefix/sbin done - cp -f $XBPS_INSTALLDIR/sbin/xbps-src $xbps_prefix/sbin - if [ -z $XBPS_INSTALLDIR ]; then - installdir=/usr/share/xbps-src - else - installdir=$XBPS_INSTALLDIR/share/xbps-src - fi - cp -a $installdir $xbps_prefix/share rebuild_ldso_cache fi } @@ -178,6 +175,13 @@ xbps_chroot_handler() echo "done." fi + # Reinstall xbps-src in the chroot + if [ ! -f $XBPS_MASTERDIR/usr/local/sbin/xbps-src ]; then + env in_chroot=yes LANG=C PATH=$path \ + chroot $XBPS_MASTERDIR sh -c \ + "cd /xbps/xbps-src && make install clean" + fi + if [ "$action" = "chroot" ]; then env in_chroot=yes LANG=C PATH=$path \ chroot $XBPS_MASTERDIR /bin/sh @@ -185,8 +189,8 @@ xbps_chroot_handler() [ -n "$only_destdir" ] && \ local lenv="install_destdir_target=yes" env in_chroot=yes LANG=C PATH=$path \ - ${lenv} chroot $XBPS_MASTERDIR \ - /usr/local/sbin/xbps-src $action $pkg + ${lenv} chroot $XBPS_MASTERDIR sh -c \ + "cd /xbps/srcpkgs/$pkg && xbps-src $action" fi msg_normal "Exiting from the chroot on $XBPS_MASTERDIR." umount_chroot_fs @@ -280,7 +284,7 @@ if [ "$(id -u)" -ne 0 ]; then if [ -n "$origin_tmpl" ]; then . $XBPS_SHUTILSDIR/tmpl_funcs.sh reset_tmpl_vars - run_file $XBPS_TEMPLATESDIR/$origin_tmpl/template + cd ../$origin_tmpl && . template fi echo "The '$pkgname' package requires to be installed in a chroot." echo "You cannot do this as normal user, try again being root." diff --git a/xbps-src/shutils/configure_funcs.sh b/xbps-src/shutils/configure_funcs.sh index 14c5105c06d..581214524d5 100644 --- a/xbps-src/shutils/configure_funcs.sh +++ b/xbps-src/shutils/configure_funcs.sh @@ -29,11 +29,9 @@ # configure_src_phase() { - local f lver pkg="$1" + local f lver - [ -z $pkg ] && [ -z $pkgname ] && return 1 - - [ ! -d $wrksrc ] && msg_error "unexistent build directory [$wrksrc]." + [ -z $pkgname ] && return 1 # Apply patches if requested by template file if [ ! -f $XBPS_APPLYPATCHES_DONE ]; then @@ -57,6 +55,8 @@ configure_src_phase() lver="${version}" fi + cd $wrksrc || msg_error "unexistent build directory [$wrksrc]." + # cross compilation vars. if [ -n "$cross_compiler" ]; then . $XBPS_SHUTILSDIR/cross-compilation.sh diff --git a/xbps-src/shutils/fetch_funcs.sh b/xbps-src/shutils/fetch_funcs.sh index 36aed944a62..f106a433858 100644 --- a/xbps-src/shutils/fetch_funcs.sh +++ b/xbps-src/shutils/fetch_funcs.sh @@ -44,10 +44,10 @@ verify_sha256_cksum() fetch_update_cksum() { - local tmpl="$XBPS_TEMPLATESDIR/$pkgname/template" local upcmd=$(basename $XBPS_SRCDISTDIR/$1) - sed -i -e "s|checksum.*|checksum=$(${XBPS_DIGEST_CMD} ${upcmd})|" $tmpl + sed -i -e "s|checksum.*|checksum=$(${XBPS_DIGEST_CMD} ${upcmd})|" \ + template return $? } diff --git a/xbps-src/shutils/install_funcs.sh b/xbps-src/shutils/install_funcs.sh index 0f84bb78295..1b7279dd2cb 100644 --- a/xbps-src/shutils/install_funcs.sh +++ b/xbps-src/shutils/install_funcs.sh @@ -50,10 +50,9 @@ strip_files() install_src_phase() { - local pkg="$1" - local f i subpkg lver spkgrev + local f i subpkg lver spkgrev saved_wrksrc - [ -z $pkg ] && [ -z $pkgname ] && return 1 + [ -z $pkgname ] && return 1 if [ -n "$revision" ]; then lver="${version}_${revision}" @@ -70,6 +69,7 @@ install_src_phase() return 0 fi + saved_wrksrc=$wrksrc cd $wrksrc || msg_error "can't change cwd to wrksrc!" # Run pre_install func. @@ -131,38 +131,31 @@ install_src_phase() # Build subpackages if found. # for subpkg in ${subpackages}; do - if [ "${pkg}" != "${sourcepkg}" ] && \ - [ "${pkg}" != "${sourcepkg}-${subpkg}" ]; then - continue - fi if [ -n "$revision" ]; then - spkgrev="${sourcepkg}-${subpkg}-${version}_${revision}" + spkgrev="${subpkg}-${version}_${revision}" else - spkgrev="${sourcepkg}-${subpkg}-${version}" + spkgrev="${subpkg}-${version}" fi check_installed_pkg ${spkgrev} [ $? -eq 0 ] && continue - msg_normal "Preparing $sourcepkg subpackage: $sourcepkg-$subpkg" - if [ ! -f $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template ]; then - msg_error "Cannot find subpackage template!" + msg_normal "Preparing ${sourcepkg} subpackage: ${subpkg}" + if [ ! -f $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template ]; then + msg_error "Cannot find ${subpkg} subpkg build template!" fi - . $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template - pkgname=${sourcepkg}-${subpkg} + . $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template + pkgname=${subpkg} set_tmpl_common_vars run_func do_install || \ msg_error "$pkgname do_install stage failed!" - run_template ${sourcepkg} - [ "$pkg" = "${sourcepkg}-${subpkg}" ] && break done - [ -n "$subpackages" ] && setup_tmpl ${sourcepkg} # # Remove $wrksrc if -C not specified. # - if [ -d "$wrksrc" -a -z "$dontrm_builddir" ]; then - rm -rf $wrksrc && \ - msg_normal "Removed $pkgname-$lver build directory." + if [ -d "$saved_wrksrc" -a -z "$dontrm_builddir" ]; then + rm -rf $saved_wrksrc && \ + msg_normal "Removed $sourcepkg-$lver build directory." fi } diff --git a/xbps-src/shutils/make-binpkg.sh b/xbps-src/shutils/make-binpkg.sh index 81ad4f8918e..5b3c04b4ecd 100644 --- a/xbps-src/shutils/make-binpkg.sh +++ b/xbps-src/shutils/make-binpkg.sh @@ -25,19 +25,20 @@ xbps_make_binpkg() { - local pkg="$1" local subpkg + [ -z "$pkgname" ] && return 1 + for subpkg in ${subpackages}; do unset revision - . $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template - pkgname=${sourcepkg}-${subpkg} + . $XBPS_SRCPKGDIR/$pkgname/$subpkg.template + pkgname=${subpkg} set_tmpl_common_vars xbps_make_binpkg_real run_template ${sourcepkg} done - set_tmpl_common_vars + [ -n "${subpackages}" ] && set_tmpl_common_vars xbps_make_binpkg_real return $? } @@ -50,11 +51,10 @@ xbps_make_binpkg_real() { local mfiles binpkg pkgdir arch use_sudo lver dirs _dirs d clevel - if [ ! -d ${DESTDIR} ]; then - echo "$pkgname: unexistent destdir... skipping!" + if [ ! -d "${DESTDIR}" ]; then + msg_warn "cannot find destdir for $pkgname... skipping!" return 0 fi - cd ${DESTDIR} if [ -n "$noarch" ]; then @@ -62,13 +62,11 @@ xbps_make_binpkg_real() else arch=$xbps_machine fi - if [ -n "$base_chroot" ]; then use_sudo=no else use_sudo=yes fi - if [ -n "$revision" ]; then lver="${version}_${revision}" else @@ -76,6 +74,13 @@ xbps_make_binpkg_real() fi binpkg=$pkgname-$lver.$arch.xbps pkgdir=$XBPS_PACKAGESDIR/$arch + # + # Don't overwrite existing binpkgs by default, skip them. + # + if [ -f $pkgdir/$binpkg ]; then + msg_normal "Skipping existing $binpkg ..." + return 0 + fi # # Make sure that INSTALL is the first file on the archive, @@ -103,7 +108,7 @@ xbps_make_binpkg_real() -cpf - ${mfiles} ${dirs} | \ $XBPS_COMPRESS_CMD ${clevel} -qf > $pkgdir/$binpkg if [ $? -eq 0 ]; then - echo "=> Built package: $binpkg" + msg_normal "Built package: $binpkg" fi return $? diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh index c97c8445cfa..63e598a6882 100644 --- a/xbps-src/shutils/metadata.sh +++ b/xbps-src/shutils/metadata.sh @@ -38,43 +38,35 @@ _EOF xbps_write_metadata_pkg() { - local pkg="$1" local subpkg spkgrev for subpkg in ${subpackages}; do - if [ "${pkg}" != "${sourcepkg}" ] && \ - [ "${pkg}" != "${sourcepkg}-${subpkg}" ]; then - continue - fi if [ -n "${revision}" ]; then - spkgrev="${sourcepkg}-${subpkg}-${version}_${revision}" + spkgrev="${subpkg}-${version}_${revision}" else - spkgrev="${sourcepkg}-${subpkg}-${version}" + spkgrev="${subpkg}-${version}" fi check_installed_pkg ${spkgrev} [ $? -eq 0 ] && continue - if [ ! -f $XBPS_TEMPLATESDIR/$sourcepkg/$subpkg.template ]; then - msg_error "Cannot find subpackage template!" + if [ ! -f $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template ]; then + msg_error "Cannot find subpackage build template!" fi unset run_depends conf_files noarch triggers replaces \ revision openrc_services essential keep_empty_dirs - . $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template - pkgname=${sourcepkg}-${subpkg} + . $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template + pkgname=${subpkg} set_tmpl_common_vars xbps_write_metadata_pkg_real run_template ${sourcepkg} - [ "${pkg}" = "${sourcepkg}-${subpkg}" ] && break done - [ -n "${subpackages}" ] && [ "$pkg" != "${sourcepkg}" ] && return $? - if [ "$build_style" = "meta-template" -a -z "${run_depends}" ]; then for spkg in ${subpackages}; do if [ -n "${revision}" ]; then - spkgrev="$sourcepkg-$spkg-${version}_$revision" + spkgrev="${spkg}-${version}_$revision" else - spkgrev="${sourcepkg}-${spkg}-${version}" + spkgrev="${spkg}-${version}" fi run_depends="${run_depends} ${spkgrev}" done @@ -269,6 +261,8 @@ xbps_write_metadata_pkg_real() $pkgname version $lver +pkgver +$pkgname-$lver architecture $arch installed_size diff --git a/xbps-src/shutils/metadata_scripts.sh b/xbps-src/shutils/metadata_scripts.sh index 79d5a861ff4..133cf28ab61 100644 --- a/xbps-src/shutils/metadata_scripts.sh +++ b/xbps-src/shutils/metadata_scripts.sh @@ -191,9 +191,9 @@ _EOF case "$action" in install) if [ -n "${sourcepkg}" -a "${sourcepkg}" != "${pkgname}" ]; then - install_file=${XBPS_TEMPLATESDIR}/${pkgname}/${pkgname}.INSTALL + install_file=$XBPS_SRCPKGDIR/$pkgname/$pkgname.INSTALL else - install_file=${XBPS_TEMPLATESDIR}/${pkgname}/INSTALL + install_file=$XBPS_SRCPKGDIR/$pkgname/INSTALL fi if [ -f ${install_file} ]; then found=1 @@ -208,9 +208,9 @@ _EOF ;; remove) if [ -n "${sourcepkg}" -a "${sourcepkg}" != "${pkgname}" ]; then - remove_file=${XBPS_TEMPLATESDIR}/${pkgname}/${pkgname}.REMOVE + remove_file=$XBPS_SRCPKGDIR/$pkgname/$pkgname.REMOVE else - remove_file=${XBPS_TEMPLATESDIR}/${pkgname}/REMOVE + remove_file=$XBPS_SRCPKGDIR/$pkgname/REMOVE fi if [ -f ${remove_file} ]; then found=1 diff --git a/xbps-src/shutils/pkgtarget_funcs.sh b/xbps-src/shutils/pkgtarget_funcs.sh index 1197d118ca1..7fab2d83ae8 100644 --- a/xbps-src/shutils/pkgtarget_funcs.sh +++ b/xbps-src/shutils/pkgtarget_funcs.sh @@ -30,14 +30,7 @@ # install_pkg() { - local pkg= - local curpkgn="$1" - local cdestdir= - local cur_tmpl="$XBPS_TEMPLATESDIR/$curpkgn/template" - - if [ -z $cur_tmpl -o ! -f $cur_tmpl ]; then - msg_error "cannot find $cur_tmpl template build file." - fi + local curpkgn="$1" pkg cdestdir # # If we are being invoked through the chroot, re-read config file @@ -48,10 +41,12 @@ install_pkg() set_defvars fi - . $XBPS_SHUTILSDIR/tmpl_funcs.sh - reset_tmpl_vars - . $cur_tmpl pkg="$curpkgn-$version" + . $XBPS_SHUTILSDIR/tmpl_funcs.sh + if [ -n "$doing_deps" ]; then + reset_tmpl_vars + setup_tmpl $curpkgn + fi # # If we are the originator package save the path for this template in @@ -66,11 +61,6 @@ install_pkg() return $? fi - # - # We are going to install a new package. - # - setup_tmpl $curpkgn - # # Install dependencies required by this package. # @@ -79,10 +69,9 @@ install_pkg() install_dependencies_pkg $pkg # # At this point all required deps are installed, and - # only remaining is the origin template; install it. + # only remaining is the origin package; install it. # unset doing_deps - reset_tmpl_vars setup_tmpl $curpkgn fi @@ -108,18 +97,18 @@ install_pkg() fi . $XBPS_SHUTILSDIR/install_funcs.sh - install_src_phase $curpkgn + install_src_phase # Always write metadata to package's destdir. . $XBPS_SHUTILSDIR/metadata.sh - xbps_write_metadata_pkg $curpkgn + xbps_write_metadata_pkg # # Do not stow package if it wasn't requested. # if [ -z "$install_destdir_target" ]; then . $XBPS_SHUTILSDIR/stow_funcs.sh - stow_pkg $curpkgn + stow_pkg_handler stow fi } @@ -128,8 +117,7 @@ install_pkg() # list_pkg_files() { - local pkg="$1" - local ver= + local pkg="$1" ver= [ -z $pkg ] && msg_error "unexistent package, aborting." @@ -144,29 +132,24 @@ list_pkg_files() # remove_pkg() { - local pkg="$1" subpkg ver + local subpkg ver - [ -z $pkg ] && msg_error "unexistent package, aborting." + [ -z $pkgname ] && msg_error "unexistent package, aborting." - if [ ! -f "$XBPS_TEMPLATESDIR/$pkg/template" ]; then - msg_error "cannot find template build file." - fi + ver=$($XBPS_PKGDB_CMD version $pkgname) + [ -z "$ver" ] && msg_error "$pkgname is not installed." - . $XBPS_TEMPLATESDIR/$pkg/template - for f in ${subpackages}; do - if [ "$pkg" = "${pkgname}-${f}" ]; then - pkgname=${pkg} - break; + . $XBPS_SHUTILSDIR/stow_funcs.sh + stow_pkg_handler unstow || return $? + + for subpkg in ${subpackages}; do + if [ -d $XBPS_DESTDIR/${subpkg}-${ver%_${revision}} ]; then + rm -rf $XBPS_DESTDIR/${subpkg}-${ver%_${revision}} fi done - ver=$($XBPS_PKGDB_CMD version $pkg) - [ -z "$ver" ] && msg_error "$pkg is not installed." - - . $XBPS_SHUTILSDIR/stow_funcs.sh - unstow_pkg $pkg - if [ $? -eq 0 -a -d $XBPS_DESTDIR/$pkg-${ver%_${revision}} ]; then - rm -rf $XBPS_DESTDIR/$pkg-${ver%_${revision}} + if [ -d $XBPS_DESTDIR/${pkgname}-${ver%_${revision}} ]; then + rm -rf $XBPS_DESTDIR/${pkgname}-${ver%_${revision}} fi return $? } diff --git a/xbps-src/shutils/stow_funcs.sh b/xbps-src/shutils/stow_funcs.sh index 6dab3ea831d..ee476c08b8e 100644 --- a/xbps-src/shutils/stow_funcs.sh +++ b/xbps-src/shutils/stow_funcs.sh @@ -25,44 +25,40 @@ . ${XBPS_SHUTILSDIR}/builddep_funcs.sh -stow_pkg() +stow_pkg_handler() { - local pkg="$1" - local subpkg spkgrev + local action="$1" subpkg spkgrev for subpkg in ${subpackages}; do - if [ "${pkg}" != "${sourcepkg}" ] && \ - [ "${pkg}" != "${sourcepkg}-${subpkg}" ]; then - continue - fi if [ -n "$revision" ]; then - spkgrev="${sourcepkg}-${subpkg}-${version}_${revision}" + spkgrev="${subpkg}-${version}_${revision}" else - spkgrev="${sourcepkg}-${subpkg}-${version}" + spkgrev="${subpkg}-${version}" fi - check_installed_pkg ${spkgrev} - [ $? -eq 0 ] && continue - - if [ ! -f $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template ]; then - msg_error "Cannot find subpackage template!" + if [ "$action" = "stow" ]; then + check_installed_pkg ${spkgrev} + [ $? -eq 0 ] && continue + fi + if [ ! -f $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template ]; then + msg_error "Cannot find $subpkg subpkg build template!" fi unset revision - . $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template - pkgname=${sourcepkg}-${subpkg} + . $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template + pkgname=${subpkg} set_tmpl_common_vars - stow_pkg_real ${pkgname} - run_template ${sourcepkg} - if [ "${pkg}" = "${sourcepkg}-${subpkg}" ]; then - # - # If it's a subpackage, just remove sourcepkg from - # destdir and return, we are done. - # - rm -rf $XBPS_DESTDIR/${spkgrev} - return $? + if [ "$action" = "stow" ]; then + stow_pkg_real || return $? + else + unstow_pkg_real || return $? fi + run_template ${sourcepkg} done - stow_pkg_real ${pkg} ${automatic} + if [ "$action" = "stow" ]; then + stow_pkg_real + else + unstow_pkg_real + fi return $? } @@ -72,20 +68,19 @@ stow_pkg() # stow_pkg_real() { - local pkg="$1" local i lver regpkgdb_flags - [ -z "$pkg" ] && return 2 + [ -z "$pkgname" ] && return 2 if [ $(id -u) -ne 0 ] && [ ! -w $XBPS_MASTERDIR ]; then - msg_error "cannot stow $pkg! (permission denied)" + msg_error "cannot stow $pkgname! (permission denied)" fi if [ "$build_style" = "meta-template" ]; then [ ! -d ${DESTDIR} ] && mkdir -p ${DESTDIR} fi - [ -n "$stow_flag" ] && run_template $pkg + [ -n "$stow_flag" ] && run_template $pkgname cd ${DESTDIR} || exit 1 @@ -106,7 +101,7 @@ stow_pkg_real() else lver="${version}" fi - $XBPS_PKGDB_CMD register $pkg $lver "$short_desc" || exit 1 + $XBPS_PKGDB_CMD register $pkgname $lver "$short_desc" return $? } @@ -114,32 +109,32 @@ stow_pkg_real() # Unstow a package, i.e remove its files from masterdir and # unregister pkg from package database. # -unstow_pkg() +unstow_pkg_real() { - local f ver pkg="$1" + local f ver - [ -z $pkg ] && msg_error "template wasn't specified?" + [ -z $pkgname ] && return 1 if [ $(id -u) -ne 0 ] && \ [ ! -w $XBPS_MASTERDIR ]; then - msg_error "cannot unstow $pkg! (permission denied)" + msg_error "cannot unstow $pkgname! (permission denied)" fi - run_template $pkg + run_template $pkgname - ver=$($XBPS_PKGDB_CMD version $pkg) + ver=$($XBPS_PKGDB_CMD version $pkgname) if [ -z "$ver" ]; then - msg_error "$pkg is not installed." + msg_error "$pkgname is not installed." fi - cd $XBPS_PKGMETADIR/$pkg || exit 1 + cd $XBPS_PKGMETADIR/$pkgname || exit 1 if [ "$build_style" = "meta-template" ]; then # If it's a metapkg, do nothing. : elif [ ! -f flist ]; then - msg_error "$pkg is incomplete, missing flist." + msg_error "$pkgname is incomplete, missing flist." elif [ ! -w flist ]; then - msg_error "$pkg cannot be removed (permission denied)." + msg_error "$pkgname cannot be removed (permission denied)." elif [ -s flist ]; then # Remove installed files. for f in $(cat flist); do @@ -162,9 +157,9 @@ unstow_pkg() fi # Remove metadata dir. - rm -rf $XBPS_PKGMETADIR/$pkg + rm -rf $XBPS_PKGMETADIR/$pkgname # Unregister pkg from plist file. - $XBPS_PKGDB_CMD unregister $pkg $ver + $XBPS_PKGDB_CMD unregister $pkgname $ver return $? } diff --git a/xbps-src/shutils/tmpl_funcs.sh b/xbps-src/shutils/tmpl_funcs.sh index 609ac0034f4..0ce3c04c912 100644 --- a/xbps-src/shutils/tmpl_funcs.sh +++ b/xbps-src/shutils/tmpl_funcs.sh @@ -47,7 +47,6 @@ info_tmpl() echo "$long_desc" echo . $XBPS_SHUTILSDIR/builddep_funcs.sh - run_template $pkgname check_build_depends_pkg if [ $? -eq 0 ]; then echo "This package requires the following dependencies to be built:" @@ -95,24 +94,43 @@ setup_tmpl() { local pkg="$1" - [ -z "$pkg" ] && msg_error "missing package name after target." + [ -z "$pkg" ] && return 1 + [ "$pkgname" = "$pkg" ] && return 0 for f in $(echo $XBPS_COMMONVARSDIR/*.sh); do [ -r ${f} ] && . ${f} done - if [ -f "$XBPS_TEMPLATESDIR/$pkg/template" ]; then - if [ "$pkgname" != "$pkg" ]; then - reset_tmpl_vars - . $XBPS_TEMPLATESDIR/$pkg/template - fi + if [ -f $XBPS_SRCPKGDIR/${pkg}/template ]; then + reset_tmpl_vars + . $XBPS_SRCPKGDIR/${pkg}/template prepare_tmpl else - msg_error "cannot find '$pkg' template build file." + msg_error "Cannot find $pkg build template file." fi } +check_builddep_dup() +{ + local dep="$1" i + + for i in ${build_depends}; do + [ "${i}" != "${dep}" ] && continue + return 1 + done +} + +check_rundep_dup() +{ + local dep="$1" i + + for i in ${run_depends}; do + [ "${i}" != "${dep}" ] && continue + return 1 + done +} + Add_dependency() { local type="$1" pkgname="$2" version="$3" @@ -124,29 +142,41 @@ Add_dependency() [ -z "$pkgname" ] && msg_error "Add_dependency: pkgname empty!" - if [ -f $XBPS_TEMPLATESDIR/${pkgname}/${pkgname}.depends ]; then - . $XBPS_TEMPLATESDIR/${pkgname}/${pkgname}.depends - elif [ -f $XBPS_TEMPLATESDIR/${pkgname}/depends ]; then - . $XBPS_TEMPLATESDIR/${pkgname}/depends + if [ -f $XBPS_SRCPKGDIR/${pkgname}/${pkgname}.depends ]; then + . $XBPS_SRCPKGDIR/${pkgname}/${pkgname}.depends + elif [ -f $XBPS_SRCPKGDIR/${pkgname}/depends ]; then + . $XBPS_SRCPKGDIR/${pkgname}/depends fi if [ "$type" = "full" -o "$type" = "build" ]; then if [ -z "$version" -a -z "$api_depends" ]; then - build_depends="${build_depends} ${pkgname}>=0" + if check_builddep_dup "${pkgname}>=0"; then + build_depends="${build_depends} ${pkgname}>=0" + fi elif [ -z "$version" -a -n "$api_depends" ]; then - build_depends="${build_depends} ${pkgname}${api_depends}" + if check_builddep_dup "${pkgname}${api_depends}"; then + build_depends="${build_depends} ${pkgname}${api_depends}" + fi else - build_depends="${build_depends} ${pkgname}${version}" + if check_builddep_dup "${pkgname}${version}"; then + build_depends="${build_depends} ${pkgname}${version}" + fi fi fi if [ "$type" = "full" -o "$type" = "run" ]; then if [ -z "$version" -a -z "$abi_depends" ]; then - run_depends="${run_depends} ${pkgname}>=0" + if check_rundep_dup "${pkgname}>=0"; then + run_depends="${run_depends} ${pkgname}>=0" + fi elif [ -z "$version" -a -n "$abi_depends" ]; then - run_depends="${run_depends} ${pkgname}${abi_depends}" + if check_rundep_dup "${pkgname}${api_depends}"; then + run_depends="${run_depends} ${pkgname}${abi_depends}" + fi else - run_depends="${run_depends} ${pkgname}${version}" + if check_rundep_dup "${pkgname}${version}"; then + run_depends="${run_depends} ${pkgname}${version}" + fi fi fi @@ -212,8 +242,8 @@ set_tmpl_common_vars() { [ -z "$pkgname" ] && return 1 - FILESDIR=${XBPS_TEMPLATESDIR}/${pkgname}/files - PATCHESDIR=${XBPS_TEMPLATESDIR}/${pkgname}/patches + FILESDIR=$XBPS_SRCPKGDIR/$pkgname/files + PATCHESDIR=$XBPS_SRCPKGDIR/$pkgname/patches DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version} if [ -z "${sourcepkg}" ]; then sourcepkg=${pkgname} @@ -227,7 +257,11 @@ run_template() if [ "$pkgname" != "$pkg" ]; then reset_tmpl_vars - . $XBPS_TEMPLATESDIR/$pkg/template + if [ ! -d $XBPS_SRCPKGDIR/$pkg -o \ + ! -f $XBPS_SRCPKGDIR/$pkg/template ]; then + msg_error "Cannot find $pkg build template file!" + fi + . $XBPS_SRCPKGDIR/$pkg/template set_tmpl_common_vars fi } diff --git a/xbps-src/triggers/Makefile b/xbps-src/triggers/Makefile new file mode 100644 index 00000000000..2f4f1a14132 --- /dev/null +++ b/xbps-src/triggers/Makefile @@ -0,0 +1,20 @@ +include ../vars.mk + +TRIGGERS= gtk-icon-cache info-files mimedb register-shell +TRIGGERS+= xml-catalog gtk-immodules initramfs-tools openrc-service +TRIGGERS+= update-desktopdb gtk-pixbuf-loaders pango-modules x11-fonts + +.PHONY: all +all: + +.PHONY: clean +clean: + +.PHONY: install +install: + install -d $(DESTDIR)$(SHAREDIR)/triggers + install -m 755 $(TRIGGERS) $(DESTDIR)$(SHAREDIR)/triggers + +.PHONY: uninstall +uninstall: + -rm -rf $(DESTDIR)$(SHAREDIR)/triggers diff --git a/triggers/gtk-icon-cache b/xbps-src/triggers/gtk-icon-cache similarity index 100% rename from triggers/gtk-icon-cache rename to xbps-src/triggers/gtk-icon-cache diff --git a/triggers/gtk-immodules b/xbps-src/triggers/gtk-immodules similarity index 100% rename from triggers/gtk-immodules rename to xbps-src/triggers/gtk-immodules diff --git a/triggers/gtk-pixbuf-loaders b/xbps-src/triggers/gtk-pixbuf-loaders similarity index 100% rename from triggers/gtk-pixbuf-loaders rename to xbps-src/triggers/gtk-pixbuf-loaders diff --git a/triggers/info-files b/xbps-src/triggers/info-files similarity index 100% rename from triggers/info-files rename to xbps-src/triggers/info-files diff --git a/triggers/initramfs-tools b/xbps-src/triggers/initramfs-tools similarity index 100% rename from triggers/initramfs-tools rename to xbps-src/triggers/initramfs-tools diff --git a/triggers/mimedb b/xbps-src/triggers/mimedb similarity index 100% rename from triggers/mimedb rename to xbps-src/triggers/mimedb diff --git a/triggers/openrc-service b/xbps-src/triggers/openrc-service similarity index 100% rename from triggers/openrc-service rename to xbps-src/triggers/openrc-service diff --git a/triggers/pango-modules b/xbps-src/triggers/pango-modules similarity index 100% rename from triggers/pango-modules rename to xbps-src/triggers/pango-modules diff --git a/triggers/register-shell b/xbps-src/triggers/register-shell similarity index 100% rename from triggers/register-shell rename to xbps-src/triggers/register-shell diff --git a/triggers/update-desktopdb b/xbps-src/triggers/update-desktopdb similarity index 100% rename from triggers/update-desktopdb rename to xbps-src/triggers/update-desktopdb diff --git a/triggers/x11-fonts b/xbps-src/triggers/x11-fonts similarity index 100% rename from triggers/x11-fonts rename to xbps-src/triggers/x11-fonts diff --git a/triggers/xml-catalog b/xbps-src/triggers/xml-catalog similarity index 100% rename from triggers/xml-catalog rename to xbps-src/triggers/xml-catalog diff --git a/xbps-src/vars.mk b/xbps-src/vars.mk index 928a29ee358..ea011f6e4ea 100644 --- a/xbps-src/vars.mk +++ b/xbps-src/vars.mk @@ -5,5 +5,5 @@ SBINDIR ?= $(DESTDIR)$(PREFIX)/sbin # # The following two vars shouldn't be specified with DESTDIR! # -SHAREDIR ?= $(PREFIX)/share/xbps-src/shutils +SHAREDIR ?= $(PREFIX)/share/xbps-src ETCDIR ?= $(PREFIX)/etc diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in index c9db13314e1..65cafb6e12a 100644 --- a/xbps-src/xbps-src.sh.in +++ b/xbps-src/xbps-src.sh.in @@ -35,28 +35,29 @@ trap "echo && exit 1" INT QUIT usage() { cat << _EOF -$progname: [-C] [-c ] [-u] +$progname: [-C] [-c ] [-u] Targets: - build Build a package (fetch + extract + configure + build). - build-pkg [|all] Build a binary package from . - Package must be installed into destdir. If the - keyword is used instead of , all packages - currently installed will be used. - chroot Enter to the chroot in masterdir. - configure Configure a package (fetch + extract + configure). - extract Extract distribution file(s) into build directory. - fetch Download distribution file(s). - info Show information about . - install-destdir build + install into destdir. - install install-destdir + stow. - list List installed packages in masterdir. - listfiles List installed files from . - remove Remove package completely (destdir + masterdir). - stow Copy files from destdir into masterdir and - register package in database. - unstow Remove files from masterdir and unregister - package from database. + build Build a package (fetch + extract + configure + build). + build-pkg [all] Build a binary package from . + Package must be installed into destdir. If the + keyword is used all packages currently installed will + be used. + chroot Enter to the chroot in masterdir. + configure Configure a package (fetch + extract + configure). + extract Extract distribution file(s) into build directory. + fetch Download distribution file(s). + info Show information for current pkg build template. + install-destdir build + install into destdir. + install install-destdir + stow. + list List installed packages in masterdir. + listfiles List installed files from . + reinstall remove + install. + remove Remove package completely (destdir + masterdir). + stow Copy files from destdir into masterdir and + register package in database. + unstow Remove files from masterdir and unregister + package from database. Options: -C Do not remove build directory after successful installation. @@ -67,6 +68,11 @@ _EOF exit 1 } +basename_cwd() +{ + echo $(basename $(pwd)) +} + check_path() { eval local orig="$1" @@ -90,18 +96,20 @@ run_file() set_defvars() { - local DDIRS i instver + local DDIRS i instver instsharedir - : ${XBPS_TEMPLATESDIR:=$XBPS_DISTRIBUTIONDIR/templates} - : ${XBPS_TRIGGERSDIR:=$XBPS_DISTRIBUTIONDIR/triggers} - : ${XBPS_HELPERSDIR:=$XBPS_DISTRIBUTIONDIR/helpers} - : ${XBPS_COMMONVARSDIR:=$XBPS_DISTRIBUTIONDIR/common} + instsharedir=@@XBPS_INSTALL_SHAREDIR@@ + + : ${XBPS_TRIGGERSDIR:=$instsharedir/triggers} + : ${XBPS_HELPERSDIR:=$instsharedir/helpers} + : ${XBPS_SHUTILSDIR:=$instsharedir/shutils} + : ${XBPS_COMMONVARSDIR:=$instsharedir/common} : ${XBPS_DBDIR:=$XBPS_MASTERDIR/var/db/xbps} : ${XBPS_META_PATH:=$XBPS_DBDIR/} : ${XBPS_PKGMETADIR:=$XBPS_DBDIR/metadata} - : ${XBPS_SHUTILSDIR:=@@XBPS_INSTALL_SHAREDIR@@} + : ${XBPS_SRCPKGDIR:=$XBPS_DISTRIBUTIONDIR/srcpkgs} - DDIRS="XBPS_TEMPLATESDIR XBPS_TRIGGERSDIR XBPS_HELPERSDIR" + DDIRS="XBPS_TRIGGERSDIR XBPS_HELPERSDIR" DDIRS="$DDIRS XBPS_COMMONVARSDIR XBPS_SHUTILSDIR" for i in ${DDIRS}; do eval val="\$$i" @@ -199,32 +207,32 @@ set_defvars case "$target" in build|configure) . $XBPS_SHUTILSDIR/tmpl_funcs.sh - setup_tmpl $2 + setup_tmpl $(basename_cwd) if [ -z "$base_chroot" -a -z "$in_chroot" ]; then . $XBPS_SHUTILSDIR/chroot.sh if [ "$target" = "build" ]; then - xbps_chroot_handler build $2 + xbps_chroot_handler build $pkgname else - xbps_chroot_handler configure $2 + xbps_chroot_handler configure $pkgname fi else . $XBPS_SHUTILSDIR/fetch_funcs.sh - fetch_distfiles $2 + fetch_distfiles if [ ! -f "$XBPS_EXTRACT_DONE" ]; then . $XBPS_SHUTILSDIR/extract_funcs.sh - extract_distfiles $2 + extract_distfiles fi if [ "$target" = "configure" ]; then . $XBPS_SHUTILSDIR/configure_funcs.sh - configure_src_phase $2 + configure_src_phase else if [ ! -f "$XBPS_CONFIGURE_DONE" ]; then . $XBPS_SHUTILSDIR/configure_funcs.sh - configure_src_phase $2 + configure_src_phase fi . $XBPS_SHUTILSDIR/build_funcs.sh - build_src_phase $2 + build_src_phase fi fi ;; @@ -234,15 +242,14 @@ build-pkg) if [ "$2" = "all" ]; then for f in $($XBPS_BIN_CMD list|awk '{print $1}'); do pkg=$(${XBPS_PKGDB_CMD} getpkgname $f) - setup_tmpl ${pkg} - if [ "$pkg" = "$sourcepkg" ]; then - xbps_make_binpkg ${pkg} + setup_tmpl $pkg + if [ "${pkg}" = "${sourcepkg}" ]; then + xbps_make_binpkg fi - reset_tmpl_vars done else - setup_tmpl $2 - xbps_make_binpkg $2 + setup_tmpl $(basename_cwd) + xbps_make_binpkg fi ;; chroot) @@ -251,25 +258,25 @@ chroot) ;; extract|fetch|info) . $XBPS_SHUTILSDIR/tmpl_funcs.sh - setup_tmpl $2 + setup_tmpl $(basename_cwd) if [ "$target" = "info" ]; then . $XBPS_SHUTILSDIR/tmpl_funcs.sh - info_tmpl $2 + info_tmpl exit $? fi if [ "$target" = "fetch" ]; then . $XBPS_SHUTILSDIR/fetch_funcs.sh - fetch_distfiles $2 $update_checksum + fetch_distfiles $update_checksum exit $? fi . $XBPS_SHUTILSDIR/extract_funcs.sh - extract_distfiles $2 + extract_distfiles ;; install|install-destdir) - [ -z "$2" ] && msg_error "missing package name after target." [ "$target" = "install-destdir" ] && install_destdir_target=yes . $XBPS_SHUTILSDIR/pkgtarget_funcs.sh - install_pkg $2 + setup_tmpl $(basename_cwd) + install_pkg $pkgname ;; list|listfiles) if [ "$target" = "list" ]; then @@ -279,23 +286,29 @@ list|listfiles) . $XBPS_SHUTILSDIR/pkgtarget_funcs.sh list_pkg_files $2 ;; -remove) - [ -z "$2" ] && msg_error "missing package name after target." +reinstall) . $XBPS_SHUTILSDIR/pkgtarget_funcs.sh - remove_pkg $2 + setup_tmpl $(basename_cwd) + remove_pkg + install_pkg $pkgname + ;; +remove) + . $XBPS_SHUTILSDIR/pkgtarget_funcs.sh + setup_tmpl $(basename_cwd) + remove_pkg ;; stow) stow_flag=yes . $XBPS_SHUTILSDIR/tmpl_funcs.sh - setup_tmpl $2 + setup_tmpl $(basename_cwd) . $XBPS_SHUTILSDIR/stow_funcs.sh - stow_pkg $2 + stow_pkg_handler stow ;; unstow) . $XBPS_SHUTILSDIR/tmpl_funcs.sh - setup_tmpl $2 + setup_tmpl $(basename_cwd) . $XBPS_SHUTILSDIR/stow_funcs.sh - unstow_pkg $2 + stow_pkg_handler unstow ;; *) echo "=> ERROR: invalid target: $target."