summaryrefslogtreecommitdiff
path: root/print/cups
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2013-05-09 09:38:19 +0000
committerjperkin <jperkin@pkgsrc.org>2013-05-09 09:38:19 +0000
commit728ccbf95ced33587ed98e4c7a8b017f88fe2246 (patch)
tree8661daa1780dfbd070597629598dd4a375d4feea /print/cups
parented9ed9d6bc3b03f08d9fa7ee9cbc3e7b602d86e2 (diff)
downloadpkgsrc-728ccbf95ced33587ed98e4c7a8b017f88fe2246.tar.gz
Don't create backup files.
Diffstat (limited to 'print/cups')
-rw-r--r--print/cups/distinfo4
-rw-r--r--print/cups/patches/patch-conf_Makefile14
2 files changed, 13 insertions, 5 deletions
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 5fa49463307..f5b3454c389 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2013/02/12 14:12:19 jperkin Exp $
+$NetBSD: distinfo,v 1.95 2013/05/09 09:38:19 jperkin Exp $
SHA1 (cups-1.5.4-source.tar.bz2) = cb39961cbaf1851a47694828ad9a7cdf4da51fbd
RMD160 (cups-1.5.4-source.tar.bz2) = 9d6a7fd69d3036ec1f3dfd9c70672a2c6fb517b6
@@ -14,7 +14,7 @@ SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971
SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7
SHA1 (patch-at) = bbda891ed0820e23fe7f6fe3dd5326eeda5b3b2e
SHA1 (patch-au) = 0d1d3cf255b996c96b0ea798f46b08523ef22a60
-SHA1 (patch-conf_Makefile) = 9bb4106e9fecaed2ba9bb67b7989f2ac9a9494fc
+SHA1 (patch-conf_Makefile) = 5b5d45abc1e8d6b73a1ad6b7a7098714d4c55395
SHA1 (patch-config-scripts_cups-gssapi.m4) = a3505afd30f0864e3022d8f65c810b9614d82cf4
SHA1 (patch-ppdc_Makefile) = 7dcc34217557a4c6f42064b61abf593bd7620b60
SHA1 (patch-scheduler_auth.c) = 2056f20500e3c6e857f9dd2c83709c15be38fe0e
diff --git a/print/cups/patches/patch-conf_Makefile b/print/cups/patches/patch-conf_Makefile
index 87737691be0..9e7f80da96f 100644
--- a/print/cups/patches/patch-conf_Makefile
+++ b/print/cups/patches/patch-conf_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-conf_Makefile,v 1.1 2011/11/14 01:23:27 sbd Exp $
+$NetBSD: patch-conf_Makefile,v 1.2 2013/05/09 09:38:20 jperkin 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
+@@ -70,22 +70,8 @@ install: all install-data install-header
#
install-data:
@@ -18,4 +18,12 @@ Don't install the config files (leave it up to pkgsrc).
- $(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 \
+- if test -r $(DATADIR)/mime/$$file ; then \
+- $(MV) $(DATADIR)/mime/$$file $(DATADIR)/mime/$$file.O ; \
+- fi ; \
+- if test -r $(SERVERROOT)/$$file ; then \
+- $(MV) $(SERVERROOT)/$$file $(DATADIR)/mime/$$file.O ; \
+- fi ; \
+ $(INSTALL_DATA) $$file $(DATADIR)/mime ; \
+ done
+ -if test x$(PAMDIR) != x; then \