From 90862dd5d9bef6e17e0356ccf034eca791bd70d1 Mon Sep 17 00:00:00 2001 From: abs Date: Thu, 17 Dec 2009 21:27:32 +0000 Subject: PKG_DESTDIR_SUPPORT --- chat/emech/Makefile | 11 ++++++----- chat/emech/distinfo | 4 +--- devel/ddd/Makefile | 24 +++++++++++++---------- devel/ftnchek/Makefile | 15 ++++++++------- devel/ftnchek/distinfo | 6 +++--- devel/ftnchek/patches/patch-aa | 8 ++++---- devel/ftnchek/patches/patch-ab | 43 ++++++++++++++++++++++++++++++------------ 7 files changed, 67 insertions(+), 44 deletions(-) diff --git a/chat/emech/Makefile b/chat/emech/Makefile index f4b852e9ac0..9259748a5d7 100644 --- a/chat/emech/Makefile +++ b/chat/emech/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2009/03/22 04:53:38 manu Exp $ +# $NetBSD: Makefile,v 1.8 2009/12/17 21:34:19 abs Exp $ # DISTNAME= emech-3.0.2 @@ -14,11 +14,12 @@ HAS_CONFIGURE= YES # when given no input. CONFIGURE_ARGS+= < /dev/null BUILD_TARGET= mech -AUTO_MKDIRS= yes + +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS+= bin share/examples/emech post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/energymech ${PREFIX}/bin/mech - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/emech - ${INSTALL_DATA} ${WRKSRC}/sample.conf ${PREFIX}/share/examples/emech/ + ${INSTALL_PROGRAM} ${WRKSRC}/energymech ${DESTDIR}${PREFIX}/bin/mech + ${INSTALL_DATA} ${WRKSRC}/sample.conf ${DESTDIR}${PREFIX}/share/examples/emech/ .include "../../mk/bsd.pkg.mk" diff --git a/chat/emech/distinfo b/chat/emech/distinfo index c0f0db3b1c8..aea13356e02 100644 --- a/chat/emech/distinfo +++ b/chat/emech/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.4 2007/03/17 14:13:23 rillig Exp $ +$NetBSD: distinfo,v 1.5 2009/12/17 21:34:19 abs Exp $ SHA1 (emech-3.0.2.tar.gz) = f74a07136cf6b672b496564c4838e12246f25c0a RMD160 (emech-3.0.2.tar.gz) = 2c4bed99dc200afd3636cae948eea193a85e65c2 Size (emech-3.0.2.tar.gz) = 229907 bytes -SHA1 (patch-aa) = bd69c3628e414de3d151a23a004887d81ad4d765 -SHA1 (patch-ab) = 628d0e9a7d8a8a7792fd2e4723fe6afe64732009 diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 727ee4a67f5..c74af43efa3 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2006/12/15 20:32:53 joerg Exp $ +# $NetBSD: Makefile,v 1.74 2009/12/17 21:31:43 abs Exp $ # DISTNAME= ddd-3.3.11 @@ -11,8 +11,9 @@ HOMEPAGE= http://www.gnu.org/software/ddd/ COMMENT= Data Display Debugger -- graphical front-end for GDB/DBX/XDB GNU_CONFIGURE= YES -INFO_FILES= # PLIST +INFO_FILES= YES # PLIST TEST_TARGET= check +BUILD_DEFS+= PAPERSIZE USE_TOOLS+= gmake gzip USE_LANGUAGES= c c++ USE_X11BASE= YES @@ -22,10 +23,14 @@ GCC_REQD+= 3.0 CONFIGURE_ARGS+= --with-ncurses=no CONFIGURE_ENV+= COMPFACE=${FALSE:Q} +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../mk/bsd.prefs.mk" +INSTALLATION_DIRS+= share/doc/ddd + post-patch: - @case ${PAPERSIZE:Q} in \ + case ${PAPERSIZE:Q} in \ A4) ${ECHO} "Using A4 paper size" ;; \ Letter*) ${ECHO} "Using US Letter paper size"; \ ${MV} ${WRKSRC:Q}/ddd/Ddd.in ${WRKSRC:Q}/ddd/Ddd.in.orig; \ @@ -40,13 +45,12 @@ post-configure: ${ECHO} LIBXM = ${MOTIFLIB:Q} >> ${WRKSRC:Q}/ddd/Makefile post-install: - ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/ddd - ${INSTALL_DATA} ${WRKSRC:Q}/README ${PREFIX:Q}/share/doc/ddd - ${INSTALL_DATA} ${WRKSRC:Q}/doc/ddd-paper.ps ${PREFIX:Q}/share/doc/ddd - ${INSTALL_DATA} ${WRKSRC:Q}/doc/ddd.ps ${PREFIX:Q}/share/doc/ddd - ${INSTALL_DATA} ${WRKSRC:Q}/doc/ddd.pdf ${PREFIX:Q}/share/doc/ddd - ${GZIP_CMD} ${PREFIX:Q}/share/doc/ddd/ddd-paper.ps - ${GZIP_CMD} ${PREFIX:Q}/share/doc/ddd/ddd.ps + ${INSTALL_DATA} ${WRKSRC:Q}/README ${DESTDIR}${PREFIX:Q}/share/doc/ddd + ${INSTALL_DATA} ${WRKSRC:Q}/doc/ddd-paper.ps ${DESTDIR}${PREFIX:Q}/share/doc/ddd + ${INSTALL_DATA} ${WRKSRC:Q}/doc/ddd.ps ${DESTDIR}${PREFIX:Q}/share/doc/ddd + ${INSTALL_DATA} ${WRKSRC:Q}/doc/ddd.pdf ${DESTDIR}${PREFIX:Q}/share/doc/ddd + ${GZIP_CMD} ${DESTDIR}${PREFIX:Q}/share/doc/ddd/ddd-paper.ps + ${GZIP_CMD} ${DESTDIR}${PREFIX:Q}/share/doc/ddd/ddd.ps .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" 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: -- cgit v1.2.3