summaryrefslogtreecommitdiff
path: root/misc/vfu/patches
diff options
context:
space:
mode:
authorjlam <jlam>2001-06-20 05:27:32 +0000
committerjlam <jlam>2001-06-20 05:27:32 +0000
commitfd00a32d81138def323d7249feaeb655a317116d (patch)
treeb6687f8671a2d3911714bf7f0ea980fa8df5227e /misc/vfu/patches
parentf4778e9713e9f31b03e6552189ead19638e6fab2 (diff)
downloadpkgsrc-fd00a32d81138def323d7249feaeb655a317116d.tar.gz
Convert to use buildlink.mk files for ncurses dependency and mark as
USE_BUILDLINK_ONLY. Add patches to remove explicit passing of -I/usr/include/ncurses to the compiler, and move the example configuration file to ${PREFIX}/share/examples/vfu. Add DEINSTALL/INSTALL scripts to handle copying the sample config file to the config directory at install time and removing it at deinstall time.
Diffstat (limited to 'misc/vfu/patches')
-rw-r--r--misc/vfu/patches/patch-aa20
-rw-r--r--misc/vfu/patches/patch-ab15
-rw-r--r--misc/vfu/patches/patch-ac15
3 files changed, 45 insertions, 5 deletions
diff --git a/misc/vfu/patches/patch-aa b/misc/vfu/patches/patch-aa
index adf59635f90..6580af074c9 100644
--- a/misc/vfu/patches/patch-aa
+++ b/misc/vfu/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2000/06/15 21:08:56 hubertf Exp $
+$NetBSD: patch-aa,v 1.8 2001/06/20 05:27:33 jlam Exp $
---- build.netbsd.orig Tue May 23 23:57:08 2000
-+++ build.netbsd Thu Jun 15 23:06:18 2000
+--- build.netbsd.orig Tue May 23 17:57:08 2000
++++ build.netbsd
@@ -4,7 +4,7 @@
echo Compiling VSLIB...
cd vslib
-make CCDEF="-I${LOCALBASE}/include" LDDEF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib"
-+make CCDEF="-I${LOCALBASE}/include" LDDEF="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
++make CCDEF="${CFLAGS}" LDDEF="${LDFLAGS}"
if [ -e libvslib.a ]; then
echo VSLIB compiled ok.
else
@@ -16,7 +16,17 @@ $NetBSD: patch-aa,v 1.7 2000/06/15 21:08:56 hubertf Exp $
echo Compiling VFU...
cd vfu
-make CCDEF="-I${LOCALBASE}/include -DFILENAME_CONF_GLOBAL0=\"${PREFIX}/etc/\" -DFILENAME_CONF_GLOBAL1=\"${PREFIX}/\" " LDDEF="-L${LOCALBASE}/lib"
-+make CCDEF="-I${LOCALBASE}/include -DFILENAME_CONF_GLOBAL0=\\\"${PREFIX}/etc/\\\" -DFILENAME_CONF_GLOBAL1=\\\"${PREFIX}/\\\" " LDDEF="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib"
++make CCDEF="${CFLAGS} -DFILENAME_CONF_GLOBAL0=\\\"${PREFIX}/etc/\\\" -DFILENAME_CONF_GLOBAL1=\\\"${PREFIX}/\\\" " LDDEF="${LDFLAGS}"
if [ -e vfu ]; then
echo VFU compiled ok.
else
+@@ -26,8 +26,8 @@
+
+ echo Compiling ftparc...
+ cd ftparc
+-make CCDEF="-I${LOCALBASE}/include -D__unix__" LDDEF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib"
++make CCDEF="${CFLAGS} -D__unix__" LDDEF="${LDFLAGS}"
+ if [ -e ftparc ]; then
+ echo ftparc compiled ok.
+ else
+ echo ftparc compilation failed...
diff --git a/misc/vfu/patches/patch-ab b/misc/vfu/patches/patch-ab
new file mode 100644
index 00000000000..e54cab2fddc
--- /dev/null
+++ b/misc/vfu/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.7 2001/06/20 05:27:33 jlam Exp $
+
+--- vfu/makefile.orig Fri May 19 03:58:17 2000
++++ vfu/makefile
+@@ -17,8 +17,8 @@
+ CC_0 = g++
+ LD_0 = g++
+ AR_0 = ar rvs
+-CFLAGS_0 = -I../vslib -I/usr/include/ncurses -O2 $(CCDEF)
+-CCFLAGS_0 = -I../vslib -I/usr/include/ncurses -O2 $(CCDEF)
++CFLAGS_0 = -I../vslib -O2 $(CCDEF)
++CCFLAGS_0 = -I../vslib -O2 $(CCDEF)
+ LDFLAGS_0 = -L../vslib -lvslib -lvscon -lncurses $(LDDEF)
+ ARFLAGS_0 =
+ TARGET_0 = vfu
diff --git a/misc/vfu/patches/patch-ac b/misc/vfu/patches/patch-ac
new file mode 100644
index 00000000000..17304b34e92
--- /dev/null
+++ b/misc/vfu/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.6 2001/06/20 05:27:33 jlam Exp $
+
+--- vslib/makefile.orig Sat Apr 15 03:20:10 2000
++++ vslib/makefile
+@@ -96,8 +96,8 @@
+ CC_1 = g++
+ LD_1 = g++
+ AR_1 = ar rvs
+-CFLAGS_1 = -I. -I/usr/include/ncurses -O2 $(CCDEF)
+-CCFLAGS_1 = -I. -I/usr/include/ncurses -O2 $(CCDEF)
++CFLAGS_1 = -I. -O2 $(CCDEF)
++CCFLAGS_1 = -I. -O2 $(CCDEF)
+ LDFLAGS_1 = $(LDDEF)
+ ARFLAGS_1 =
+ TARGET_1 = libvscon.a