diff options
author | jmmv <jmmv> | 2003-07-14 10:07:10 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2003-07-14 10:07:10 +0000 |
commit | aeaf96c30bae3f505fa9f4fd28acb89c8562eb60 (patch) | |
tree | a2304f563e215d0e114187c0d35e34a84616fe94 /misc/vfu/patches | |
parent | 5204220f6082af8b44d9978819be846c96429020 (diff) | |
download | pkgsrc-aeaf96c30bae3f505fa9f4fd28acb89c8562eb60.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/vfu/patches')
-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 |
4 files changed, 61 insertions, 4 deletions
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 |