Add DESTDIR support.

5 files changed, 22 insertions, 20 deletions

diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index cc95d036813..1a7bdf87d4e 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/03/19 13:19:01 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2008/06/20 01:09:31 joerg Exp $
 #
 
 DISTNAME=		gopher_3.0.11
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		gopher://quux.org/1/devel/gopher/
 COMMENT=		Distributed document delivery client
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/gopher
 PKG_SYSCONFSUBDIR?=	${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/gopher
diff --git a/net/gopher/distinfo b/net/gopher/distinfo
index 762d7ea95c7..09841c80935 100644
--- a/net/gopher/distinfo
+++ b/net/gopher/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.7 2006/03/22 21:22:09 joerg Exp $
+$NetBSD: distinfo,v 1.8 2008/06/20 01:09:31 joerg Exp $
 
 SHA1 (gopher_3.0.11.tar.gz) = 7f64d5fcfa8b92967f94276b1697fda127624f98
 RMD160 (gopher_3.0.11.tar.gz) = 197ee4263612901191e9c964a749586826e350c2
 Size (gopher_3.0.11.tar.gz) = 318250 bytes
 SHA1 (patch-aa) = 650c84593fb2c8b2fe7673f222f8409e3324f79d
-SHA1 (patch-ab) = 436aeab07e3c4d24e06fbe58b83182b330b7c0c4
-SHA1 (patch-ac) = 6fe32b527205649fb4d45618643ccd0815c55724
-SHA1 (patch-ad) = 84a286204f59828d1a70f8b7152b37b2d3ff5593
+SHA1 (patch-ab) = 315c4fe9f063d25ba8d899832594b6209c2f4901
+SHA1 (patch-ac) = 679594c9c5e1845aa7c516793ae376ec9e0649cf
+SHA1 (patch-ad) = cb2ca70b7bf01304c21bc29607cd2ec6ef51686a
 SHA1 (patch-ae) = 56d3761699d455e73f8605e09cd1359fe11e4690
 SHA1 (patch-af) = 54b178e8099da5072b27cc82dc262fc78c4741f1
 SHA1 (patch-ag) = d1842e48272d401ae268cc3d54987210f3dfc845
diff --git a/net/gopher/patches/patch-ab b/net/gopher/patches/patch-ab
index d932e7604c3..b3c7852c420 100644
--- a/net/gopher/patches/patch-ab
+++ b/net/gopher/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2005/08/05 12:14:51 salo Exp $
+$NetBSD: patch-ab,v 1.2 2008/06/20 01:09:31 joerg Exp $
 
 --- gopher/Makefile.in.orig	2005-07-20 17:28:52.000000000 +0200
 +++ gopher/Makefile.in	2005-08-05 14:01:36.000000000 +0200
@@ -14,12 +14,12 @@ $NetBSD: patch-ab,v 1.1 2005/08/05 12:14:51 salo Exp $
 -	@INSTALL@ gopher.rc $(CLIENTLIB)
 -	@INSTALL@ gopherremote.rc $(CLIENTLIB)
 -	@INSTALL@ gopher.hlp $(CLIENTLIB)
-+	$(BSD_INSTALL_PROGRAM_DIR) $(CLIENTDIR)
-+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(CLIENTDIR)/
-+	$(BSD_INSTALL_DATA_DIR) $(EGDIR)/
-+	$(BSD_INSTALL_DATA) gopher.rc $(EGDIR)/
-+	$(BSD_INSTALL_DATA) gopherremote.rc $(EGDIR)/
-+	$(BSD_INSTALL_DATA) gopher.hlp $(EGDIR)/
++	$(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(CLIENTDIR)
++	$(BSD_INSTALL_PROGRAM) $(TARGET) ${DESTDIR}$(CLIENTDIR)/
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(EGDIR)/
++	$(BSD_INSTALL_DATA) gopher.rc ${DESTDIR}$(EGDIR)/
++	$(BSD_INSTALL_DATA) gopherremote.rc ${DESTDIR}$(EGDIR)/
++	$(BSD_INSTALL_DATA) gopher.hlp ${DESTDIR}$(EGDIR)/
  
  clean:
  	-rm -f $(TARGET) $(OBJS) *.out *~ core
diff --git a/net/gopher/patches/patch-ac b/net/gopher/patches/patch-ac
index a21b366e58f..9ced013c8e0 100644
--- a/net/gopher/patches/patch-ac
+++ b/net/gopher/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2005/08/05 12:14:51 salo Exp $
+$NetBSD: patch-ac,v 1.2 2008/06/20 01:09:31 joerg Exp $
 
 --- gophfilt/Makefile.in.orig	2005-07-20 17:28:52.000000000 +0200
 +++ gophfilt/Makefile.in	2005-08-05 14:02:39.000000000 +0200
@@ -8,7 +8,7 @@ $NetBSD: patch-ac,v 1.1 2005/08/05 12:14:51 salo Exp $
  install : all
 -	-mv $(CLIENTDIR)/$(TARGET) $(CLIENTDIR)/$(TARGET).old
 -	@INSTALL@ $(TARGET) $(CLIENTDIR)
-+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(CLIENTDIR)/
++	$(BSD_INSTALL_PROGRAM) $(TARGET) ${DESTDIR}$(CLIENTDIR)/
  
  clean:
  	-rm -f $(TARGET) $(OBJS) *.out *~ core
diff --git a/net/gopher/patches/patch-ad b/net/gopher/patches/patch-ad
index 572e09331ff..5059fd92316 100644
--- a/net/gopher/patches/patch-ad
+++ b/net/gopher/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2005/08/05 12:14:51 salo Exp $
+$NetBSD: patch-ad,v 1.2 2008/06/20 01:09:31 joerg Exp $
 
 --- doc/Makefile.in.orig	2005-07-20 17:28:53.000000000 +0200
 +++ doc/Makefile.in	2005-08-05 14:04:11.000000000 +0200
@@ -11,11 +11,11 @@ $NetBSD: patch-ad,v 1.1 2005/08/05 12:14:51 salo Exp $
 -	@INSTALL@ -m 0644 gopher.1 $(MAN1DIR)
 -	@INSTALL@ -m 0644 gophfilt.1 $(MAN1DIR)
 -	@INSTALL@ -m 0644 gopherrc.5 $(MAN5DIR)
-+	$(BSD_INSTALL_MAN_DIR) $(MAN1DIR)
-+	$(BSD_INSTALL_MAN_DIR) $(MAN5DIR)
-+	$(BSD_INSTALL_MAN) gopher.1 $(MAN1DIR)/
-+	$(BSD_INSTALL_MAN) gophfilt.1 $(MAN1DIR)/
-+	$(BSD_INSTALL_MAN) gopherrc.5 $(MAN5DIR)/
++	$(BSD_INSTALL_MAN_DIR) ${DESTDIR}$(MAN1DIR)
++	$(BSD_INSTALL_MAN_DIR) ${DESTDIR}$(MAN5DIR)
++	$(BSD_INSTALL_MAN) gopher.1 ${DESTDIR}$(MAN1DIR)/
++	$(BSD_INSTALL_MAN) gophfilt.1 ${DESTDIR}$(MAN1DIR)/
++	$(BSD_INSTALL_MAN) gopherrc.5 ${DESTDIR}$(MAN5DIR)/
  
  all:
  	$(NROFF)    gopher.1       >gopher.cat