PKG_DESTDIR_SUPPORT

4 files changed, 46 insertions, 26 deletions

diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index 24377f098cb..f8a4ac34d88 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/02/20 19:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2009/12/17 21:27:32 abs Exp $
 
 DISTNAME=	ftnchek-3.2.2
 PKGREVISION=	1
@@ -20,15 +20,16 @@ USE_TOOLS+=	soelim
 CFLAGS+=	-O1
 .endif
 
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 share/emacs/site-lisp
+INSTALLATION_DIRS+=	share/doc/ftnchek share/doc/ftnchek/html
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ftnchek
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ftnchek/html
 	cd ${WRKSRC} && ${INSTALL_DATA} FAQ INSTALL LICENSE README 	\
 		ftnchek.man dcl2inc.man macro-doc.txt 			\
-		${PREFIX}/share/doc/ftnchek
-	${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/doc/ftnchek/html
+		${DESTDIR}${PREFIX}/share/doc/ftnchek
+	${INSTALL_DATA} ${WRKSRC}/html/* \
+		${DESTDIR}${PREFIX}/share/doc/ftnchek/html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ftnchek/distinfo b/devel/ftnchek/distinfo
index 0900c6b7de3..f9ef53e5ae5 100644
--- a/devel/ftnchek/distinfo
+++ b/devel/ftnchek/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 22:24:14 agc Exp $
+$NetBSD: distinfo,v 1.8 2009/12/17 21:27:32 abs Exp $
 
 SHA1 (ftnchek-3.2.2.tar.bz2) = af1ed68d8270d464bf52cd5c415bada22d50ed21
 RMD160 (ftnchek-3.2.2.tar.bz2) = caa27cb97385742a8812cf400be490ced3e08d41
 Size (ftnchek-3.2.2.tar.bz2) = 745015 bytes
-SHA1 (patch-aa) = 585621cbeb2a240cd44d35ebc04904db656f31b3
-SHA1 (patch-ab) = 83af96a60c977fa25a1e423ae17cc61e56be3d84
+SHA1 (patch-aa) = 06fd3c31a337e6d11cf10740da3f1ff40860dcde
+SHA1 (patch-ab) = 3d3801e7da1aed77ec8215fbf189333ab3f92b4e
diff --git a/devel/ftnchek/patches/patch-aa b/devel/ftnchek/patches/patch-aa
index 17ace45a915..4e7577a864c 100644
--- a/devel/ftnchek/patches/patch-aa
+++ b/devel/ftnchek/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2003/06/29 22:24:33 jtb Exp $
+$NetBSD: patch-aa,v 1.7 2009/12/17 21:27:32 abs Exp $
 
---- configure.orig
+--- configure.orig	2003-04-01 03:19:35.000000000 +0000
 +++ configure
-@@ -5816,6 +5806,7 @@
+@@ -5816,6 +5816,7 @@ case $host_os in
      if test -n "$GCC"; then
        OPT="-O2";
      fi;;
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.6 2003/06/29 22:24:33 jtb Exp $
    next*)
      OPT="-O2";;
  
-@@ -5931,7 +5922,7 @@
+@@ -5931,7 +5932,7 @@ else
  fi
  
  
diff --git a/devel/ftnchek/patches/patch-ab b/devel/ftnchek/patches/patch-ab
index fa55f366649..911d2202617 100644
--- a/devel/ftnchek/patches/patch-ab
+++ b/devel/ftnchek/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2003/06/29 22:24:33 jtb Exp $
+$NetBSD: patch-ab,v 1.5 2009/12/17 21:27:32 abs Exp $
 
---- Makefile.in.orig
+--- Makefile.in.orig	2003-03-20 22:07:55.000000000 +0000
 +++ Makefile.in
-@@ -461,31 +461,17 @@
+@@ -461,45 +461,31 @@ average.out: ftnchek.h
  install:	install-exe @INSTALL_MAN@ install-lisp
  
  install-exe:	ftnchek$(EXE) dcl2inc$(CMD)
@@ -17,10 +17,10 @@ $NetBSD: patch-ab,v 1.4 2003/06/29 22:24:33 jtb Exp $
 -	$(CP) dcl2inc$(CMD) $(bindir)/dcl2inc$(CMD)
 -	$(CHMOD) 755 $(bindir)/dcl2inc$(CMD)
 -	-$(RM) $(bindir)/fcl2vcg
-+	$(BSD_INSTALL_PROGRAM) ftnchek$(EXE) $(bindir)
-+	$(BSD_INSTALL_DATA_DIR) $(libdir)
-+	$(BSD_INSTALL_DATA) dcl2inc.awk $(libdir)
-+	$(BSD_INSTALL_SCRIPT) dcl2inc$(CMD) $(bindir)
++	$(BSD_INSTALL_PROGRAM) ftnchek$(EXE) $(DESTDIR)$(bindir)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(libdir)
++	$(BSD_INSTALL_DATA) dcl2inc.awk $(DESTDIR)$(libdir)
++	$(BSD_INSTALL_SCRIPT) dcl2inc$(CMD) $(DESTDIR)$(bindir)
  
  # Install man pages, taking care to remove old formatted ones, because
  # many man implentations fail to compare time stamps of raw and
@@ -35,12 +35,31 @@ $NetBSD: patch-ab,v 1.4 2003/06/29 22:24:33 jtb Exp $
 -	$(CHMOD) 644 $(mandir)/man1/ftnchek$(manext)
 -	-$(RM) $(mandir)/man1/fcl2vcg$(manext)
 -	-$(RM) $(mandir)/cat1/fcl2vcg$(manext)
-+	$(BSD_INSTALL_MAN) dcl2inc.man $(mandir)/man1/dcl2inc$(manext)
-+	$(BSD_INSTALL_MAN) ftnchek$(manext) $(mandir)/man1/ftnchek$(manext)
++	$(BSD_INSTALL_MAN) dcl2inc.man $(DESTDIR)$(mandir)/man1/dcl2inc$(manext)
++	$(BSD_INSTALL_MAN) ftnchek$(manext) $(DESTDIR)$(mandir)/man1/ftnchek$(manext)
  
  # IRIX uses pre-formatted, packed man pages and nroff is not bundled with it.
  install-man-sgi: catman
-@@ -528,23 +514,8 @@
+ 	if $(PACK) dcl2inc.cat ; \
+ 	then \
+-		$(MV) dcl2inc.cat.z $(mandir)$(sgimansubdir)/dcl2inc.z ; \
+-		$(CHMOD) 644 $(mandir)$(sgimansubdir)/dcl2inc.z ; \
++		$(MV) dcl2inc.cat.z $(DESTDIR)$(mandir)$(sgimansubdir)/dcl2inc.z ; \
++		$(CHMOD) 644 $(DESTDIR)$(mandir)$(sgimansubdir)/dcl2inc.z ; \
+ 	fi
+ 	if $(PACK) ftnchek.cat ; \
+ 	then \
+-		$(MV) ftnchek.cat.z $(mandir)$(sgimansubdir)/ftnchek.z ; \
+-		$(CHMOD) 644 $(mandir)$(sgimansubdir)/ftnchek.z ; \
++		$(MV) ftnchek.cat.z $(DESTDIR)$(mandir)$(sgimansubdir)/ftnchek.z ; \
++		$(CHMOD) 644 $(DESTDIR)$(mandir)$(sgimansubdir)/ftnchek.z ; \
+ 	fi
+-	-$(RM) $(mandir)/fcl2vcg.z
++	-$(RM) $(DESTDIR)$(mandir)/fcl2vcg.z
+ 
+ # The catman target makes formatted ("cat") versions of the manpages
+ # for use in install-man-sgi.  These files are not in the standard
+@@ -528,23 +514,8 @@ catman: dcl2inc.cat ftnchek.cat
  #  The emacs lisp file will be installed only if lispdir exists.  It will
  #  be byte-compiled if emacs is present.
  install-lisp:
@@ -61,8 +80,8 @@ $NetBSD: patch-ab,v 1.4 2003/06/29 22:24:33 jtb Exp $
 -	  echo "If you want to install ftnchek.el, create $(lispdir)" ; \
 -	  echo "or re-run make install with 'lispdir=path-to-site-lisp'" ; \
 -	fi
-+	$(BSD_INSTALL_DATA_DIR) $(lispdir)
-+	$(BSD_INSTALL_DATA) ftnchek.el $(lispdir)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(lispdir)
++	$(BSD_INSTALL_DATA) ftnchek.el $(DESTDIR)$(lispdir)
  
  # Remove everything that the install target installed.
  uninstall: