[csw-devel] SF.net SVN: gar:[6225] csw/mgar/pkg/cups/branches/cups-1.4

[wahwah at users.sourceforge.net]

Revision: 6225
          http://gar.svn.sourceforge.net/gar/?rev=6225&view=rev
Author:   wahwah
Date:     2009-09-08 11:21:14 +0000 (Tue, 08 Sep 2009)

Log Message:
-----------
cups: Postinstall scripts which fail when the old configuration is present

Modified Paths:
--------------
    csw/mgar/pkg/cups/branches/cups-1.4/Makefile
    csw/mgar/pkg/cups/branches/cups-1.4/checksums

Added Paths:
-----------
    csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall
    csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall

Property Changed:
----------------
    csw/mgar/pkg/cups/branches/cups-1.4/Makefile

Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/Makefile	2009-09-08 07:00:36 UTC (rev 6224)
+++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile	2009-09-08 11:21:14 UTC (rev 6225)
@@ -1,3 +1,7 @@
+# Copyright 2009 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 GARNAME = cups
 GARVERSION = 1.4.0
 CATEGORIES = net
@@ -23,6 +27,8 @@
 
 PATCHFILES = 0001-Makefile.patch
 DISTFILES  = cups-$(GARVERSION)-source.tar.bz2 $(PATCHFILES)
+DISTFILES += CSWcupsclient.postinstall
+DISTFILES += CSWcupsd.postinstall
 DISTFILES += CSWcupsd.postremove
 
 PREREQUISITE_PKGS  = CSWggettext
@@ -36,7 +42,6 @@
 PREREQUISITE_PKGS += SUNWlibm
 PREREQUISITE_PKGS += SUNWslpu
 
-# We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = cups-(\d+(?:\.\d+)*)-source.tar.bz2
 
 SPKG_CLASSES = none cswcpsampleconf cswinitsmf
@@ -108,8 +113,6 @@
 PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5
 PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7
 
-
-
 SPKG_DESC_CSWcups = Common Unix Printing System
 SPKG_DESC_CSWlibcups = CUPS libraries
 SPKG_DESC_CSWcupsd = CUPS daemon
@@ -122,7 +125,6 @@
     $$$$3 ~ /\/cupsd\.conf\.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
     { print }'
 
-
 LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib
 
 CONFIGURE_ARGS  = $(DIRPATHS) --enable-pdftops


Property changes on: csw/mgar/pkg/cups/branches/cups-1.4/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/pkg/cups/branches/cups-1.4/checksums
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/checksums	2009-09-08 07:00:36 UTC (rev 6224)
+++ csw/mgar/pkg/cups/branches/cups-1.4/checksums	2009-09-08 11:21:14 UTC (rev 6225)
@@ -1,3 +1,5 @@
 682e10ff0ab0e094c3de2061369038bc  download/0001-Makefile.patch
+236c432ef6c8f0e93f634276278f3c4c  download/CSWcupsclient.postinstall
+236c432ef6c8f0e93f634276278f3c4c  download/CSWcupsd.postinstall
 ca7718998e56c320c08a77cfefe046f6  download/CSWcupsd.postremove
 bc5e777d4320cecdd1a64de8035171a8  download/cups-1.4.0-source.tar.bz2

Added: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall	                        (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.postinstall	2009-09-08 11:21:14 UTC (rev 6225)
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $Id$
+#
+
+if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then
+  echo
+  echo "The old configuration directory /opt/csw/etc/cup exists."
+  echo "Please move your configuration to /etc/opt/csw/cups."
+  echo
+  exit 1
+fi

Added: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall	                        (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.postinstall	2009-09-08 11:21:14 UTC (rev 6225)
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $Id$
+#
+
+if [ -d "${PKG_INSTALL_ROOT}/opt/csw/etc/cups" ]; then
+  echo
+  echo "The old configuration directory /opt/csw/etc/cup exists."
+  echo "Please move your configuration to /etc/opt/csw/cups."
+  echo
+  exit 1
+fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.