diff options
author | abs <abs> | 2009-12-17 19:58:19 +0000 |
---|---|---|
committer | abs <abs> | 2009-12-17 19:58:19 +0000 |
commit | e49d3ea4ebfebdd0926ec954ee5a66feff24bbef (patch) | |
tree | 4f3619f73d7b900cf12038b086e409079e6a1d11 /chat | |
parent | feaf75500da4738c86c9f4ef6896589159a74560 (diff) | |
download | pkgsrc-e49d3ea4ebfebdd0926ec954ee5a66feff24bbef.tar.gz |
PKG_DESTDIR_SUPPORT
Diffstat (limited to 'chat')
-rw-r--r-- | chat/anope/Makefile | 30 | ||||
-rw-r--r-- | chat/anope/distinfo | 9 | ||||
-rw-r--r-- | chat/anope/patches/patch-aa | 54 | ||||
-rw-r--r-- | chat/anope/patches/patch-ab | 40 | ||||
-rw-r--r-- | chat/anope/patches/patch-ac | 13 | ||||
-rw-r--r-- | chat/anope/patches/patch-ad | 13 | ||||
-rw-r--r-- | chat/anope/patches/patch-ae | 13 | ||||
-rw-r--r-- | chat/anope/patches/patch-af | 20 | ||||
-rw-r--r-- | chat/sirc/Makefile | 18 |
9 files changed, 177 insertions, 33 deletions
diff --git a/chat/anope/Makefile b/chat/anope/Makefile index f572a03616e..f3d73b0605e 100644 --- a/chat/anope/Makefile +++ b/chat/anope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/07/17 18:00:13 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2009/12/17 20:56:46 abs Exp $ DISTNAME= anope-1.7.21 CATEGORIES= chat @@ -20,6 +20,8 @@ FILES_SUBST+= ANOPE_GROUP=${ANOPE_GROUP:Q} PKG_USERS_VARS+= ANOPE_USER PKG_GROUPS_VARS+= ANOPE_GROUP +PKG_DESTDIR_SUPPORT= destdir + .include "../../mk/bsd.prefs.mk" PKG_USERS= ${ANOPE_USER}:${ANOPE_GROUP}::anope\ user:${PREFIX}/lib/anope:${NOLOGIN} @@ -60,19 +62,19 @@ SUBST_MESSAGE.utils= Fixing hardcoded utilities. .include "../../mk/pthread.buildlink3.mk" +INSTALLATION_DIRS+= share/doc/anope share/examples/anope lib/anope/modules + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/anope - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/anope - ${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/anope - ${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/anoperc - ${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/listchans - ${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/listnicks - ${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/services - ${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/modules/*.so - ${CHMOD} ${SHAREMODE} ${PREFIX}/lib/anope/languages/* - ${CHOWN} ${ANOPE_USER} ${PREFIX}/lib/anope - ${CHOWN} ${ANOPE_USER} ${PREFIX}/lib/anope/backups - ${CHOWN} ${ANOPE_USER} ${PREFIX}/lib/anope/logs - ${INSTALL_DATA} ${WRKSRC}/data/* ${PREFIX}/share/examples/anope + ${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/anope + ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/anoperc + ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/listchans + ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/listnicks + ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/services + ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/modules/*.so + ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/anope/languages/* + ${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope + ${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope/backups + ${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope/logs + ${INSTALL_DATA} ${WRKSRC}/data/* ${DESTDIR}${PREFIX}/share/examples/anope .include "../../mk/bsd.pkg.mk" diff --git a/chat/anope/distinfo b/chat/anope/distinfo index ba4b3feb600..0e5e9bb06ba 100644 --- a/chat/anope/distinfo +++ b/chat/anope/distinfo @@ -1,6 +1,11 @@ -$NetBSD: distinfo,v 1.4 2008/06/13 23:32:45 adrianp Exp $ +$NetBSD: distinfo,v 1.5 2009/12/17 20:56:46 abs Exp $ SHA1 (anope-1.7.21.tar.gz) = 1a8c845fcfd6351a4225fc8e38bb6e90f5201a4b RMD160 (anope-1.7.21.tar.gz) = ac2b22d60e6be2e7ea02e933fc005c5b3b206180 Size (anope-1.7.21.tar.gz) = 1523615 bytes -SHA1 (patch-aa) = 3a5dcfd4029a4a6f55a3b39d34e706502ecfe05c +SHA1 (patch-aa) = 6db1799996f7eb8f2d88ddd99f4baef5a843865b +SHA1 (patch-ab) = 9684780fa938db06f53014e7d45e9e6debf9e92c +SHA1 (patch-ac) = d08a26c28b7e6130b7eb459a7109ad67160eb43d +SHA1 (patch-ad) = 7b64822e486fa8673db8e47edc9b86c7183505c7 +SHA1 (patch-ae) = 6c02aaa1d809e113338d35b672911269c1932d29 +SHA1 (patch-af) = 77e21789e0af1b845c417dabd02e2ad9a5e04239 diff --git a/chat/anope/patches/patch-aa b/chat/anope/patches/patch-aa index 5b920f69a3b..7f863fb49c6 100644 --- a/chat/anope/patches/patch-aa +++ b/chat/anope/patches/patch-aa @@ -1,12 +1,50 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/10/20 22:40:24 adrianp Exp $ +$NetBSD: patch-aa,v 1.2 2009/12/17 20:56:46 abs Exp $ ---- src/Makefile.orig 2005-11-16 23:22:43.000000000 +0000 +--- src/Makefile.orig 2008-01-10 22:31:39.000000000 +0000 +++ src/Makefile -@@ -111,7 +111,6 @@ install: services - ln $(BINDEST)/services $(BINDEST)/listnicks - ln $(BINDEST)/services $(BINDEST)/listchans +@@ -108,17 +108,16 @@ spotless: + (cd core ; ${MAKE} distclean) + + install: services +- test -d ${BINDEST} || mkdir ${BINDEST} +- $(INSTALL) services $(BINDEST)/services +- $(INSTALL) bin/anoperc $(BINDEST)/anoperc +- rm -f $(BINDEST)/listnicks $(BINDEST)/listchans +- ln $(BINDEST)/services $(BINDEST)/listnicks +- ln $(BINDEST)/services $(BINDEST)/listchans ++ test -d ${DESTDIR}${BINDEST} || mkdir ${DESTDIR}${BINDEST} ++ $(INSTALL) services ${DESTDIR}$(BINDEST)/services ++ $(INSTALL) bin/anoperc ${DESTDIR}$(BINDEST)/anoperc ++ rm -f ${DESTDIR}$(BINDEST)/listnicks ${DESTDIR}$(BINDEST)/listchans ++ ln ${DESTDIR}$(BINDEST)/services ${DESTDIR}$(BINDEST)/listnicks ++ ln ${DESTDIR}$(BINDEST)/services ${DESTDIR}$(BINDEST)/listchans (cd ../lang ; $(MAKE) install) - $(CP) ../data/* $(DATDEST) - $(INSTALL) bin/mydbgen $(DATDEST)/mydbgen - test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups - test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs +- $(INSTALL) bin/mydbgen $(DATDEST)/mydbgen +- test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups +- test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs ++ $(INSTALL) bin/mydbgen ${DESTDIR}$(DATDEST)/mydbgen ++ test -d ${DESTDIR}$(DATDEST)/backups || mkdir ${DESTDIR}$(DATDEST)/backups ++ test -d ${DESTDIR}$(DATDEST)/logs || mkdir ${DESTDIR}$(DATDEST)/logs + @if [ "$(MODULE_PATH)" ] ; then \ + test -d ${MODULE_PATH} || mkdir ${MODULE_PATH} ; \ + test -d ${MODULE_PATH}/runtime || mkdir ${MODULE_PATH}/runtime ; \ +@@ -127,12 +126,12 @@ install: services + (cd core ; ${MAKE} install) ; \ + fi + @if [ "$(RUNGROUP)" ] ; then \ +- echo chgrp -R $(RUNGROUP) $(DATDEST) ; \ +- chgrp -R $(RUNGROUP) $(DATDEST) ; \ +- echo chmod -R g+rw $(DATDEST) ; \ +- chmod -R g+rw $(DATDEST) ; \ +- echo find $(DATDEST) -type d -exec chmod g+xs \'\{\}\' \\\; ; \ +- find $(DATDEST) -type d -exec chmod g+xs '{}' \; ; \ ++ echo chgrp -R $(RUNGROUP) ${DESTDIR}$(DATDEST) ; \ ++ chgrp -R $(RUNGROUP) ${DESTDIR}$(DATDEST) ; \ ++ echo chmod -R g+rw ${DESTDIR}$(DATDEST) ; \ ++ chmod -R g+rw ${DESTDIR}$(DATDEST) ; \ ++ echo find ${DESTDIR}$(DATDEST) -type d -exec chmod g+xs \'\{\}\' \\\; ; \ ++ find ${DESTDIR}$(DATDEST) -type d -exec chmod g+xs '{}' \; ; \ + fi + + DUMMY: diff --git a/chat/anope/patches/patch-ab b/chat/anope/patches/patch-ab new file mode 100644 index 00000000000..23a86ac0846 --- /dev/null +++ b/chat/anope/patches/patch-ab @@ -0,0 +1,40 @@ +$NetBSD: patch-ab,v 1.1 2009/12/17 20:56:46 abs Exp $ + +--- lang/Makefile.orig 2008-01-10 22:31:35.000000000 +0000 ++++ lang/Makefile +@@ -18,22 +18,22 @@ all: $(LANGOBJS) + distclean: clean spotless + + install: all +- test -d $(DATDEST)/languages || mkdir $(DATDEST)/languages ++ test -d $(DESTDIR)$(DATDEST)/languages || mkdir $(DESTDIR)$(DATDEST)/languages + @if [ "$(RUNGROUP)" ] ; then \ +- echo chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \ +- chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \ +- echo chmod -R g+rw $(DATDEST)/languages ; \ +- chmod -R g+rw $(DATDEST)/languages ; \ +- $(CP) $(LANGOBJS) $(DATDEST)/languages ; \ +- echo chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \ +- chgrp -R $(RUNGROUP) $(DATDEST)/languages/* ; \ +- echo chmod -R g+rw $(DATDEST)/languages/* ; \ +- chmod -R g+rw $(DATDEST)/languages/* ; \ ++ echo chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages ; \ ++ chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages ; \ ++ echo chmod -R g+rw $(DESTDIR)$(DATDEST)/languages ; \ ++ chmod -R g+rw $(DESTDIR)$(DATDEST)/languages ; \ ++ $(CP) $(LANGOBJS) $(DESTDIR)$(DATDEST)/languages ; \ ++ echo chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages ; \ ++ chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages/* ; \ ++ echo chmod -R g+rw $(DESTDIR)$(DATDEST)/languages/* ; \ ++ chmod -R g+rw $(DESTDIR)$(DATDEST)/languages/* ; \ + fi + @if [ ! "$(RUNGROUP)" ] ; then \ +- chmod 700 $(DATDEST)/languages/ ; \ +- $(CP) $(LANGOBJS) $(DATDEST)/languages ; \ +- chmod 600 $(DATDEST)/languages/* ; \ ++ chmod 700 $(DESTDIR)$(DATDEST)/languages/ ; \ ++ $(CP) $(LANGOBJS) $(DESTDIR)$(DATDEST)/languages ; \ ++ chmod 600 $(DESTDIR)$(DATDEST)/languages/* ; \ + fi + + clean: diff --git a/chat/anope/patches/patch-ac b/chat/anope/patches/patch-ac new file mode 100644 index 00000000000..5a5c14d59a9 --- /dev/null +++ b/chat/anope/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2009/12/17 20:56:46 abs Exp $ + +--- src/modules/Makefile.orig 2008-01-10 22:31:39.000000000 +0000 ++++ src/modules/Makefile +@@ -16,7 +16,7 @@ all: modules subs + modules: $(OBJECTS) $(SO_FILES) + + install: +- $(CP) ./*.so $(MODULE_PATH) ++ $(CP) ./*.so $(DESTDIR)$(MODULE_PATH) + + distclean: spotless + diff --git a/chat/anope/patches/patch-ad b/chat/anope/patches/patch-ad new file mode 100644 index 00000000000..7fe61d3eed7 --- /dev/null +++ b/chat/anope/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2009/12/17 20:56:46 abs Exp $ + +--- src/protocol/Makefile.orig 2008-01-10 22:31:38.000000000 +0000 ++++ src/protocol/Makefile +@@ -16,7 +16,7 @@ all: modules subs + modules: $(OBJECTS) $(SO_FILES) + + install: +- $(CP) ./*.so $(MODULE_PATH) ++ $(CP) ./*.so $(DESTDIR)$(MODULE_PATH) + + distclean: clean spotless + diff --git a/chat/anope/patches/patch-ae b/chat/anope/patches/patch-ae new file mode 100644 index 00000000000..16f5a4e9bee --- /dev/null +++ b/chat/anope/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2009/12/17 20:56:46 abs Exp $ + +--- src/core/Makefile.orig 2008-01-10 22:31:37.000000000 +0000 ++++ src/core/Makefile +@@ -16,7 +16,7 @@ all: modules subs + modules: $(OBJECTS) $(SO_FILES) + + install: +- $(CP) ./*.so $(MODULE_PATH) ++ $(CP) ./*.so $(DESTDIR)$(MODULE_PATH) + + distclean: spotless + diff --git a/chat/anope/patches/patch-af b/chat/anope/patches/patch-af new file mode 100644 index 00000000000..a60b8f7fcdb --- /dev/null +++ b/chat/anope/patches/patch-af @@ -0,0 +1,20 @@ +$NetBSD: patch-af,v 1.1 2009/12/17 20:56:46 abs Exp $ + +--- src/tools/Makefile.orig 2008-01-10 22:31:37.000000000 +0000 ++++ src/tools/Makefile +@@ -30,10 +30,10 @@ clean: + spotless: clean + + install: anopesmtp db-merger epona2anope +- test -d ${BINDEST} || mkdir ${BINDEST} +- test -d $(BINDEST)/tools || mkdir $(BINDEST)/tools +- $(INSTALL) anopesmtp $(BINDEST)/tools/anopesmtp +- $(INSTALL) db-merger $(BINDEST)/tools/db-merger +- $(INSTALL) epona2anope $(BINDEST)/tools/epona2anope ++ test -d ${DESTDIR}/${BINDEST} || mkdir ${DESTDIR}/${BINDEST} ++ test -d ${DESTDIR}/$(BINDEST)/tools || mkdir ${DESTDIR}/$(BINDEST)/tools ++ $(INSTALL) anopesmtp ${DESTDIR}/$(BINDEST)/tools/anopesmtp ++ $(INSTALL) db-merger ${DESTDIR}/$(BINDEST)/tools/db-merger ++ $(INSTALL) epona2anope ${DESTDIR}/$(BINDEST)/tools/epona2anope + + DUMMY: diff --git a/chat/sirc/Makefile b/chat/sirc/Makefile index cd22daca3ea..5145ca7d9eb 100644 --- a/chat/sirc/Makefile +++ b/chat/sirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2008/07/27 09:38:06 obache Exp $ +# $NetBSD: Makefile,v 1.21 2009/12/17 20:20:43 abs Exp $ DISTNAME= sirc-2.211 PKGREVISION= 2 @@ -50,6 +50,8 @@ DIST_SUBDIR= sirc REPLACE_PERL+= dsirc +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../mk/bsd.prefs.mk" .if defined(DEFAULT_IRC_SERVER) IRC_SERVER= ${DEFAULT_IRC_SERVER} @@ -57,10 +59,9 @@ IRC_SERVER= ${DEFAULT_IRC_SERVER} IRC_SERVER= us.undernet.org .endif -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 lib/sirc/scripts do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/sirc cd ${WRKSRC} ; ( \ ${ECHO} "y" ; \ ${ECHO} "" ; \ @@ -69,18 +70,17 @@ do-install: ${ECHO} "-O3" ; \ ${ECHO} "" ; \ ${ECHO} "${PERL5}" ; \ - ${ECHO} "${PREFIX}/bin" ; \ + ${ECHO} "${DESTDIR}${PREFIX}/bin" ; \ ${ECHO} "y" ; \ - ${ECHO} "${PREFIX}/lib/sirc" ; \ + ${ECHO} "${DESTDIR}${PREFIX}/lib/sirc" ; \ ${ECHO} "y" ; \ ${ECHO} "n" ; \ - ${ECHO} "${PREFIX}/${PKGMANDIR}/man1" ; \ + ${ECHO} "${DESTDIR}${PREFIX}/${PKGMANDIR}/man1" ; \ ${ECHO} "${IRC_SERVER}" ; \ ${ECHO} "" ; \ ) | ./install - ${INSTALL_DATA_DIR} ${PREFIX}/lib/sirc/scripts - @for i in ${SIRC_SCRIPTS} ; do \ + for i in ${SIRC_SCRIPTS} ; do \ ${ECHO} installing $$i ; \ - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$i ${PREFIX}/lib/sirc/scripts/$$i ; done + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$i ${DESTDIR}${PREFIX}/lib/sirc/scripts/$$i ; done .include "../../mk/bsd.pkg.mk" |