Thu Dec 17 20:56:46 2009 UTC ()
PKG_DESTDIR_SUPPORT


(abs)
diff -r1.6 -r1.7 pkgsrc/chat/anope/Makefile
diff -r1.4 -r1.5 pkgsrc/chat/anope/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/chat/anope/patches/patch-aa
diff -r0 -r1.1 pkgsrc/chat/anope/patches/patch-ab
diff -r0 -r1.1 pkgsrc/chat/anope/patches/patch-ac
diff -r0 -r1.1 pkgsrc/chat/anope/patches/patch-ad
diff -r0 -r1.1 pkgsrc/chat/anope/patches/patch-ae
diff -r0 -r1.1 pkgsrc/chat/anope/patches/patch-af
cvs diff -r1.6 -r1.7 pkgsrc/chat/anope/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/anope/Makefile 2009/07/17 18:00:13 1.6
+++ pkgsrc/chat/anope/Makefile 2009/12/17 20:56:46 1.7
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: Makefile,v 1.6 2009/07/17 18:00:13 adrianp Exp $ 1# $NetBSD: Makefile,v 1.7 2009/12/17 20:56:46 abs Exp $
2 2
3DISTNAME= anope-1.7.21 3DISTNAME= anope-1.7.21
4CATEGORIES= chat 4CATEGORIES= chat
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=anope/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=anope/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.anope.org/ 8HOMEPAGE= http://www.anope.org/
9COMMENT= Set of Services for IRC networks 9COMMENT= Set of Services for IRC networks
10 10
11GNU_CONFIGURE= YES 11GNU_CONFIGURE= YES
12PTHREAD_OPTS+= require 12PTHREAD_OPTS+= require
13USE_TOOLS+= gmake perl:run 13USE_TOOLS+= gmake perl:run
14ANOPE_USER= anope 14ANOPE_USER= anope
15ANOPE_GROUP= anope 15ANOPE_GROUP= anope
16RCD_SCRIPTS= anope 16RCD_SCRIPTS= anope
17FILES_SUBST+= ANOPE_USER=${ANOPE_USER:Q} 17FILES_SUBST+= ANOPE_USER=${ANOPE_USER:Q}
18FILES_SUBST+= ANOPE_GROUP=${ANOPE_GROUP:Q} 18FILES_SUBST+= ANOPE_GROUP=${ANOPE_GROUP:Q}
19 19
20PKG_USERS_VARS+= ANOPE_USER 20PKG_USERS_VARS+= ANOPE_USER
21PKG_GROUPS_VARS+= ANOPE_GROUP 21PKG_GROUPS_VARS+= ANOPE_GROUP
22 22
 23PKG_DESTDIR_SUPPORT= destdir
 24
23.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
24 26
25PKG_USERS= ${ANOPE_USER}:${ANOPE_GROUP}::anope\ user:${PREFIX}/lib/anope:${NOLOGIN} 27PKG_USERS= ${ANOPE_USER}:${ANOPE_GROUP}::anope\ user:${PREFIX}/lib/anope:${NOLOGIN}
26PKG_GROUPS= ${ANOPE_GROUP} 28PKG_GROUPS= ${ANOPE_GROUP}
27MAKE_ENV+= RUNGROUP=${ANOPE_GROUP:Q} 29MAKE_ENV+= RUNGROUP=${ANOPE_GROUP:Q}
28OWN_DIRS_PERMS+= ${PREFIX}/lib/anope/logs \ 30OWN_DIRS_PERMS+= ${PREFIX}/lib/anope/logs \
29 ${ANOPE_USER:Q} ${ANOPE_GROUP:Q} 2755 31 ${ANOPE_USER:Q} ${ANOPE_GROUP:Q} 2755
30OWN_DIRS_PERMS+= ${PREFIX}/lib/anope/modules/runtime \ 32OWN_DIRS_PERMS+= ${PREFIX}/lib/anope/modules/runtime \
31 ${ANOPE_USER:Q} ${ANOPE_GROUP:Q} 2755 33 ${ANOPE_USER:Q} ${ANOPE_GROUP:Q} 2755
32 34
33CONF_FILES_PERMS+= ${PREFIX}/share/examples/anope/example.conf \ 35CONF_FILES_PERMS+= ${PREFIX}/share/examples/anope/example.conf \
34 ${PREFIX}/lib/anope/services.conf \ 36 ${PREFIX}/lib/anope/services.conf \
35 ${ANOPE_USER} ${ANOPE_GROUP} 0640 37 ${ANOPE_USER} ${ANOPE_GROUP} 0640
@@ -50,29 +52,29 @@ SUBST_SED.paths+= -e "s|/home/username/s @@ -50,29 +52,29 @@ SUBST_SED.paths+= -e "s|/home/username/s
50SUBST_MESSAGE.paths= Fixing hardcoded paths. 52SUBST_MESSAGE.paths= Fixing hardcoded paths.
51 53
52SUBST_CLASSES+= utils 54SUBST_CLASSES+= utils
53SUBST_STAGE.utils= post-patch 55SUBST_STAGE.utils= post-patch
54SUBST_FILES.utils= src/Makefile 56SUBST_FILES.utils= src/Makefile
55SUBST_SED.utils= -e "s|find|${FIND}|g" 57SUBST_SED.utils= -e "s|find|${FIND}|g"
56SUBST_SED.utils+= -e "s|chgrp|${CHGRP}|g" 58SUBST_SED.utils+= -e "s|chgrp|${CHGRP}|g"
57SUBST_SED.utils+= -e "s|chmod|${CHMOD}|g" 59SUBST_SED.utils+= -e "s|chmod|${CHMOD}|g"
58SUBST_SED.utils+= -e "s|ln|${LN}|g" 60SUBST_SED.utils+= -e "s|ln|${LN}|g"
59SUBST_MESSAGE.utils= Fixing hardcoded utilities. 61SUBST_MESSAGE.utils= Fixing hardcoded utilities.
60 62
61.include "../../mk/pthread.buildlink3.mk" 63.include "../../mk/pthread.buildlink3.mk"
62 64
 65INSTALLATION_DIRS+= share/doc/anope share/examples/anope lib/anope/modules
 66
63post-install: 67post-install:
64 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/anope 68 ${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/anope
65 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/anope 69 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/anoperc
66 ${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/anope 70 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/listchans
67 ${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/anoperc 71 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/listnicks
68 ${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/listchans 72 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/services
69 ${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/listnicks 73 ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/modules/*.so
70 ${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/services 74 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/anope/languages/*
71 ${CHMOD} ${BINMODE} ${PREFIX}/lib/anope/modules/*.so 75 ${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope
72 ${CHMOD} ${SHAREMODE} ${PREFIX}/lib/anope/languages/* 76 ${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope/backups
73 ${CHOWN} ${ANOPE_USER} ${PREFIX}/lib/anope 77 ${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope/logs
74 ${CHOWN} ${ANOPE_USER} ${PREFIX}/lib/anope/backups 78 ${INSTALL_DATA} ${WRKSRC}/data/* ${DESTDIR}${PREFIX}/share/examples/anope
75 ${CHOWN} ${ANOPE_USER} ${PREFIX}/lib/anope/logs 
76 ${INSTALL_DATA} ${WRKSRC}/data/* ${PREFIX}/share/examples/anope 
77 79
78.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/chat/anope/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/anope/distinfo 2008/06/13 23:32:45 1.4
+++ pkgsrc/chat/anope/distinfo 2009/12/17 20:56:46 1.5
@@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
1$NetBSD: distinfo,v 1.4 2008/06/13 23:32:45 adrianp Exp $ 1$NetBSD: distinfo,v 1.5 2009/12/17 20:56:46 abs Exp $
2 2
3SHA1 (anope-1.7.21.tar.gz) = 1a8c845fcfd6351a4225fc8e38bb6e90f5201a4b 3SHA1 (anope-1.7.21.tar.gz) = 1a8c845fcfd6351a4225fc8e38bb6e90f5201a4b
4RMD160 (anope-1.7.21.tar.gz) = ac2b22d60e6be2e7ea02e933fc005c5b3b206180 4RMD160 (anope-1.7.21.tar.gz) = ac2b22d60e6be2e7ea02e933fc005c5b3b206180
5Size (anope-1.7.21.tar.gz) = 1523615 bytes 5Size (anope-1.7.21.tar.gz) = 1523615 bytes
6SHA1 (patch-aa) = 3a5dcfd4029a4a6f55a3b39d34e706502ecfe05c 6SHA1 (patch-aa) = 6db1799996f7eb8f2d88ddd99f4baef5a843865b
 7SHA1 (patch-ab) = 9684780fa938db06f53014e7d45e9e6debf9e92c
 8SHA1 (patch-ac) = d08a26c28b7e6130b7eb459a7109ad67160eb43d
 9SHA1 (patch-ad) = 7b64822e486fa8673db8e47edc9b86c7183505c7
 10SHA1 (patch-ae) = 6c02aaa1d809e113338d35b672911269c1932d29
 11SHA1 (patch-af) = 77e21789e0af1b845c417dabd02e2ad9a5e04239
cvs diff -r1.1.1.1 -r1.2 pkgsrc/chat/anope/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/anope/patches/Attic/patch-aa 2006/10/20 22:40:24 1.1.1.1
+++ pkgsrc/chat/anope/patches/Attic/patch-aa 2009/12/17 20:56:46 1.2
@@ -1,12 +1,50 @@ @@ -1,12 +1,50 @@
1$NetBSD: patch-aa,v 1.1.1.1 2006/10/20 22:40:24 adrianp Exp $ 1$NetBSD: patch-aa,v 1.2 2009/12/17 20:56:46 abs Exp $
2 2
3--- src/Makefile.orig 2005-11-16 23:22:43.000000000 +0000 3--- src/Makefile.orig 2008-01-10 22:31:39.000000000 +0000
4+++ src/Makefile 4+++ src/Makefile
5@@ -111,7 +111,6 @@ install: services 5@@ -108,17 +108,16 @@ spotless:
6 ln $(BINDEST)/services $(BINDEST)/listnicks 6 (cd core ; ${MAKE} distclean)
7 ln $(BINDEST)/services $(BINDEST)/listchans 7
 8 install: services
 9- test -d ${BINDEST} || mkdir ${BINDEST}
 10- $(INSTALL) services $(BINDEST)/services
 11- $(INSTALL) bin/anoperc $(BINDEST)/anoperc
 12- rm -f $(BINDEST)/listnicks $(BINDEST)/listchans
 13- ln $(BINDEST)/services $(BINDEST)/listnicks
 14- ln $(BINDEST)/services $(BINDEST)/listchans
 15+ test -d ${DESTDIR}${BINDEST} || mkdir ${DESTDIR}${BINDEST}
 16+ $(INSTALL) services ${DESTDIR}$(BINDEST)/services
 17+ $(INSTALL) bin/anoperc ${DESTDIR}$(BINDEST)/anoperc
 18+ rm -f ${DESTDIR}$(BINDEST)/listnicks ${DESTDIR}$(BINDEST)/listchans
 19+ ln ${DESTDIR}$(BINDEST)/services ${DESTDIR}$(BINDEST)/listnicks
 20+ ln ${DESTDIR}$(BINDEST)/services ${DESTDIR}$(BINDEST)/listchans
8 (cd ../lang ; $(MAKE) install) 21 (cd ../lang ; $(MAKE) install)
9- $(CP) ../data/* $(DATDEST) 22- $(CP) ../data/* $(DATDEST)
10 $(INSTALL) bin/mydbgen $(DATDEST)/mydbgen 23- $(INSTALL) bin/mydbgen $(DATDEST)/mydbgen
11 test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups 24- test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups
12 test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs 25- test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs
 26+ $(INSTALL) bin/mydbgen ${DESTDIR}$(DATDEST)/mydbgen
 27+ test -d ${DESTDIR}$(DATDEST)/backups || mkdir ${DESTDIR}$(DATDEST)/backups
 28+ test -d ${DESTDIR}$(DATDEST)/logs || mkdir ${DESTDIR}$(DATDEST)/logs
 29 @if [ "$(MODULE_PATH)" ] ; then \
 30 test -d ${MODULE_PATH} || mkdir ${MODULE_PATH} ; \
 31 test -d ${MODULE_PATH}/runtime || mkdir ${MODULE_PATH}/runtime ; \
 32@@ -127,12 +126,12 @@ install: services
 33 (cd core ; ${MAKE} install) ; \
 34 fi
 35 @if [ "$(RUNGROUP)" ] ; then \
 36- echo chgrp -R $(RUNGROUP) $(DATDEST) ; \
 37- chgrp -R $(RUNGROUP) $(DATDEST) ; \
 38- echo chmod -R g+rw $(DATDEST) ; \
 39- chmod -R g+rw $(DATDEST) ; \
 40- echo find $(DATDEST) -type d -exec chmod g+xs \'\{\}\' \\\; ; \
 41- find $(DATDEST) -type d -exec chmod g+xs '{}' \; ; \
 42+ echo chgrp -R $(RUNGROUP) ${DESTDIR}$(DATDEST) ; \
 43+ chgrp -R $(RUNGROUP) ${DESTDIR}$(DATDEST) ; \
 44+ echo chmod -R g+rw ${DESTDIR}$(DATDEST) ; \
 45+ chmod -R g+rw ${DESTDIR}$(DATDEST) ; \
 46+ echo find ${DESTDIR}$(DATDEST) -type d -exec chmod g+xs \'\{\}\' \\\; ; \
 47+ find ${DESTDIR}$(DATDEST) -type d -exec chmod g+xs '{}' \; ; \
 48 fi
 49
 50 DUMMY:
File Added: pkgsrc/chat/anope/patches/Attic/patch-ab
$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:
File Added: pkgsrc/chat/anope/patches/Attic/patch-ac
$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
File Added: pkgsrc/chat/anope/patches/Attic/patch-ad
$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
File Added: pkgsrc/chat/anope/patches/Attic/patch-ae
$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
File Added: pkgsrc/chat/anope/patches/Attic/patch-af
$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: