diff options
| author | sbd <sbd@pkgsrc.org> | 2011-11-14 01:23:26 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2011-11-14 01:23:26 +0000 |
| commit | 14fa361de8cd2d33a263f160a243c2744b3f76b7 (patch) | |
| tree | bcd4de00f00e43cd6d5810f7bf9b0eeea951a86b /print | |
| parent | 134c7e0af9561d9a5c0c937a045044eeb1c9bf86 (diff) | |
| download | pkgsrc-14fa361de8cd2d33a263f160a243c2744b3f76b7.tar.gz | |
Skip installing the config files in the ${INSTALL_TARGET} stage, instead
install them in the post-install target.
This allows the destdir stage-install target to run as non root.
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/Makefile | 5 | ||||
| -rw-r--r-- | print/cups/distinfo | 3 | ||||
| -rw-r--r-- | print/cups/patches/patch-conf_Makefile | 21 |
3 files changed, 25 insertions, 4 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 225fef5e826..f98d144eaa0 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.184 2011/11/13 21:49:17 sbd Exp $ +# $NetBSD: Makefile,v 1.185 2011/11/14 01:23:26 sbd Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -160,10 +160,9 @@ post-install: ${DESTDIR}${DOCDIR}/$${file}; \ done ${RUN} for file in cupsd.conf snmp.conf ; do \ - ${MV} -f ${DESTDIR}${CUPS_CONFDIR}/$${file} \ + ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \ ${DESTDIR}${EGDIR}/$${file}; \ done - ${RM} -f ${DESTDIR}${CUPS_CONFDIR}/cupsd.conf.default .if !empty(PKG_OPTIONS:Mpam) ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR} .endif diff --git a/print/cups/distinfo b/print/cups/distinfo index 15cd610119e..1b107581d64 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.86 2011/11/13 21:49:17 sbd Exp $ +$NetBSD: distinfo,v 1.87 2011/11/14 01:23:26 sbd Exp $ SHA1 (cups-1.5.0-source.tar.bz2) = 628f549867751e373fc20c7558fec422f9eb942b RMD160 (cups-1.5.0-source.tar.bz2) = e7be9b6b44428561609c59abaea8fa31a11aefff @@ -14,6 +14,7 @@ SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971 SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7 SHA1 (patch-at) = bbda891ed0820e23fe7f6fe3dd5326eeda5b3b2e SHA1 (patch-au) = 6d9b086f2e043bc87d07e3657e46e8cf2fbfeb59 +SHA1 (patch-conf_Makefile) = 9bb4106e9fecaed2ba9bb67b7989f2ac9a9494fc SHA1 (patch-config-scripts_cups-gssapi.m4) = a3505afd30f0864e3022d8f65c810b9614d82cf4 SHA1 (patch-filter_image-gif.c) = 2269cbf7e42ec80ba91c27eda4871884775f4b7a SHA1 (patch-scheduler_dirsvc.c) = 62c6b47522a60b9f8042421e4a9d25a5dfa47c47 diff --git a/print/cups/patches/patch-conf_Makefile b/print/cups/patches/patch-conf_Makefile new file mode 100644 index 00000000000..87737691be0 --- /dev/null +++ b/print/cups/patches/patch-conf_Makefile @@ -0,0 +1,21 @@ +$NetBSD: patch-conf_Makefile,v 1.1 2011/11/14 01:23:27 sbd Exp $ + +Don't install the config files (leave it up to pkgsrc). + +--- conf/Makefile.orig 2011-05-12 05:21:56.000000000 +0000 ++++ conf/Makefile +@@ -70,14 +70,6 @@ install: all install-data install-header + # + + install-data: +- for file in $(KEEP); do \ +- if test -r $(SERVERROOT)/$$file ; then \ +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \ +- else \ +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ +- fi ; \ +- done +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default + $(INSTALL_DIR) -m 755 $(DATADIR)/mime + for file in $(REPLACE); do \ + if test -r $(DATADIR)/mime/$$file ; then \ |