diff --git a/srcpkgs/chromium-unstable/files/chromium-unstable.virtualpkgd b/srcpkgs/chromium-unstable/files/chromium-unstable.virtualpkgd deleted file mode 100644 index 989d251437..0000000000 --- a/srcpkgs/chromium-unstable/files/chromium-unstable.virtualpkgd +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - virtual-pkgver - chromium-0 - target-pkgpattern - chromium-unstable>=0 - - diff --git a/srcpkgs/chromium-unstable/template b/srcpkgs/chromium-unstable/template index c000153e1e..2af59d79f0 100644 --- a/srcpkgs/chromium-unstable/template +++ b/srcpkgs/chromium-unstable/template @@ -2,6 +2,7 @@ __pkgname=chromium pkgname=${__pkgname}-unstable version=17.0.916.0 +revision=1 distfiles="http://build.chromium.org/official/${__pkgname}-$version.tar.bz2" short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="davehome " @@ -148,11 +149,4 @@ do_install() done vinstall ${FILESDIR}/chromium.sh 755 usr/bin chromium vinstall LICENSE 644 usr/share/licenses/${__pkgname} - - vinstall ${FILESDIR}/chromium-unstable.virtualpkgd \ - 644 etc/xbps/virtualpkg.d chromium-unstable.plist - vmkdir etc/xbps/virtualpkg.d.wants - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/chromium-unstable.plist . - } diff --git a/srcpkgs/cronie/files/cronie.virtualpkgd b/srcpkgs/cronie/files/cronie.virtualpkgd deleted file mode 100644 index ff33baf8a3..0000000000 --- a/srcpkgs/cronie/files/cronie.virtualpkgd +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - virtual-pkgver - cron-daemon-0 - target-pkgpattern - cronie>=0 - - diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index 65f9d6e49d..0feffc7128 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -1,7 +1,7 @@ # Template file for 'cronie' pkgname=cronie version=1.4.8 -revision=5 +revision=6 distfiles="https://fedorahosted.org/releases/c/r/cronie/cronie-$version.tar.gz" build_style=gnu-configure configure_args="--with-inotify --without-selinux --with-pam --disable-anacron @@ -40,11 +40,6 @@ post_install() vinstall ${FILESDIR}/crond.logrotate 644 etc/logrotate.d crond rm -f ${DESTDIR}/etc/pam.d/crond vinstall ${FILESDIR}/crond.pam 644 etc/pam.d crond - vinstall ${FILESDIR}/cronie.virtualpkgd \ - 644 etc/xbps/virtualpkg.d cronie.plist - vmkdir etc/xbps/virtualpkg.d.wants - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/cronie.plist . # Add /etc/cron.deny empty, to allow all users. touch ${DESTDIR}/etc/cron.deny diff --git a/srcpkgs/dcron/files/dcron.virtualpkgd b/srcpkgs/dcron/files/dcron.virtualpkgd deleted file mode 100644 index 4ae5747d58..0000000000 --- a/srcpkgs/dcron/files/dcron.virtualpkgd +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - virtual-pkgver - cron-daemon-0 - target-pkgpattern - dcron>=0 - - diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template index f0f93e96b1..096be14e9a 100644 --- a/srcpkgs/dcron/template +++ b/srcpkgs/dcron/template @@ -1,7 +1,7 @@ # Template file for 'dcron' pkgname=dcron version=4.5 -revision=7 +revision=8 distfiles="http://www.jimpryor.net/linux/releases/dcron-${version}.tar.gz" short_desc="Dillon's lightweight cron daemon" maintainer="Juan RP " @@ -42,12 +42,6 @@ do_install() install -Dm644 extra/crond.logrotate ${DESTDIR}/etc/logrotate.d/crond vinstall ${FILESDIR}/dcron.service 644 lib/systemd/system - vinstall ${FILESDIR}/dcron.virtualpkgd \ - 644 etc/xbps/virtualpkg.d dcron.plist - vmkdir etc/xbps/virtualpkg.d.wants - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/dcron.plist . - # crontab must be setuid for all users to work! chmod 4755 ${DESTDIR}/usr/bin/crontab } diff --git a/srcpkgs/libjpeg-turbo/files/libjpeg-turbo-devel.virtualpkgd b/srcpkgs/libjpeg-turbo/files/libjpeg-turbo-devel.virtualpkgd deleted file mode 100644 index 271fdf65db..0000000000 --- a/srcpkgs/libjpeg-turbo/files/libjpeg-turbo-devel.virtualpkgd +++ /dev/null @@ -1,10 +0,0 @@ - - - - - virtual-pkgver - jpeg-devel-8 - target-pkgpattern - libjpeg-turbo-devel>=0 - - diff --git a/srcpkgs/libjpeg-turbo/files/libjpeg-turbo-tools.virtualpkgd b/srcpkgs/libjpeg-turbo/files/libjpeg-turbo-tools.virtualpkgd deleted file mode 100644 index b68a7bfbcd..0000000000 --- a/srcpkgs/libjpeg-turbo/files/libjpeg-turbo-tools.virtualpkgd +++ /dev/null @@ -1,10 +0,0 @@ - - - - - virtual-pkgver - jpeg-tools-8 - target-pkgpattern - libjpeg-turbo-tools>=0 - - diff --git a/srcpkgs/libjpeg-turbo/files/libjpeg-turbo.virtualpkgd b/srcpkgs/libjpeg-turbo/files/libjpeg-turbo.virtualpkgd deleted file mode 100644 index 48bafacb44..0000000000 --- a/srcpkgs/libjpeg-turbo/files/libjpeg-turbo.virtualpkgd +++ /dev/null @@ -1,10 +0,0 @@ - - - - - virtual-pkgver - jpeg-8 - target-pkgpattern - libjpeg-turbo>=0 - - diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template index 2493881978..0a0440ab00 100644 --- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template +++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-devel.template @@ -11,15 +11,10 @@ Add_dependency run libjpeg-turbo provides="jpeg-devel-8" replaces="jpeg-devel>=0" -revision=3 +revision=4 do_install() { vmove usr/include usr vmove "usr/lib/*.a" usr/lib - vinstall ${FILESDIR}/${pkgname}.virtualpkgd \ - 644 etc/xbps/virtualpkg.d ${pkgname}.plist - vmkdir etc/xbps/virtualpkg.d.wants - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/${pkgname}.plist . } diff --git a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template index fb7a372e77..6b35eebcba 100644 --- a/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template +++ b/srcpkgs/libjpeg-turbo/libjpeg-turbo-tools.template @@ -11,15 +11,10 @@ Add_dependency run libjpeg-turbo ">=${version}" provides="jpeg-tools-8" replaces="jpeg-tools>=0" -revision=3 +revision=4 do_install() { vmove usr/bin usr vmove usr/share/man usr/share - vinstall ${FILESDIR}/${pkgname}.virtualpkgd \ - 644 etc/xbps/virtualpkg.d ${pkgname}.plist - vmkdir etc/xbps/virtualpkg.d.wants - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/${pkgname}.plist . } diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template index 796d9d68fe..a6b28fe7bc 100644 --- a/srcpkgs/libjpeg-turbo/template +++ b/srcpkgs/libjpeg-turbo/template @@ -1,7 +1,7 @@ # Template build file for 'libjpeg-turbo'. pkgname=libjpeg-turbo version=1.1.1 -revision=3 +revision=4 homepage="http://libjpeg-turbo.virtualgl.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" build_style=gnu-configure @@ -27,11 +27,6 @@ Add_dependency build nasm post_install() { vinstall jpegint.h 644 usr/include vinstall LICENSE.txt 644 usr/share/licenses/${pkgname} - vinstall ${FILESDIR}/${pkgname}.virtualpkgd \ - 644 etc/xbps/virtualpkg.d ${pkgname}.plist - vmkdir etc/xbps/virtualpkg.d.wants - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/${pkgname}.plist . rm -f ${DESTDIR}/usr/bin/jpegut rm -f ${DESTDIR}/usr/bin/jpgtest diff --git a/srcpkgs/rsyslog/files/rsyslog.virtualpkgd b/srcpkgs/rsyslog/files/rsyslog.virtualpkgd deleted file mode 100644 index 3ee0488e45..0000000000 --- a/srcpkgs/rsyslog/files/rsyslog.virtualpkgd +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - virtual-pkgver - syslog-daemon-0 - target-pkgpattern - rsyslog>=0 - - diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index b0c6952c54..c27fd0db66 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,7 +1,7 @@ # Template file for 'rsyslog' pkgname=rsyslog version=5.8.5 -revision=6 +revision=7 homepage="http://www.rsyslog.com" distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz" build_style=gnu-configure @@ -41,10 +41,4 @@ post_install() install -d ${DESTDIR}/usr/share/doc/rsyslog/html install -m644 ${wrksrc}/doc/*.{html,png} \ ${DESTDIR}/usr/share/doc/rsyslog/html - - vmkdir etc/xbps/virtualpkg.d.wants - vinstall ${FILESDIR}/${pkgname}.virtualpkgd \ - 644 etc/xbps/virtualpkg.d ${pkgname}.plist - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/${pkgname}.plist . } diff --git a/srcpkgs/vim-x11/files/vim-x11.virtualpkgd b/srcpkgs/vim-x11/files/vim-x11.virtualpkgd deleted file mode 100644 index 3a29105a1b..0000000000 --- a/srcpkgs/vim-x11/files/vim-x11.virtualpkgd +++ /dev/null @@ -1,10 +0,0 @@ - - - - - virtual-pkgver - vim-@@VERSION@@ - target-pkgpattern - @@PKGNAME@@>=@@VERSION@@ - - diff --git a/srcpkgs/vim-x11/template b/srcpkgs/vim-x11/template index d2217e28f4..1a079b34ca 100644 --- a/srcpkgs/vim-x11/template +++ b/srcpkgs/vim-x11/template @@ -6,6 +6,7 @@ . ${XBPS_SRCPKGDIR}/vim/template unset subpackages pkgname=vim-x11 +revision=1 configure_args="${configure_args} --enable-gui=no --with-x" short_desc="${short_desc} (x11)" long_desc="${long_desc} @@ -23,14 +24,6 @@ Add_dependency run libICE Add_dependency build pkg-config Add_dependency build libXt-devel -post_install() -{ - vmkdir etc/xbps/virtualpkg.d.wants - vinstall ${FILESDIR}/${pkgname}.virtualpkgd \ - 644 etc/xbps/virtualpkg.d ${pkgname}.plist - sed -i "s|@@PKGNAME@@|${pkgname}|;s|@@VERSION@@|${version}|" \ - ${DESTDIR}/etc/xbps/virtualpkg.d/${pkgname}.plist - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/${pkgname}.plist . +post_install() { rm -rf ${DESTDIR}/usr/share } diff --git a/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel-static.plist b/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel-static.plist deleted file mode 100644 index 96858f5c56..0000000000 --- a/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel-static.plist +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - virtual-pkgver - xbps-static-9999 - target-pkgpattern - xbps-devel-static>=0 - - diff --git a/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel.plist b/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel.plist deleted file mode 100644 index 3778450d35..0000000000 --- a/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel.plist +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - virtual-pkgver - xbps-9999 - target-pkgpattern - xbps-devel>=0 - - diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template index ad8751ba2d..0657d67659 100644 --- a/srcpkgs/xbps-devel/template +++ b/srcpkgs/xbps-devel/template @@ -41,11 +41,3 @@ do_fetch() { msg_normal " Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } - -post_install() { - vinstall ${FILESDIR}/virtualpkg.d/${pkgname}.plist \ - 644 etc/xbps/virtualpkg.d - vmkdir etc/xbps/virtualpkg.d.wants - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/${pkgname}.plist . -} diff --git a/srcpkgs/xbps-devel/xbps-devel-static.template b/srcpkgs/xbps-devel/xbps-devel-static.template index a92e2ae47b..d80619b47e 100644 --- a/srcpkgs/xbps-devel/xbps-devel-static.template +++ b/srcpkgs/xbps-devel/xbps-devel-static.template @@ -16,9 +16,4 @@ do_install() vmove usr/include usr vmove "sbin/*.static" sbin vmove "lib/*.a" usr/lib - vinstall ${FILESDIR}/virtualpkg.d/${pkgname}.plist \ - 644 etc/xbps/virtualpkg.d - vmkdir etc/xbps/virtualpkg.d.wants - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/${pkgname}.plist . } diff --git a/srcpkgs/xf86-video-ati-git-snapshot/files/xf86-video-ati-git-snapshot.virtualpkgd b/srcpkgs/xf86-video-ati-git-snapshot/files/xf86-video-ati-git-snapshot.virtualpkgd deleted file mode 100644 index 257eedd241..0000000000 --- a/srcpkgs/xf86-video-ati-git-snapshot/files/xf86-video-ati-git-snapshot.virtualpkgd +++ /dev/null @@ -1,10 +0,0 @@ - - - - - virtual-pkgver - @@PROVIDES@@ - target-pkgpattern - @@REPLACES@@ - - diff --git a/srcpkgs/xf86-video-ati-git-snapshot/template b/srcpkgs/xf86-video-ati-git-snapshot/template index dec72ba2b3..889c938e16 100644 --- a/srcpkgs/xf86-video-ati-git-snapshot/template +++ b/srcpkgs/xf86-video-ati-git-snapshot/template @@ -40,13 +40,3 @@ do_fetch() { pre_configure() { ./autogen.sh } - -post_install() { - vinstall ${FILESDIR}/${pkgname}.virtualpkgd \ - 644 etc/xbps/virtualpkg.d ${pkgname}.plist - sed -i "s|@@PROVIDES@@|${provides}|;s|@@REPLACES@@|${replaces}|" \ - ${DESTDIR}/etc/xbps/virtualpkg.d/${pkgname}.plist - vmkdir etc/xbps/virtualpkg.d.wants - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/${pkgname}.plist . -} diff --git a/srcpkgs/xfce4-notifyd/files/xfce4-notifyd.virtualpkgd b/srcpkgs/xfce4-notifyd/files/xfce4-notifyd.virtualpkgd deleted file mode 100644 index b27f132499..0000000000 --- a/srcpkgs/xfce4-notifyd/files/xfce4-notifyd.virtualpkgd +++ /dev/null @@ -1,10 +0,0 @@ - - - - - virtual-pkgver - notification-daemon-0.6 - target-pkgpattern - xfce4-notifyd>=0 - - diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template index db79b9c81a..a54eeb57f4 100644 --- a/srcpkgs/xfce4-notifyd/template +++ b/srcpkgs/xfce4-notifyd/template @@ -1,7 +1,7 @@ # Template file for 'xfce4-notifyd' pkgname=xfce4-notifyd version=0.2.1 -revision=3 +revision=4 distfiles="http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$version.tar.bz2" build_style=gnu-configure short_desc="Simple, visually-appealing notification daemon for Xfce" @@ -40,11 +40,3 @@ Add_dependency build gtk+-devel Add_dependency full hicolor-icon-theme Add_dependency full desktop-file-utils - -post_install() { - vinstall ${FILESDIR}/${pkgname}.virtualpkgd \ - 644 etc/xbps/virtualpkg.d ${pkgname}.plist - vmkdir etc/xbps/virtualpkg.d.wants - cd ${DESTDIR}/etc/xbps/virtualpkg.d.wants && \ - ln -sf ../virtualpkg.d/${pkgname}.plist . -}