Add DESTDIR support, fixing normal installation as well.

4 files changed, 38 insertions, 21 deletions

diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 94f13548f47..b3540c910e1 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2008/02/04 19:52:54 tnn Exp $
+# $NetBSD: Makefile,v 1.47 2008/03/15 20:29:35 joerg Exp $
 
 DISTNAME=	jade-1.2.1
 PKGREVISION=	12
@@ -11,6 +11,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.jclark.com/jade/
 COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PATCH_SITES=		${MASTER_SITE_LOCAL}
 PATCHFILES=		jade_1.2.1-18.diff.gz
 PATCH_DIST_STRIP=	-p1
@@ -29,6 +31,8 @@ CONFIGURE_ARGS+=	--enable-mif
 
 CXXFLAGS+=		${CFLAGS}
 
+INSTALLATION_DIRS=	include/sp lib share/doc/jade share/sgml/jade
+
 post-patch:
 	chmod -R +w ${WRKSRC}
 	find ${WRKSRC} -name '*.orig' -size 0c -type f -exec rm {} \;
@@ -37,18 +41,15 @@ post-patch:
 post-install:
 	set -e;								\
 	for prog in jade nsgmls sgmlnorm spam spent sx; do		\
-		${ECHO_MSG} "strip ${PREFIX}/bin/$${prog}";		\
-		strip "${PREFIX}/bin/$${prog}";				\
+		${ECHO_MSG} "strip ${DESTDIR}${PREFIX}/bin/$${prog}";		\
+		strip "${DESTDIR}${PREFIX}/bin/$${prog}";				\
 	done
-	${INSTALL_DATA_DIR} ${PREFIX}/include/sp
 	${INSTALL_DATA} ${WRKSRC}/include/*.cxx ${WRKSRC}/include/*.h \
-	  ${PREFIX}/include/sp
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jade
-	${INSTALL_DATA} ${WRKSRC}/jadedoc/*.htm ${PREFIX}/share/doc/jade
-	${INSTALL_DATA_DIR} ${PREFIX}/share/sgml/jade
-	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/jade
+	  ${DESTDIR}${PREFIX}/include/sp
+	${INSTALL_DATA} ${WRKSRC}/jadedoc/*.htm ${DESTDIR}${PREFIX}/share/doc/jade
+	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${DESTDIR}${PREFIX}/share/sgml/jade
 # Installed by print/tex-jadetex
-	rm ${PREFIX}/share/sgml/jade/*jadetex.*
+	rm ${DESTDIR}${PREFIX}/share/sgml/jade/*jadetex.*
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
diff --git a/textproc/jade/distinfo b/textproc/jade/distinfo
index 047816f8ca2..d241a2ac814 100644
--- a/textproc/jade/distinfo
+++ b/textproc/jade/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2006/01/20 11:36:18 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2008/03/15 20:29:35 joerg Exp $
 
 SHA1 (jade-1.2.1.tar.gz) = 4326e73b7f0b865515e1bb90c622a8b2aa6ecd06
 RMD160 (jade-1.2.1.tar.gz) = 615ebcc1b17a284d60a7976f13649a0ea78aa58d
@@ -9,11 +9,11 @@ Size (jade_1.2.1-18.diff.gz) = 121329 bytes
 SHA1 (patch-aa) = b24b6fba1e52428d0d93d0235d92f2397113fa78
 SHA1 (patch-ab) = 1742175ec89ea8e796b4e874a488225850cf78e1
 SHA1 (patch-ac) = c96ca44b40bbcc9c588dfe40045f4d386e32998d
-SHA1 (patch-ad) = 1afe17aeabda9f7f5c8531b09fb0af6085a8526f
+SHA1 (patch-ad) = 7d3ef2dfc7d0a2b0f7b040d1fa36c9f17143647d
 SHA1 (patch-ae) = a01bd39d4be17884f902a06c5c7324912935241f
 SHA1 (patch-af) = eb8c986dd4051cb183ccbb8d6aa97f1e801eab58
 SHA1 (patch-ag) = 593c1b6488fee22cd634fa10c90c89fd858c8981
-SHA1 (patch-ah) = d829ea273b99c06d83a6d7944ece12fbae513b6c
+SHA1 (patch-ah) = cd3e9d30e5fada5be5271f3277b1e0d5d0e83bb2
 SHA1 (patch-ai) = 09a1331aceeb7ec74c05b57746eb5b9be51f7bf1
 SHA1 (patch-aj) = 67f48f9c0beefa3bd0985e688cd28c808e9f5bc4
 SHA1 (patch-ak) = 76ef8712c056f96b10910e6b89db0b86bac2113a
diff --git a/textproc/jade/patches/patch-ad b/textproc/jade/patches/patch-ad
index 0a939261818..895f2c046d3 100644
--- a/textproc/jade/patches/patch-ad
+++ b/textproc/jade/patches/patch-ad
@@ -1,7 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2002/08/25 18:40:04 jlam Exp $
---- Makefile.prog.in.orig	Wed Aug 29 15:59:35 2001
-+++ Makefile.prog.in	Wed Aug 29 16:01:13 2001
-@@ -13,7 +13,7 @@
+$NetBSD: patch-ad,v 1.6 2008/03/15 20:29:35 joerg Exp $
+
+--- Makefile.prog.in.orig	1998-10-12 03:36:20.000000000 +0200
++++ Makefile.prog.in
+@@ -13,13 +13,13 @@ Makefile.lt:
  
  all: $(PROG)
  
@@ -10,3 +11,12 @@ $NetBSD: patch-ad,v 1.5 2002/08/25 18:40:04 jlam Exp $
  	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
  
  install: $(PROG)
+-	-test -d $(bindir) || (mkdir $(bindir); chmod 755 $(bindir))
+-	-rm -f $(bindir)/$(PROG)
+-	$(LIBTOOL) --mode=install $(INSTALL) $(PROG) $(bindir)
++	-test -d ${DESTDIR}$(bindir) || (mkdir ${DESTDIR}$(bindir); chmod 755 ${DESTDIR}$(bindir))
++	-rm -f ${DESTDIR}$(bindir)/$(PROG)
++	$(LIBTOOL) --mode=install $(INSTALL) $(PROG) ${DESTDIR}$(bindir)
+ 
+ depend: depend_src
+ depend.temp: $(GENSRCS)
diff --git a/textproc/jade/patches/patch-ah b/textproc/jade/patches/patch-ah
index 1665bd25cdc..150243a733a 100644
--- a/textproc/jade/patches/patch-ah
+++ b/textproc/jade/patches/patch-ah
@@ -1,7 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2002/08/25 18:40:05 jlam Exp $
---- Makefile.lib.in.orig	Mon Aug 12 16:56:51 2002
-+++ Makefile.lib.in	Mon Aug 12 16:56:48 2002
-@@ -18,7 +18,7 @@
+$NetBSD: patch-ah,v 1.4 2008/03/15 20:29:35 joerg Exp $
+
+--- Makefile.lib.in.orig	2008-03-15 20:06:44.000000000 +0100
++++ Makefile.lib.in
+@@ -18,11 +18,11 @@ Makefile.lt:
  	echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt
  
  lib$(LIB).la: $(LT_OBJS)
@@ -10,3 +11,8 @@ $NetBSD: patch-ah,v 1.3 2002/08/25 18:40:05 jlam Exp $
  	    -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
  
  install:
+-	$(LIBTOOL) --mode=install $(INSTALL) lib$(LIB).la $(libdir)
++	$(LIBTOOL) --mode=install $(INSTALL) lib$(LIB).la ${DESTDIR}$(libdir)
+ 
+ install-man:
+ depend: depend_src