diff --git a/srcpkgs/ISOEnts/template b/srcpkgs/ISOEnts/template index 8501d7df9a..f0517d6a26 100644 --- a/srcpkgs/ISOEnts/template +++ b/srcpkgs/ISOEnts/template @@ -36,21 +36,10 @@ Add_dependency full xmlcatmgr Add_dependency build bsdtar export sgml_entries="CATALOG /usr/share/sgml/iso8879/catalog --" -do_install() -{ +do_install() { local dir=${DESTDIR}/usr/share/sgml/iso8879 install -d ${dir} bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}.zip -C ${dir} install -m644 ${FILESDIR}/catalog ${dir} } - -post_stow() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run post-install -} - -pre_remove() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run pre-remove -} diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index b09aaf737c..7316091378 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -36,10 +36,3 @@ do_install() { find . -name '*.crt' | sort | cut -b3- \ > ${DESTDIR}/etc/ca-certificates.conf } - -post_stow() { - [ ! -d etc/ca-certificates/update.d ] && \ - install -d ${XBPS_MASTERDIR}/etc/ca-certificates/update.d - mkdir -p ${XBPS_MASTERDIR}/etc/ssl/certs - ${DESTDIR}/usr/sbin/update-ca-certificates --fresh -} diff --git a/srcpkgs/docbook-dsssl/template b/srcpkgs/docbook-dsssl/template index b911ab48d5..5ccc8dfea9 100644 --- a/srcpkgs/docbook-dsssl/template +++ b/srcpkgs/docbook-dsssl/template @@ -25,22 +25,8 @@ Add_dependency full docbook-xml ">=4.2" export sgml_entries="CATALOG /usr/share/sgml/docbook/dsssl/modular/catalog --" -do_install() -{ +do_install() { rm -rf ${wrksrc}/docsrc install -d ${DESTDIR}/usr/share/sgml/docbook/dsssl/modular cp -rp ${wrksrc}/* ${DESTDIR}/usr/share/sgml/docbook/dsssl/modular } - -post_stow() -{ - # - # Run the trigger to register its XML catalog entries. - # - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run post-install -} - -pre_remove() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run pre-remove -} diff --git a/srcpkgs/docbook-xml/template b/srcpkgs/docbook-xml/template index 5bf00bf8f0..7ca60226f2 100644 --- a/srcpkgs/docbook-xml/template +++ b/srcpkgs/docbook-xml/template @@ -43,8 +43,7 @@ nextCatalog /usr/share/xml/docbook/4.4/catalog -- nextCatalog /usr/share/xml/docbook/4.5/catalog -- nextCatalog /usr/share/xml/docbook/4.2/catalog-4.1.2 --" -do_install() -{ +do_install() { local versions="4.2 4.3 4.4 4.5" local ver dir @@ -59,15 +58,3 @@ do_install() sed -e 's|V4.2|V4.1.2|g' < ${dir}/catalog > ${dir}/catalog-4.1.2 chmod 644 ${dir}/catalog-4.1.2 } - -post_stow() -{ - # Register XML catalogs. - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run post-install -} - -pre_remove() -{ - # Unregister XML catalogs. - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run pre-remove -} diff --git a/srcpkgs/docbook-xsl/template b/srcpkgs/docbook-xsl/template index d2a3a5eee0..a666dead97 100644 --- a/srcpkgs/docbook-xsl/template +++ b/srcpkgs/docbook-xsl/template @@ -24,8 +24,7 @@ Add_dependency full docbook-xml ">=4.2" export xml_entries="nextCatalog /usr/share/xsl/docbook/catalog.xml --" -do_install() -{ +do_install() { local xslmods="common eclipse epub fo highlighting html htmlhelp \ images javahelp lib manpages params profiling \ roundtrip slides website xhtml xhtml-1_1" @@ -39,16 +38,3 @@ do_install() cp -a ${dir}/* ${DESTDIR}/usr/share/xsl/docbook/${dir}/ done } - -post_stow() -{ - # - # Run the trigger to register its XML catalog entries. - # - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run post-install -} - -pre_remove() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run pre-remove -} diff --git a/srcpkgs/docbook/template b/srcpkgs/docbook/template index 8b32d2098e..3e076b71b0 100644 --- a/srcpkgs/docbook/template +++ b/srcpkgs/docbook/template @@ -51,8 +51,7 @@ CATALOG /usr/share/sgml/docbook/4.3/catalog -- CATALOG /usr/share/sgml/docbook/4.4/catalog -- CATALOG /usr/share/sgml/docbook/4.5/catalog --" -do_install() -{ +do_install() { local ver dir for ver in 4.2 4.3 4.4 4.5; do @@ -70,15 +69,3 @@ do_install() install -m644 ${FILESDIR}/catalog${vernodot} ${dir}/catalog done } - -post_stow() -{ - # Register SGML catalogs. - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run post-install -} - -pre_remove() -{ - # Unregister SGML catalogs. - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run pre-remove -} diff --git a/srcpkgs/docbook2x/template b/srcpkgs/docbook2x/template index 696e5248b9..2c7a461b30 100644 --- a/srcpkgs/docbook2x/template +++ b/srcpkgs/docbook2x/template @@ -28,17 +28,6 @@ Add_dependency full docbook-xsl Add_dependency full perl-XML-SAX Add_dependency full xmlcatmgr -post_install() -{ +post_install() { sed -i -e 's|${prefix}|/usr|g' ${DESTDIR}/usr/bin/* } - -post_stow() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run post-install -} - -pre_remove() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run pre-remove -} diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index f096bf028b..1a81b4b433 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -47,8 +47,3 @@ post_install() { echo "/usr/lib/gnome-bluetooth" > \ ${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf } - -post_stow() { - msg_normal "Updating ld.so(8) cache for ${pkgname}...\n" - ldconfig -f /etc/ld.so.conf.d/${pkgname}.conf -} diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template index 30c65d2ca1..925074d919 100644 --- a/srcpkgs/kernel-snapshot/template +++ b/srcpkgs/kernel-snapshot/template @@ -32,7 +32,6 @@ else _kernver="${_kmajor}.${_kminor}-${_kpatch}" fi kernel_hooks_version="${_kernver}" -stow_copy_files="/lib/modules/${_kernver}/build" # These files could be modified when an external module is built. mutable_files=" diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template index 5fc5fcaccd..3a9a92fe0a 100644 --- a/srcpkgs/kernel/template +++ b/srcpkgs/kernel/template @@ -35,7 +35,6 @@ fi if [ -n "${revision}" ]; then _kernver="${_kernver}_${revision}" fi -stow_copy_files="/lib/modules/${_kernver}/build" kernel_hooks_version="${_kernver}" # These files could be modified when an external module is built. diff --git a/srcpkgs/openjade/template b/srcpkgs/openjade/template index a42b90f3bc..ed95bc1c2e 100644 --- a/srcpkgs/openjade/template +++ b/srcpkgs/openjade/template @@ -25,8 +25,7 @@ Add_dependency build perl ">=0" Add_dependency build gettext Add_dependency build opensp-devel -post_install() -{ +post_install() { cd ${DESTDIR}/usr/bin && ln -s openjade jade install -d ${DESTDIR}/usr/share/licenses/${pkgname} @@ -39,13 +38,3 @@ post_install() ${DESTDIR}/usr/share/licenses/${pkgname} cp -a ${wrksrc}/jadedoc/images ${DESTDIR}/usr/share/sgml/${pkgname}/jadedoc } - -post_stow() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run post-install -} - -pre_remove() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run pre-remove -} diff --git a/srcpkgs/opensp/template b/srcpkgs/opensp/template index 7fd2bd54d4..a86a3454c0 100644 --- a/srcpkgs/opensp/template +++ b/srcpkgs/opensp/template @@ -27,18 +27,7 @@ Add_dependency build gettext Add_dependency build xmlto Add_dependency full xmlcatmgr -post_install() -{ +post_install() { # Some programs expect 'nsgmls'... make it a symlink. cd ${DESTDIR}/usr/bin && ln -s onsgmls nsgmls } - -post_stow() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run post-install -} - -pre_remove() -{ - cd ${XBPS_MASTERDIR} && ${XBPS_TRIGGERSDIR}/xml-catalog run pre-remove -} diff --git a/srcpkgs/perl-XML-SAX/template b/srcpkgs/perl-XML-SAX/template index 20343d363c..ff2538e7bd 100644 --- a/srcpkgs/perl-XML-SAX/template +++ b/srcpkgs/perl-XML-SAX/template @@ -19,20 +19,3 @@ noarch=yes Add_dependency full perl Add_dependency full perl-XML-NamespaceSupport Add_dependency full perl-XML-SAX-Base - -post_stow() -{ - # Register the SAX parsers into the registry. - LC_ALL=C perl -MXML::SAX -e \ - "XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()" \ - 2>&1 >/dev/null - [ $? -eq 0 ] && msg_normal "Added parser to XML::SAX registry.\n" -} - -pre_remove() -{ - env LC_ALL=C perl -MXML::SAX -e \ - "XML::SAX->remove_parser(q(XML::SAX::PurePerl))->save_parsers()" \ - 2>&1 >/dev/null - [ $? -eq 0 ] && msg_normal "Removed parser from XML::SAX registry.\n" -} diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index 3f759c49bb..ca098afb01 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -19,7 +19,6 @@ long_desc=" that has earned it a strong reputation for reliability, data integrity, and correctness." -stow_copy=yes subpackages="${pkgname}-doc ${pkgname}-libs ${pkgname}-libs-devel" subpackages="${subpackages} ${pkgname}-plperl ${pkgname}-plpython" subpackages="${subpackages} ${pkgname}-pltcl ${pkgname}-client" diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 45a74b4f8a..cad52e6fda 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -22,7 +22,6 @@ long_desc=" C++. On most systems such modules may be dynamically loaded. Python is also adaptable as an extension language for existing applications." -stow_copy=yes pycompile_dirs="usr/lib/python2.7" subpackages="$pkgname-devel" diff --git a/srcpkgs/xmlcatmgr/template b/srcpkgs/xmlcatmgr/template index bb5835a9eb..c8b31bb149 100644 --- a/srcpkgs/xmlcatmgr/template +++ b/srcpkgs/xmlcatmgr/template @@ -18,14 +18,15 @@ long_desc=" local files or URIs. This allows you to tell the parser where to look for entities without having to modify the original document source." -conf_files="/etc/sgml/catalog /etc/xml/catalog - /usr/share/sgml/catalog /usr/share/xml/catalog" -stow_copy_files="$conf_files" +conf_files=" +/etc/sgml/catalog +/etc/xml/catalog +/usr/share/sgml/catalog +/usr/share/xml/catalog" Add_dependency full glibc -pre_install() -{ +pre_install() { # Create XML and SGML catalogs once built. echo "=> Creating SGML catalogs..." $wrksrc/xmlcatmgr -sc $wrksrc/catalog.etc.sgml create @@ -39,8 +40,7 @@ pre_install() /usr/share/xml/catalog } -post_install() -{ +post_install() { # Install the XML/SGML catalog files. echo "=> Installing XML/SGML catalogs." chmod 644 $wrksrc/catalog.*