Wed Mar 10 12:54:27 2010 UTC ()
Add user-destdir installation support.


(obache)
diff -r1.35 -r1.36 pkgsrc/news/nntpcache/Makefile
diff -r1.6 -r1.7 pkgsrc/news/nntpcache/distinfo
diff -r0 -r1.1 pkgsrc/news/nntpcache/patches/patch-ag
diff -r0 -r1.1 pkgsrc/news/nntpcache/patches/patch-ah
diff -r0 -r1.1 pkgsrc/news/nntpcache/patches/patch-ai
diff -r0 -r1.1 pkgsrc/news/nntpcache/patches/patch-aj
diff -r0 -r1.1 pkgsrc/news/nntpcache/patches/patch-ak
diff -r0 -r1.1 pkgsrc/news/nntpcache/patches/patch-al

cvs diff -r1.35 -r1.36 pkgsrc/news/nntpcache/Makefile (expand / switch to unified diff)

--- pkgsrc/news/nntpcache/Makefile 2009/05/19 08:59:29 1.35
+++ pkgsrc/news/nntpcache/Makefile 2010/03/10 12:54:27 1.36
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile,v 1.35 2009/05/19 08:59:29 wiz Exp $ 1# $NetBSD: Makefile,v 1.36 2010/03/10 12:54:27 obache Exp $
2 2
3DISTNAME= nntpcache-3.0.2 3DISTNAME= nntpcache-3.0.2
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= news 5CATEGORIES= news
6MASTER_SITES= http://www.xs4all.nl/~suelette/ 6MASTER_SITES= http://www.xs4all.nl/~suelette/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://iq.org/~proff/nntpcache.org/ 9HOMEPAGE= http://iq.org/~proff/nntpcache.org/
10COMMENT= NNTP multi-server caching daemon 10COMMENT= NNTP multi-server caching daemon
11LICENSE= nntpcache-license 11LICENSE= nntpcache-license
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
14 16
15NNTPCACHE_USER?= news 17NNTPCACHE_USER?= news
16NNTPCACHE_GROUP?= news 18NNTPCACHE_GROUP?= news
17PKG_GROUPS= ${NNTPCACHE_GROUP} 19PKG_GROUPS= ${NNTPCACHE_GROUP}
18PKG_USERS= ${NNTPCACHE_USER}:${NNTPCACHE_GROUP} 20PKG_USERS= ${NNTPCACHE_USER}:${NNTPCACHE_GROUP}
19PKG_GROUPS_VARS+= NNTPCACHE_GROUP 21PKG_GROUPS_VARS+= NNTPCACHE_GROUP
20PKG_USERS_VARS+= NNTPCACHE_USER 22PKG_USERS_VARS+= NNTPCACHE_USER
21 23
22NNTPCACHE_DIR= ${VARBASE}/spool/nntpcache 24NNTPCACHE_DIR= ${VARBASE}/spool/nntpcache
23 25
24REQD_DIRS_PERMS+= ${NNTPCACHE_DIR} ${NNTPCACHE_USER} ${NNTPCACHE_GROUP} 700 26REQD_DIRS_PERMS+= ${NNTPCACHE_DIR} ${NNTPCACHE_USER} ${NNTPCACHE_GROUP} 700
25 27

cvs diff -r1.6 -r1.7 pkgsrc/news/nntpcache/distinfo (expand / switch to unified diff)

--- pkgsrc/news/nntpcache/distinfo 2006/10/17 20:28:01 1.6
+++ pkgsrc/news/nntpcache/distinfo 2010/03/10 12:54:27 1.7
@@ -1,11 +1,17 @@ @@ -1,11 +1,17 @@
1$NetBSD: distinfo,v 1.6 2006/10/17 20:28:01 schwarz Exp $ 1$NetBSD: distinfo,v 1.7 2010/03/10 12:54:27 obache Exp $
2 2
3SHA1 (nntpcache-3.0.2.tar.gz) = f4c9916040422e7232971a0098d0b29fe947ac14 3SHA1 (nntpcache-3.0.2.tar.gz) = f4c9916040422e7232971a0098d0b29fe947ac14
4RMD160 (nntpcache-3.0.2.tar.gz) = 03c191fbedd9325c12033493d57e01b5c5ecd5a9 4RMD160 (nntpcache-3.0.2.tar.gz) = 03c191fbedd9325c12033493d57e01b5c5ecd5a9
5Size (nntpcache-3.0.2.tar.gz) = 1077641 bytes 5Size (nntpcache-3.0.2.tar.gz) = 1077641 bytes
6SHA1 (patch-aa) = 0cb955759a116c1695d2ff38e26fce8e7cda3610 6SHA1 (patch-aa) = 0cb955759a116c1695d2ff38e26fce8e7cda3610
7SHA1 (patch-ab) = 50115636a2d3266b41090a509167c35a4985c9c4 7SHA1 (patch-ab) = 50115636a2d3266b41090a509167c35a4985c9c4
8SHA1 (patch-ac) = 74f4e3ec58342e9d689768baf31e251e568f2db6 8SHA1 (patch-ac) = 74f4e3ec58342e9d689768baf31e251e568f2db6
9SHA1 (patch-ad) = 060112715712bcdbcd052cd9d7557a558518c305 9SHA1 (patch-ad) = 060112715712bcdbcd052cd9d7557a558518c305
10SHA1 (patch-ae) = 18e60bc8822be64f76348d9fbee7bd406eae5106 10SHA1 (patch-ae) = 18e60bc8822be64f76348d9fbee7bd406eae5106
11SHA1 (patch-af) = 12e1d4d4344c71391784417e830b2037f69e1af8 11SHA1 (patch-af) = 12e1d4d4344c71391784417e830b2037f69e1af8
 12SHA1 (patch-ag) = cb57d850aea3656020e9644d03475b114deee52f
 13SHA1 (patch-ah) = 6bce71dca150248e06531fa643d7d99c89be0162
 14SHA1 (patch-ai) = 1f0932b40c5086c24e982210b016feece2445502
 15SHA1 (patch-aj) = fe9cdde25e373ac15b0d34e072bea0dd5a66fab7
 16SHA1 (patch-ak) = ce93c536ef92ee75243f825fa45e9f2647a569e1
 17SHA1 (patch-al) = ab9046ad74ee1a834ddcc5ac601d03aa2eef1d84

File Added: pkgsrc/news/nntpcache/patches/patch-ag
$NetBSD: patch-ag,v 1.1 2010/03/10 12:54:27 obache Exp $

pkgsrc take care permissons for directories and files.
need to user-destdir installation.

--- cf/Makefile.in.orig	2006-03-05 21:49:25.000000000 +0000
+++ cf/Makefile.in
@@ -271,15 +271,11 @@ VERSION:
 	echo @VERSION@ >$@
 
 install-data-hook:
-	for f in $(distf); do { cd $(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
+	for f in $(distf); do { cd $(DESTDIR)$(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
 
 nntpcache.config-dist : nnconf.cf
 	sed -e 's/^ *[a-zA-Z_][a-zA-Z_]* //;s/"//g' <nnconf.cf >$@
 
-# this is ugly, but more flexible than merely redefining INSTALL_DATA
-install-data-local:
-	cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
-	cd $(localstatedir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(localstate_DATA) && chown @nntpcacheUID@ $(localstate_DATA) && chgrp @nntpcacheGID@ $(localstate_DATA)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

File Added: pkgsrc/news/nntpcache/patches/patch-ah
$NetBSD: patch-ah,v 1.1 2010/03/10 12:54:27 obache Exp $

destdir installation support

--- src/Makefile.in.orig	2010-03-10 12:15:22.000000000 +0000
+++ src/Makefile.in
@@ -454,7 +454,7 @@ uninstall-am: uninstall-info-am uninstal
 
 
 install-exec-hook:
-	cp nntpcached $(libexecdir)/nntpcached.debug && chmod a+x $(libexecdir)/nntpcached.debug
+	cp nntpcached $(DESTDIR)$(libexecdir)/nntpcached.debug && chmod a+x $(DESTDIR)$(libexecdir)/nntpcached.debug
 
 nnconf.c nnconf.h : ../cf/nnconf.cf
 	$(top_srcdir)/confused/confused $<

File Added: pkgsrc/news/nntpcache/patches/patch-ai
$NetBSD: patch-ai,v 1.1 2010/03/10 12:54:27 obache Exp $

pkgsrc take care permissons for directories and files.
need to user-destdir installation.

--- http/Makefile.in.orig	2010-03-10 12:20:48.000000000 +0000
+++ http/Makefile.in
@@ -216,10 +216,8 @@ uninstall-am: uninstall-info-am
 
 
 install-data-local:
-	-mkdir $(sysconfdir)/http
-	cp $(httpdata) $(sysconfdir)/http
-	cd $(sysconfdir)/http && chown @nntpcacheUID@ $(ch)
-	cd $(sysconfdir)/http && chgrp @nntpcacheUID@ $(ch)
+	-mkdir $(DESTDIR)$(sysconfdir)/http
+	cp $(httpdata) $(DESTDIR)$(sysconfdir)/http
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

File Added: pkgsrc/news/nntpcache/patches/patch-aj
$NetBSD: patch-aj,v 1.1 2010/03/10 12:54:27 obache Exp $

pkgsrc take care permissons for directories and files.
need to user-destdir installation.

--- pgp/Makefile.in.orig	2010-03-10 12:26:40.000000000 +0000
+++ pgp/Makefile.in
@@ -236,10 +236,9 @@ uninstall-am: uninstall-info-am uninstal
 
 # the trailing slash is to force symlink transversal
 install-data-local:
-	cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
 
 install-data-hook:
-	for f in $(sysconf_DATA); do { cd $(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
+	for f in $(sysconf_DATA); do { cd $(DESTDIR)$(sysconfdir) && (orig=`basename $$f -dist`; test -e $$orig || cp $$f $$orig) ;} done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

File Added: pkgsrc/news/nntpcache/patches/patch-ak
$NetBSD: patch-ak,v 1.1 2010/03/10 12:54:27 obache Exp $

pkgsrc take care permissons for directories and files.
need to user-destdir installation.

--- innreport/Makefile.in.orig	2010-03-10 12:26:40.000000000 +0000
+++ innreport/Makefile.in
@@ -265,10 +265,7 @@ uninstall-am: uninstall-info-am uninstal
 
 # the trailing slash is to force symlink transversal
 install-data-local:
-	cd $(sysconfdir) && chmod 700 . && chown @nntpcacheUID@ . && chgrp @nntpcacheUID@ . && chmod 600 $(sysconf_DATA) && chown @nntpcacheUID@ $(sysconf_DATA) && chgrp @nntpcacheGID@ $(sysconf_DATA)
-	-mkdir $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
-	chown @nntpcacheUID@ $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
-	chgrp @nntpcacheGID@ $(sysconfdir)/http $(sysconfdir)/http/innreport $(sysconfdir)/http/innreport/pics
+	-mkdir $(DESTDIR)$(sysconfdir)/http $(DESTDIR)$(sysconfdir)/http/innreport $(DESTDIR)$(sysconfdir)/http/innreport/pics
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

File Added: pkgsrc/news/nntpcache/patches/patch-al
$NetBSD: patch-al,v 1.1 2010/03/10 12:54:27 obache Exp $

pkgsrc take care permissons for directories and files.
need to user-destdir installation.

--- unixauth/Makefile.in.orig	2010-03-10 12:26:40.000000000 +0000
+++ unixauth/Makefile.in
@@ -327,9 +327,6 @@ uninstall-am: uninstall-info-am uninstal
 
 
 install-exec-hook:
-	chown root $(libexecdir)/unixauth
-	chgrp @nntpcacheGID@ $(libexecdir)/unixauth
-	chmod u+s,g+x,o-x $(libexecdir)/unixauth 
 
 %.ext : %.c %.h $(top_srcdir)/config.h $(top_srcdir)/scripts/genextern.sh
 	CPP="$(CPP)";export CPP; sh $(top_srcdir)/scripts/genextern.sh $< > $@.tmp $(DEFS) $(INCLUDES) $(CPPFLAGS) && mv -f $@.tmp $@ || rm -f $@.tmp