diff options
author | jmmv <jmmv@pkgsrc.org> | 2003-07-14 10:07:10 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2003-07-14 10:07:10 +0000 |
commit | d03495a466aa0735cefd058092ad808b475dd5f2 (patch) | |
tree | a2304f563e215d0e114187c0d35e34a84616fe94 /misc | |
parent | b5144ee56e949592461f724cc44e1ef2ba6506ab (diff) | |
download | pkgsrc-d03495a466aa0735cefd058092ad808b475dd5f2.tar.gz |
Convert this package to the bsd.pkg.install.mk framework. Fix handling of the
system wide configuration file in PKG_SYSCONFDIR.
Use MASTER_SITE_BACKUP, as the distfile is no longer hosted at sunsite.
Bump PKGREVISION to 1.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/vfu/DEINSTALL | 66 | ||||
-rw-r--r-- | misc/vfu/INSTALL | 56 | ||||
-rw-r--r-- | misc/vfu/Makefile | 23 | ||||
-rw-r--r-- | misc/vfu/PLIST | 5 | ||||
-rw-r--r-- | misc/vfu/distinfo | 7 | ||||
-rw-r--r-- | misc/vfu/patches/patch-aa | 7 | ||||
-rw-r--r-- | misc/vfu/patches/patch-ab | 21 | ||||
-rw-r--r-- | misc/vfu/patches/patch-ac | 24 | ||||
-rw-r--r-- | misc/vfu/patches/patch-ad | 13 |
9 files changed, 74 insertions, 148 deletions
diff --git a/misc/vfu/DEINSTALL b/misc/vfu/DEINSTALL deleted file mode 100644 index b98573dd00e..00000000000 --- a/misc/vfu/DEINSTALL +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:29:50 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/vfu -CONFDIR=${PKG_PREFIX}/etc -CONFFILES="vfurc" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file} - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - if [ -n "${modified_files}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove the -following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/misc/vfu/INSTALL b/misc/vfu/INSTALL deleted file mode 100644 index f9eb6329b58..00000000000 --- a/misc/vfu/INSTALL +++ /dev/null @@ -1,56 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 01:29:51 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/vfu -CONFDIR=${PKG_PREFIX}/etc -CONFFILES="vfurc" - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - echo "Installing configuration files:" - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file} - if [ -f ${FILE} ] - then - echo " ${FILE} already exists" - else - echo " ${FILE}" - ${CP} ${SAMPLEFILE} ${FILE} - ${CHMOD} 644 ${FILE} - fi - done - ${CAT} << EOF - -=========================================================================== -Some files you might need to customize include the following: - -EOF - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - echo " ${FILE}" - done - ${CAT} << EOF -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile index bc046afb2eb..d76719b6eba 100644 --- a/misc/vfu/Makefile +++ b/misc/vfu/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.29 2003/07/13 13:52:46 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2003/07/14 10:07:10 jmmv Exp $ # DISTNAME= vfu-3.04 PKGREVISION= 1 CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/file/managers/} \ - http://www.biscom.net/~cade/vfu/ +MASTER_SITES= ${MASTER_SITE_BACKUP} EXTRACT_SUFX= .src.tar.gz MAINTAINER= hubertf@netbsd.org @@ -13,28 +12,19 @@ HOMEPAGE= http://www.biscom.net/~cade/away/vfu/ COMMENT= Small, handy, easy-to-use file manager USE_BUILDLINK2= # defined +USE_PKGINSTALL= YES USE_NCURSES= # qiflush() DOCDIR= ${PREFIX}/share/doc/vfu EGDIR= ${PREFIX}/share/examples/vfu -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL +CONF_FILES= ${EGDIR}/vfu.conf ${PKG_SYSCONFDIR}/vfu.conf -FILES_SUBST= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +MAKE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" do-build: cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SH} build.netbsd -pre-install: - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} - do-install: cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${SH} install @@ -44,8 +34,7 @@ post-install: ${INSTALL_DATA} COPYING INSTALL CONFIG FAQ HISTORY NOTES README \ README.DOS THANKS.TO TODO XWINDOW.NOTES ${DOCDIR} cd ${WRKSRC}; \ - ${INSTALL_DATA} ${WRKSRC}/vfu.conf ${EGDIR}/vfurc - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL + ${INSTALL_DATA} ${WRKSRC}/vfu.conf ${EGDIR}/vfu.conf .include "../../devel/ncurses/buildlink2.mk" .include "../../lang/perl5/buildlink2.mk" diff --git a/misc/vfu/PLIST b/misc/vfu/PLIST index e164951c1c1..f6b4e081287 100644 --- a/misc/vfu/PLIST +++ b/misc/vfu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/05/25 15:04:04 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/07/14 10:07:10 jmmv Exp $ bin/ftparc bin/rx_auto bin/rx_deb @@ -6,7 +6,6 @@ bin/rx_ftp bin/rx_tar bin/rx_zip bin/vfu -etc/vfu.conf man/man1/vfu.1 share/doc/vfu/CONFIG share/doc/vfu/COPYING @@ -19,6 +18,6 @@ share/doc/vfu/README.DOS share/doc/vfu/THANKS.TO share/doc/vfu/TODO share/doc/vfu/XWINDOW.NOTES -share/examples/vfu/vfurc +share/examples/vfu/vfu.conf @dirrm share/examples/vfu @dirrm share/doc/vfu diff --git a/misc/vfu/distinfo b/misc/vfu/distinfo index 0c5f8ca1b08..f7dd3762f64 100644 --- a/misc/vfu/distinfo +++ b/misc/vfu/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.4 2002/05/25 15:04:04 hubertf Exp $ +$NetBSD: distinfo,v 1.5 2003/07/14 10:07:11 jmmv Exp $ SHA1 (vfu-3.04.src.tar.gz) = 75e87d102114dc08136420e7927e687f72a52dfd Size (vfu-3.04.src.tar.gz) = 187519 bytes -SHA1 (patch-aa) = 379405096d8e86fb52493c6a1b7bdc5866c10822 +SHA1 (patch-aa) = ce204485f8c781a6ffeb25e4de4de21cdf33b473 +SHA1 (patch-ab) = bb935cd9127479517daf36480e2637cd5447b978 +SHA1 (patch-ac) = 0477572760ca2497c1464e57c3a09c571625b266 +SHA1 (patch-ad) = 1410335b46d58ad9ec973b5a6b9ebe52091c0012 diff --git a/misc/vfu/patches/patch-aa b/misc/vfu/patches/patch-aa index 6abc4af79b2..4adb47bda75 100644 --- a/misc/vfu/patches/patch-aa +++ b/misc/vfu/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2002/05/25 15:04:04 hubertf Exp $ +$NetBSD: patch-aa,v 1.10 2003/07/14 10:07:11 jmmv Exp $ ---- install.orig Sun Oct 28 15:12:15 2001 +--- install.orig 2001-10-28 15:12:15.000000000 +0100 +++ install -@@ -16,14 +16,14 @@ +@@ -16,14 +16,13 @@ if [ ! -e rx/rx_auto ]; then exit; fi @@ -17,7 +17,6 @@ $NetBSD: patch-aa,v 1.9 2002/05/25 15:04:04 hubertf Exp $ -cd /usr/local/bin +cp vfu/vfu ftparc/ftparc rx/rx_* ${PREFIX}/bin +cp vfu.1 ${PREFIX}/man/man1 -+cp vfu.conf ${PREFIX}/etc +cd ${PREFIX}/bin chmod 755 vfu ftparc rx_* diff --git a/misc/vfu/patches/patch-ab b/misc/vfu/patches/patch-ab new file mode 100644 index 00000000000..693dacd60bc --- /dev/null +++ b/misc/vfu/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.9 2003/07/14 10:07:11 jmmv Exp $ + +--- vfu/vfusetup.h.orig 2002-04-26 09:24:21.000000000 +0200 ++++ vfu/vfusetup.h +@@ -41,15 +41,7 @@ + #endif + + #ifndef FILENAME_CONF_GLOBAL0 +-#define FILENAME_CONF_GLOBAL0 "/etc/" FILENAME_CONF +-#endif +- +-#ifndef FILENAME_CONF_GLOBAL1 +-#define FILENAME_CONF_GLOBAL1 "/usr/local/etc/" FILENAME_CONF +-#endif +- +-#ifndef FILENAME_CONF_GLOBAL2 +-#define FILENAME_CONF_GLOBAL2 "/usr/local/" FILENAME_CONF ++#define FILENAME_CONF_GLOBAL0 PKG_SYSCONFDIR "/" FILENAME_CONF + #endif + + #define RX_TEMP_LIST "RX_TEMP_LIST" diff --git a/misc/vfu/patches/patch-ac b/misc/vfu/patches/patch-ac new file mode 100644 index 00000000000..65a0023ae32 --- /dev/null +++ b/misc/vfu/patches/patch-ac @@ -0,0 +1,24 @@ +$NetBSD: patch-ac,v 1.8 2003/07/14 10:07:12 jmmv Exp $ + +--- vfu/vfu.cpp.orig 2002-05-24 18:55:36.000000000 +0200 ++++ vfu/vfu.cpp +@@ -485,8 +485,6 @@ void vfu_help() + mb.push( " 1. $HOME/$RC_PREFIX/vfu/vfu.conf"); + mb.push( " 2. $HOME/.vfu/vfu.conf"); + mb.push( " 3. " FILENAME_CONF_GLOBAL0 ); +- mb.push( " 4. " FILENAME_CONF_GLOBAL1 ); +- mb.push( " 5. " FILENAME_CONF_GLOBAL2 ); + mb.push( "" ); + vfu_menu_box( 1, 4, "VFU Help ( PageUp/PageDown to scroll )" ); + mb.zap(); +@@ -604,10 +602,6 @@ void vfu_init() + { /* cannot find local/user conf file, try globals */ + if ( access( FILENAME_CONF_GLOBAL0, R_OK ) == 0 ) + filename_conf = FILENAME_CONF_GLOBAL0; +- if ( access( FILENAME_CONF_GLOBAL1, R_OK ) == 0 ) +- filename_conf = FILENAME_CONF_GLOBAL1; +- if ( access( FILENAME_CONF_GLOBAL2, R_OK ) == 0 ) +- filename_conf = FILENAME_CONF_GLOBAL2; + /* if we get here then no readable conf file found */ + } + diff --git a/misc/vfu/patches/patch-ad b/misc/vfu/patches/patch-ad new file mode 100644 index 00000000000..700a08ae296 --- /dev/null +++ b/misc/vfu/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.7 2003/07/14 10:07:12 jmmv Exp $ + +--- build.netbsd.orig 2001-10-28 15:12:15.000000000 +0100 ++++ build.netbsd +@@ -15,7 +15,7 @@ cd .. + + echo "Compiling VFU..." + cd vfu +-make CCDEF="-I${LOCALBASE}/include -DFILENAME_CONF_GLOBAL0=\\\"${PREFIX}/etc/\\\" -DFILENAME_CONF_GLOBAL1=\\\"${PREFIX}/\\\" " LDDEF="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib" ++make CCDEF="-I${LOCALBASE}/include -DPKG_SYSCONFDIR=\\\"${PKG_SYSCONFDIR}\\\"" LDDEF="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib" + if [ -e vfu ]; then + echo "VFU compiled ok." + else |