[csw-devel] SF.net SVN: gar:[5693] csw/mgar/pkg/wgetpaste/trunk

[wahwah at users.sourceforge.net]

Revision: 5693
          http://gar.svn.sourceforge.net/gar/?rev=5693&view=rev
Author:   wahwah
Date:     2009-07-28 17:34:41 +0000 (Tue, 28 Jul 2009)

Log Message:
-----------
wgetpaste: Adding a sample configuration file

Modified Paths:
--------------
    csw/mgar/pkg/wgetpaste/trunk/Makefile
    csw/mgar/pkg/wgetpaste/trunk/checksums
    csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste-2.13.patch

Added Paths:
-----------
    csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste.conf

Modified: csw/mgar/pkg/wgetpaste/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/Makefile	2009-07-28 17:05:45 UTC (rev 5692)
+++ csw/mgar/pkg/wgetpaste/trunk/Makefile	2009-07-28 17:34:41 UTC (rev 5693)
@@ -10,16 +10,25 @@
 
 MASTER_SITES = http://wgetpaste.zlin.dk/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES += wgetpaste.conf
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
-REQUIRED_PKGS = CSWshutils CSWwget
+REQUIRED_PKGS = CSWshutils CSWwget CSWcswclassutils
 
 PATCHFILES = wgetpaste-$(GARVERSION).patch
 
 ARCHALL = 1
 
+sysconfdir = /etc/opt/csw
+
+SPKG_CLASSES = none cswcpsampleconf
+PROTOTYPE_FILTER  = awk ' \
+  $$$$3 ~ /\/wgetpaste.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
+  { print }'
+
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
@@ -29,6 +38,8 @@
 install-wgetpaste:
 	ginstall -d $(DESTDIR)$(bindir)
 	ginstall -m 755 $(WORKSRC)/wgetpaste $(DESTDIR)$(bindir)
+	ginstall -d $(DESTDIR)$(sysconfdir)
+	ginstall -m 644 $(FILEDIR)/wgetpaste.conf $(DESTDIR)$(sysconfdir)/wgetpaste.conf.CSW
 	@$(MAKECOOKIE)
 
 include gar/category.mk

Modified: csw/mgar/pkg/wgetpaste/trunk/checksums
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/checksums	2009-07-28 17:05:45 UTC (rev 5692)
+++ csw/mgar/pkg/wgetpaste/trunk/checksums	2009-07-28 17:34:41 UTC (rev 5693)
@@ -1,2 +1,3 @@
-df0addd7863263a717fd8a10f3dd3cff  download/wgetpaste-2.13.patch
+8d328f55faaa8eee181c9083f2c0525b  download/wgetpaste-2.13.patch
 a341c778d745b0a7ad11163a4a2c1ea9  download/wgetpaste-2.13.tar.bz2
+0190f763d0469253d125cdf97df21cf5  download/wgetpaste.conf

Modified: csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste-2.13.patch
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste-2.13.patch	2009-07-28 17:05:45 UTC (rev 5692)
+++ csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste-2.13.patch	2009-07-28 17:34:41 UTC (rev 5693)
@@ -1,6 +1,38 @@
 diff -ru wgetpaste-2.13.orig/wgetpaste wgetpaste-2.13/wgetpaste
 --- wgetpaste-2.13.orig/wgetpaste	2009-07-28 14:38:30.336410148 +0100
-+++ wgetpaste-2.13/wgetpaste	2009-07-28 14:39:32.398048919 +0100
++++ wgetpaste-2.13/wgetpaste	2009-07-28 18:28:16.513748108 +0100
+@@ -99,7 +99,7 @@
+ noxclip() {
+ 	cat <<EOF >&2
+ Could not find xclip on your system. In order to use --x$1 you must either
+-emerge x11-misc/xclip or define x_$1() globally in /etc/wgetpaste.conf or
++emerge x11-misc/xclip or define x_$1() globally in /etc/opt/csw/wgetpaste.conf/g or
+ per user in ~/.wgetpaste.conf to use another program (such as e.g. xcut or
+ klipper) to $2 your clipboard.
+ 
+@@ -288,11 +288,11 @@
+         --debug                   be *very* verbose (implies -v)
+ 
+     -h, --help                    show this help
+-    -g, --ignore-configs          ignore /etc/wgetpaste.conf, ~/.wgetpaste.conf etc.
++    -g, --ignore-configs          ignore /etc/opt/csw/wgetpaste.conf/g, ~/.wgetpaste.conf etc.
+         --version                 show version information
+ 
+ Defaults (DEFAULT_{NICK,SERVICE,LANGUAGE,EXPIRATION}[_\${SERVICE}]) can be overridden
+-globally in /etc/wgetpaste.conf or /etc/wgetpaste.d/*.conf or per user in any of
++globally in /etc/opt/csw/wgetpaste.conf/g or /etc/wgetpaste.d/*.conf or per user in any of
+ ~/.wgetpaste.conf or ~/.wgetpaste.d/*.conf.
+ EOF
+ }
+@@ -568,7 +568,7 @@
+ 	if [[ ! $IGNORECONFIGS ]]; then
+ 		# compatibility code
+ 		local f deprecated=
+-		for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do
++		for f in {/etc/,/etc/opt/csw/,~/.}wgetpaste{.d/*.bash,}; do
+ 			if [[ -f $f ]]; then
+ 				if [[ -z $deprecated ]]; then
+ 					echo "The config files for wgetpaste have changed to *.conf.$N" >&2
 @@ -589,7 +589,7 @@
  }
  load_configs

Added: csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste.conf
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste.conf	                        (rev 0)
+++ csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste.conf	2009-07-28 17:34:41 UTC (rev 5693)
@@ -0,0 +1,14 @@
+# Put this into /etc/wgetpaste.conf or ~/.wgetpaste.conf to set some defaults
+
+# set default nick
+# DEFAULT_NICK=zlin
+
+# change the default service
+# DEFAULT_SERVICE="zlin"
+
+# change default language for the ca and the osl services
+# DEFAULT_LANGUAGE_ca="Bash"
+# DEFAULT_LANGUAGE_osl="Diff"
+
+# change default expiration period for the ca service
+# DEFAULT_EXPIRATION_ca="1 week"


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