Add DESTDIR support.

6 files changed, 78 insertions, 6 deletions

diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 690df6c7ff7..f513a657b8c 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:13 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/08/09 18:26:57 joerg Exp $
 
 DISTNAME=	glimpse-4.18.0
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://webglimpse.net/
 COMMENT=	Text search engine
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 LICENSE=	glimpse-license
 RESTRICTED=	Restrictive copyright (don't sell for profit)
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -16,11 +18,10 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_TOOLS+=	gmake lex
 GNU_CONFIGURE=	yes
-MAKE_FLAGS=	mandir=${PREFIX}/${PKGMANDIR}/man1
+MAKE_FLAGS=	mandir=${PREFIX}/${PKGMANDIR}/man1 share/doc/glimpse
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/glimpse
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/glimpse
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/glimpse
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DESTDIR}${PREFIX}/share/doc/glimpse
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/glimpse
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/glimpse/distinfo b/textproc/glimpse/distinfo
index 27bd7140b6b..1bfabf6aff5 100644
--- a/textproc/glimpse/distinfo
+++ b/textproc/glimpse/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/03/03 02:59:07 minskim Exp $
+$NetBSD: distinfo,v 1.9 2007/08/09 18:26:57 joerg Exp $
 
 SHA1 (glimpse-4.18.0.tar.gz) = 15c832f241a9d59e67e167167d3c3dd6f53549d8
 RMD160 (glimpse-4.18.0.tar.gz) = 879503214e48d6e32bc45660c5992851e6af4418
@@ -20,3 +20,7 @@ SHA1 (patch-an) = 898cdfd1d90083c494c15a9c84d8db196a833ae4
 SHA1 (patch-ao) = f1cb44f3d2e940adffe04ebdb7ee149fb9df8a64
 SHA1 (patch-ap) = ff5f0223544631fca4c3fcc9f1448a7c46b818e8
 SHA1 (patch-aq) = b39d669c1a362724668781762376583df6039d87
+SHA1 (patch-ar) = 26be8fc0e9bb75d286ed68451355e8a1c348f43c
+SHA1 (patch-as) = e684ae15474231d103a8341c4d1d68fb035807ee
+SHA1 (patch-at) = 6f4d94c03fe0804e9b4fc240bf1b899e9a4bf4a5
+SHA1 (patch-au) = 12b657e845627f5819711354b73ba3cf213c7434
diff --git a/textproc/glimpse/patches/patch-ar b/textproc/glimpse/patches/patch-ar
new file mode 100644
index 00000000000..b01a07d5cee
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ar
@@ -0,0 +1,24 @@
+$NetBSD: patch-ar,v 1.1 2007/08/09 18:26:57 joerg Exp $
+
+--- Makefile.in.orig	2007-08-09 20:20:05.000000000 +0200
++++ Makefile.in
+@@ -93,16 +93,16 @@ install: all installdirs install-man
+ 		( cd $$d; $(MAKE) $@ ); \
+ 	done
+ 	for d in $(BINDIR)/$(PROG) $(BINDIR)/$(PROGSERVER) ; do \
+-		$(INSTALL) $$d $(bindir) ; \
++		$(INSTALL) $$d ${DESTDIR}$(bindir) ; \
+ 	done
+ 
+ install-man:
+ 	for d in $(MANUAL) ; do \
+-		$(INSTALL_MAN) $$d $(mandir) ; \
++		$(INSTALL_MAN) $$d ${DESTDIR}$(mandir) ; \
+ 	done
+ 
+ installdirs:	mkinstalldirs
+-	$(srcdir)/mkinstalldirs $(bindir) $(mandir)
++	$(srcdir)/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(mandir)
+ 
+ clean:
+ 	for d in $(SUBDIRS); do \
diff --git a/textproc/glimpse/patches/patch-as b/textproc/glimpse/patches/patch-as
new file mode 100644
index 00000000000..dad149cabb9
--- /dev/null
+++ b/textproc/glimpse/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2007/08/09 18:26:57 joerg Exp $
+
+--- index/Makefile.in.orig	2007-08-09 20:22:05.000000000 +0200
++++ index/Makefile.in
+@@ -69,7 +69,7 @@ NOTSall:	$(NOTSCASTPROG) $(NOTSPROG) not
+ 
+ install: all install-man
+ 	for i in $(BINDIR)/$(CASTPROG) $(BINDIR)/$(PROG) $(BINDIR)/wgconvert ; do \
+-		$(INSTALL) $$i $(bindir) ; \
++		$(INSTALL) $$i ${DESTDIR}$(bindir) ; \
+ 	done
+ 
+ install-man:
diff --git a/textproc/glimpse/patches/patch-at b/textproc/glimpse/patches/patch-at
new file mode 100644
index 00000000000..fd9f189c908
--- /dev/null
+++ b/textproc/glimpse/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2007/08/09 18:26:57 joerg Exp $
+
+--- compress/Makefile.in.orig	2007-08-09 20:22:55.000000000 +0200
++++ compress/Makefile.in
+@@ -48,7 +48,7 @@ all: $(LIB) tbuild cast uncast
+ 
+ install: all
+ 	for i in tbuild cast uncast ; do \
+-		$(INSTALL) $$i $(bindir) ; \
++		$(INSTALL) $$i ${DESTDIR}$(bindir) ; \
+ 	done
+ 
+ install-man:
diff --git a/textproc/glimpse/patches/patch-au b/textproc/glimpse/patches/patch-au
new file mode 100644
index 00000000000..58d167b859d
--- /dev/null
+++ b/textproc/glimpse/patches/patch-au
@@ -0,0 +1,17 @@
+$NetBSD: patch-au,v 1.1 2007/08/09 18:26:57 joerg Exp $
+
+--- agrep/Makefile.in.orig	2007-08-09 20:23:23.000000000 +0200
++++ agrep/Makefile.in
+@@ -61,10 +61,10 @@ LIB	      = $(LIBDIR)/lib$(PROG).a
+ all: $(LIB) $(NOTCPROG)
+ 
+ install: all install-man
+-	$(INSTALL) $(PROG) $(bindir)
++	$(INSTALL) $(PROG) ${DESTDIR}$(bindir)
+ 
+ install-man: $(MAN1)
+-	$(INSTALL_MAN) $(MAN1) $(mandir)
++	$(INSTALL_MAN) $(MAN1) ${DESTDIR}$(mandir)
+ 
+ clean:
+ 		rm -f $(LIB) $(OBJS) dummyfilters.o main.o core a.out $(PROG)