diff options
author | joerg <joerg@pkgsrc.org> | 2010-02-14 20:51:23 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2010-02-14 20:51:23 +0000 |
commit | d0d8b3270e55b00ca633b341c8636c9ca119e9e7 (patch) | |
tree | e43e532283452ff450c507d4009e47781ac897cc | |
parent | 0b40755bde56709f852edc4c63b1309b8f6f159d (diff) | |
download | pkgsrc-d0d8b3270e55b00ca633b341c8636c9ca119e9e7.tar.gz |
DESTDIR support
-rw-r--r-- | devel/equeue/Makefile | 5 | ||||
-rw-r--r-- | devel/equeue/distinfo | 4 | ||||
-rw-r--r-- | devel/equeue/patches/patch-aa | 13 | ||||
-rw-r--r-- | devel/equeue/patches/patch-ab | 13 | ||||
-rw-r--r-- | devel/pedisassem/Makefile | 6 | ||||
-rw-r--r-- | games/sjeng/Makefile | 15 | ||||
-rw-r--r-- | games/spellcast/Makefile | 4 | ||||
-rw-r--r-- | games/spellcast/distinfo | 4 | ||||
-rw-r--r-- | games/spellcast/patches/patch-aa | 12 |
9 files changed, 55 insertions, 21 deletions
diff --git a/devel/equeue/Makefile b/devel/equeue/Makefile index 52a2ce233ac..6e2fc82593a 100644 --- a/devel/equeue/Makefile +++ b/devel/equeue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/05/28 21:06:08 zafer Exp $ +# $NetBSD: Makefile,v 1.4 2010/02/14 20:51:23 joerg Exp $ # DISTNAME= equeue-2.1.3 @@ -9,6 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.camlcity.org/ COMMENT= Queues for file events (OCaml) +PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib @@ -19,5 +20,7 @@ USE_TOOLS+= gmake BUILD_TARGET= all opt PLIST_SRC= PLIST.opt PLIST +INSTALLATION_DIRS+= lib/ocaml/site-lib + .include "../../lang/ocaml/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/equeue/distinfo b/devel/equeue/distinfo index a315d23ba14..32b921baabd 100644 --- a/devel/equeue/distinfo +++ b/devel/equeue/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/08/11 15:42:30 wiz Exp $ +$NetBSD: distinfo,v 1.2 2010/02/14 20:51:23 joerg Exp $ SHA1 (equeue-2.1.3.tar.gz) = e573ecc94b58eadf0baad07bf35b0e34fddd77fb RMD160 (equeue-2.1.3.tar.gz) = 61845789c2eec88325f0a2bbfa222576754c858d Size (equeue-2.1.3.tar.gz) = 249374 bytes +SHA1 (patch-aa) = 4e56fecc11ffd3345cae8081568e2aa002d29d64 +SHA1 (patch-ab) = 0aad36338ffe78d1444debeeee85456aae720e9f diff --git a/devel/equeue/patches/patch-aa b/devel/equeue/patches/patch-aa new file mode 100644 index 00000000000..f421e446414 --- /dev/null +++ b/devel/equeue/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2010/02/14 20:51:23 joerg Exp $ + +--- src/shell/Makefile.orig 2010-02-14 20:44:34.000000000 +0000 ++++ src/shell/Makefile +@@ -22,7 +22,7 @@ distclean: clean + + install: + files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a dll* META` && \ +- $(OCAMLFIND) install shell $$files ++ $(OCAMLFIND) install -ldconf /dev/null -destdir ${DESTDIR}`ocamlc -where`/site-lib shell $$files + + uninstall: + $(OCAMLFIND) remove shell diff --git a/devel/equeue/patches/patch-ab b/devel/equeue/patches/patch-ab new file mode 100644 index 00000000000..853e270da22 --- /dev/null +++ b/devel/equeue/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2010/02/14 20:51:23 joerg Exp $ + +--- src/equeue/Makefile.orig 2010-02-14 20:45:27.000000000 +0000 ++++ src/equeue/Makefile +@@ -39,7 +39,7 @@ distclean: clean + .PHONY: install + install: + files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a unixqueue_mt.cmo unixqueue_mt.cmx unixqueue_mt.o META` && \ +- $(OCAMLFIND) install equeue $$files ++ $(OCAMLFIND) install -ldconf /dev/null -destdir ${DESTDIR}`ocamlc -where`/site-lib equeue $$files + + .PHONY: uninstall + uninstall: diff --git a/devel/pedisassem/Makefile b/devel/pedisassem/Makefile index e5f07f27660..b8a6f91dff9 100644 --- a/devel/pedisassem/Makefile +++ b/devel/pedisassem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2010/01/07 07:36:54 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2010/02/14 20:53:37 joerg Exp $ DISTNAME= dsasmsrc PKGNAME= pedisassem-0.23 @@ -11,6 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.geocities.com/SiliconValley/Foothills/4078/ COMMENT= Disassembler for Win32 code +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} @@ -18,8 +19,7 @@ WRKSRC= ${WRKDIR} # LP64 problems NOT_FOR_PLATFORM= ${LP64PLATFORMS} -MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} - +USE_BSD_MAKEFILE= yes INSTALLATION_DIRS= bin post-extract: diff --git a/games/sjeng/Makefile b/games/sjeng/Makefile index e9665348089..4d0db919445 100644 --- a/games/sjeng/Makefile +++ b/games/sjeng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/06/05 16:02:51 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2010/02/14 21:08:23 joerg Exp $ DISTNAME= Sjeng-Free-11.0 PKGNAME= sjeng-11.0 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.sjeng.org/ COMMENT= Engine for chess variations (bughouse, suicide, etc.) +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES USE_LANGUAGES= c c++ LIBS+= -lm # floor() @@ -36,14 +38,13 @@ post-build: ${MV} -f $${file}.fixed $${file}; \ done +INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} ${BOOKDIR} + post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} - ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR} ${CAT} ${WRKSRC}/sjeng.rc | ${TR} -d "\015" > ${WRKDIR}/sample.sjengrc - ${INSTALL_DATA} ${WRKDIR}/sample.sjengrc ${EGDIR} - ${INSTALL_DATA_DIR} ${BOOKDIR} - ${INSTALL_DATA} ${WRKSRC}/books/*.opn ${BOOKDIR} + ${INSTALL_DATA} ${WRKDIR}/sample.sjengrc ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/books/*.opn ${DESTDIR}${BOOKDIR} .include "../../databases/gdbm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile index 52b9c295f50..421e0fbd0ba 100644 --- a/games/spellcast/Makefile +++ b/games/spellcast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/01/19 09:16:22 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/14 21:03:19 joerg Exp $ # DISTNAME= spellcast @@ -12,6 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.eblong.com/zarf/spellcast.html COMMENT= Game of dueling wizards for two players +PKG_DESTDIR_SUPPORT= user-destdir + USE_X11BASE= yes INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 diff --git a/games/spellcast/distinfo b/games/spellcast/distinfo index e8d8eb1d3c6..f242329a776 100644 --- a/games/spellcast/distinfo +++ b/games/spellcast/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 23:12:03 agc Exp $ +$NetBSD: distinfo,v 1.4 2010/02/14 21:03:19 joerg Exp $ SHA1 (spellcast.tar.Z) = 3c51aa1746d4b8385a87ab5af5ed78b48cc4ac19 RMD160 (spellcast.tar.Z) = ed4751d902a58abdc2a79333541fc866170a642d Size (spellcast.tar.Z) = 129173 bytes -SHA1 (patch-aa) = 8c81fd0791496d118b27a930ec0edc67284f1184 +SHA1 (patch-aa) = 0b407bfe80ca4170d54da83deebf5ea57952cf90 diff --git a/games/spellcast/patches/patch-aa b/games/spellcast/patches/patch-aa index 8ed94aa1c19..0c4c6ea6543 100644 --- a/games/spellcast/patches/patch-aa +++ b/games/spellcast/patches/patch-aa @@ -1,16 +1,16 @@ -$NetBSD: patch-aa,v 1.1 1998/08/07 11:54:29 frueauf Exp $ +$NetBSD: patch-aa,v 1.2 2010/02/14 21:03:19 joerg Exp $ --- Makefile.orig Fri Aug 7 04:21:15 1998 +++ Makefile Fri Aug 7 04:24:19 1998 -@@ -15,6 +15,6 @@ +@@ -15,6 +15,5 @@ # spell list postscript file are installed. Change them to whatever is appropriate. -DESTDIR=/afs/andrew.cmu.edu/usr0/games -DESTBIN=$(DESTDIR)/bin/.unpriv/@sys -+DESTDIR=$(PREFIX) -+DESTBIN=$(DESTDIR)/bin - DESTMAN=$(DESTDIR)/man/man6 +-DESTMAN=$(DESTDIR)/man/man6 -DESTLIB=$(DESTDIR)/lib/spellcast -+DESTLIB=$(DESTDIR)/share/doc/spellcast ++DESTBIN=$(DESTDIR)${PREFIX}/bin ++DESTMAN=$(DESTDIR)${PREFIX}/${PKGMANDIR}/man6 ++DESTLIB=$(DESTDIR)${PREFIX}/share/doc/spellcast @@ -24,7 +24,7 @@ |