summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-06-07 15:20:30 +0000
committerjmmv <jmmv>2003-06-07 15:20:30 +0000
commit8d1381ce10ee02317b32ee37c28dd65655cc6b9a (patch)
tree124f4985e6389b66ed57cf803c89d5f0117d3d97
parente13d3b76090d105b9874b7bd3d0dfa799a46739a (diff)
downloadpkgsrc-8d1381ce10ee02317b32ee37c28dd65655cc6b9a.tar.gz
Do not hardcode /usr/pkg as prefix in patches.
-rw-r--r--ham/dpbox/Makefile4
-rw-r--r--ham/dpbox/distinfo4
-rw-r--r--ham/dpbox/patches/patch-aa18
3 files changed, 14 insertions, 12 deletions
diff --git a/ham/dpbox/Makefile b/ham/dpbox/Makefile
index 52d77e754c3..27c03581eba 100644
--- a/ham/dpbox/Makefile
+++ b/ham/dpbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:13:51 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/07 15:20:30 jmmv Exp $
#
DISTNAME= dpbox-60000
@@ -14,6 +14,8 @@ COMMENT= Multi-Protocol Amateur Packet Radio BBS
USE_GMAKE= yes
MAKEFILE= Makefile.netbsd
+MAKE_ENV+= prefix="${PREFIX}"
+
.include "../../mk/bsd.prefs.mk"
DPBOX_CONF_DIR= ${PREFIX}/share/dpbox/conf
diff --git a/ham/dpbox/distinfo b/ham/dpbox/distinfo
index 8ba78c7cc31..fc3c23d135b 100644
--- a/ham/dpbox/distinfo
+++ b/ham/dpbox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/02/05 09:58:04 agc Exp $
+$NetBSD: distinfo,v 1.4 2003/06/07 15:20:31 jmmv Exp $
SHA1 (dpbox-60000.tar.gz) = 73a55785f499324f57736c7fb3cc0bd1001facd3
Size (dpbox-60000.tar.gz) = 957010 bytes
-SHA1 (patch-aa) = d7fd76585c7a9c012984e8a273b61a52cadb9534
+SHA1 (patch-aa) = 8235aa600edffd952c1d932c0ee8011ba0896d08
SHA1 (patch-ab) = abeee7b86844c8937792ef09a938caf232574fb3
SHA1 (patch-ac) = faa4e5b32a31283e0ed7ed9730c026ccd5efffb4
SHA1 (patch-ad) = 589a69328b5959f81b86739a6e3c32f6d1d71ffe
diff --git a/ham/dpbox/patches/patch-aa b/ham/dpbox/patches/patch-aa
index 7b6dc74e229..19da813167f 100644
--- a/ham/dpbox/patches/patch-aa
+++ b/ham/dpbox/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2000/05/21 13:40:31 wulf Exp $
+$NetBSD: patch-aa,v 1.3 2003/06/07 15:20:31 jmmv Exp $
---- Makefile.netbsd.orig Thu Apr 27 22:18:57 2000
-+++ Makefile.netbsd Sun May 21 22:50:24 2000
+--- Makefile.netbsd.orig 2000-04-27 14:48:57.000000000 +0200
++++ Makefile.netbsd
@@ -1,9 +1,9 @@
###############################################################################
# #
@@ -15,14 +15,14 @@ $NetBSD: patch-aa,v 1.2 2000/05/21 13:40:31 wulf Exp $
# Author : Berndt Josef Wulf, VK5ABN #
# #
###############################################################################
-@@ -19,11 +19,13 @@
+@@ -19,11 +19,12 @@ INSTALL_DATA = ${INSTALL} -m 444
INSTALL_CONF = ${INSTALL} -m 440
MKDIR = mkdir -p
LN = ln -sf
-
+-prefix = /usr/pkg
+CHMOD = /bin/chmod
+SED = /usr/bin/sed
- prefix = /usr/pkg
bindir = $(prefix)/bin
sbindir = $(prefix)/sbin
confdir = $(prefix)/share/dpbox/conf
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.2 2000/05/21 13:40:31 wulf Exp $
docdir = $(prefix)/share/doc/dpbox
landir = $(prefix)/share/dpbox/language
spooldir = /var/spool/dpbox
-@@ -100,7 +102,8 @@
+@@ -100,7 +101,8 @@ install: all
$(INSTALL_PROGRAM) dpputlinks $(bindir)
$(INSTALL_PROGRAM) dpcodeconv $(bindir)
$(INSTALL_PROGRAM) dpmybbs $(bindir)
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.2 2000/05/21 13:40:31 wulf Exp $
$(MKDIR) $(docdir)
$(INSTALL_DATA) ../document/* $(docdir)
-@@ -148,6 +151,9 @@
+@@ -148,6 +150,9 @@ install: all
echo "* and manually adjust the configuration files where *"; \
echo "* necessary. *"; \
echo "* *"; \
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.2 2000/05/21 13:40:31 wulf Exp $
echo "***********************************************************"; \
else \
$(MKDIR) $(confdir); \
-@@ -158,24 +164,45 @@
+@@ -158,24 +163,45 @@ install: all
$(INSTALL_CONF) ../sf/* $(confdir)/sf; \
fi
@@ -114,7 +114,7 @@ $NetBSD: patch-aa,v 1.2 2000/05/21 13:40:31 wulf Exp $
clean:
$(RM) *.o *~ .*~ *.orig *.bak *.s *.core
-@@ -193,4 +220,3 @@
+@@ -193,4 +219,3 @@ dep:
ifeq (.depend,$(wildcard .depend))
include .depend
endif