[csw-devel] SF.net SVN: gar:[18692] csw/mgar/pkg/namazu/trunk

pfelecan at users.sourceforge.net pfelecan at users.sourceforge.net
Tue Jul 10 11:57:53 CEST 2012 

Revision: 18692
          http://gar.svn.sourceforge.net/gar/?rev=18692&view=rev
Author:   pfelecan
Date:     2012-07-10 09:57:53 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
namazu/trunk: verified and validated overrides

Modified Paths:
--------------
    csw/mgar/pkg/namazu/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/namazu/trunk/files/0001-Adapt-to-OpenCSW-environment.patch

Modified: csw/mgar/pkg/namazu/trunk/Makefile
===================================================================
--- csw/mgar/pkg/namazu/trunk/Makefile	2012-07-10 07:14:21 UTC (rev 18691)
+++ csw/mgar/pkg/namazu/trunk/Makefile	2012-07-10 09:57:53 UTC (rev 18692)
@@ -14,27 +14,73 @@
   (The Japanese word 'Namazu' means 'catfish' in English.) 
 endef
 
-MASTER_SITES = http://namazu.org/stable/
-DISTFILES  = $(DISTNAME).tar.gz
+MASTER_SITES	=	http://namazu.org/stable/
+DISTFILES  		=	$(DISTNAME).tar.gz
+PATCHFILES		+=	0001-Adapt-to-OpenCSW-environment.patch
 
 GARCOMPILER		=	GNU
 
 CONFIGURE_ARGS	=	$(DIRPATHS)
 CONFIGURE_ARGS	+=	--enable-tknamazu
+CONFIGURE_ARGS	+=	--with-indexdir=$(localstatedir)/$(NAME)/index
 
 BUILD_DEP_PKGS		+=	CSWkakasi-dev
 BUILD_DEP_PKGS		+=	CSWlibiconv-dev
 BUILD_DEP_PKGS		+=	CSWlynx
 BUILD_DEP_PKGS		+=	CSWpm-file-mmagic
+BUILD_DEP_PKGS		+=	CSWemacs
+BUILD_DEP_PKGS		+=	CSWtcl
 
 TEST_SCRIPTS		=	custom
 
-RUNTIME_DEP_PKGS	+=	CSWkakasi
-RUNTIME_DEP_PKGS	+=	CSWlibintl8
-RUNTIME_DEP_PKGS	+=	CSWlynx
-RUNTIME_DEP_PKGS	+=	CSWperl
-RUNTIME_DEP_PKGS	+=	CSWpm-file-mmagic
+PACKAGES							+=	CSWnamazu
+CATALOGNAME_CSWnamazu				=	namazu
+SPKG_DESC_CSWnamazu					=	$(DESCRIPTION)
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/opt/csw/share/tknamazu/tknamazu.hlp.ja_JP.SJIS
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/opt/csw/share/tknamazu/tknamazu.hlp.ja
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/opt/csw/share/tknamazu/tknamazu.hlp.en
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/opt/csw/share/doc/namazu/ChangeLog
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/opt/csw/share/doc/namazu/INSTALL-ja
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/opt/csw/share/doc/namazu/INSTALL
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/opt/csw/share/doc/namazu/ja/manual.html
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/opt/csw/share/doc/namazu/ja/tutorial.html
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/opt/csw/share/doc/namazu/en/manual.html
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/opt/csw/share/doc/namazu/en/tutorial.html
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/local|root/etc/opt/csw/namazu/namazurc-sample
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/share|root/opt/csw/bin/tknamazu
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/share|root/opt/csw/share/tknamazu/tknamazurc
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/share|root/opt/csw/share/tknamazu/tknamazu.hlp.ja_JP.SJIS
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/share|root/opt/csw/share/tknamazu/tknamazu.hlp.ja
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/share|root/opt/csw/share/tknamazu/tknamazu.hlp.en
+CHECKPKG_OVERRIDES_CSWnamazu		+=	file-with-bad-content|/usr/share|root/opt/csw/share/doc/namazu/ChangeLog
+RUNTIME_DEP_PKGS_CSWnamazu			+=	CSWkakasi
+RUNTIME_DEP_PKGS_CSWnamazu			+=	CSWlibintl8
+RUNTIME_DEP_PKGS_CSWnamazu			+=	CSWlynx
+RUNTIME_DEP_PKGS_CSWnamazu			+=	CSWperl
+RUNTIME_DEP_PKGS_CSWnamazu			+=	CSWpm-file-mmagic
+RUNTIME_DEP_PKGS_CSWnamazu			+=	CSWtcl
+RUNTIME_DEP_PKGS_CSWnamazu			+=	CSWlibnmz7
+CHECKPKG_OVERRIDES_CSWnamazu		+=	surplus-dependency|CSWlibmz7
+CHECKPKG_OVERRIDES_CSWnamazu		+=	surplus-dependency|CSWkakasi
+CHECKPKG_OVERRIDES_CSWnamazu		+=	surplus-dependency|CSWlynx
+CHECKPKG_OVERRIDES_CSWnamazu		+=	surplus-dependency|CSWpm-file-mmagic
 
+PACKAGES							+=	CSWlibnmz7
+CATALOGNAME_CSWlibnmz7				=	libnmz7
+PKGFILES_CSWlibnmz7					+=	$(call baseisadirs,$(libdir),libnmz\.so\.7\.1\.3)
+PKGFILES_CSWlibnmz7					+=	$(call baseisadirs,$(libdir),libnmz\.so\.7(\.\d+)*)
+SPKG_DESC_CSWlibnmz7				+=	$(DESCRIPTION), libnmz.so.7
+
+PACKAGES							+=	CSWnamazu-dev
+CATALOGNAME_CSWnamazu-dev			=	namazu_dev
+SPKG_DESC_CSWnamazu-dev				+=	$(DESCRIPTION), development files
+PKGFILES_CSWnamazu-dev				+=	/opt/csw/lib/libnmz.so
+PKGFILES_CSWnamazu-dev				+=	$(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWnamazu-dev		+=	CSWlibnmz7
+CHECKPKG_OVERRIDES_CSWnamazu-dev	+=	surplus-dependency|CSWlibmz7
+ARCHALL__CSWnamazu-dev				=	1
+CHECKPKG_OVERRIDES_CSWnamazu-dev	+=	archall-devel-package
+
 include gar/category.mk
 
 # one of the tests fails: mknmz-11; decided to not block on it...
@@ -42,12 +88,16 @@
 	-$(MAKE) -k -C $(WORKSRC) check
 	$(MAKECOOKIE)
 
+post-install-modulated: errdocdir = $(DESTDIR)/$(datadir)/$(NAME)
+post-install-modulated: errdocdir1 = $(errdocdir)/doc
+post-install-modulated: errdocdir2 = $(errdocdir)/etc
+post-install-modulated: pkgdocdir = $(DESTDIR)/$(docdir)/$(NAME)
 post-install-modulated:
-	ginstall --directory $(DESTDIR)/$(docdir)/$(NAME)
-	mv $(DESTDIR)/$(datadir)/$(NAME)/doc/* $(DESTDIR)/$(docdir)/$(NAME)
-	rmdir $(DESTDIR)/$(datadir)/$(NAME)/doc
-	mv $(DESTDIR)/$(datadir)/$(NAME)/etc/* $(DESTDIR)/$(docdir)/$(NAME)
-	rmdir $(DESTDIR)/$(datadir)/$(NAME)/etc
+	ginstall --directory $(pkgdocdir)
+	mv $(errdocdir1)/* $(pkgdocdir)
+	rmdir $(errdocdir1)
+	mv $(errdocdir2)/* $(pkgdocdir)
+	rmdir $(errdocdir2)
 	$(MAKECOOKIE)
 
 # this is private and not available publicly

Added: csw/mgar/pkg/namazu/trunk/files/0001-Adapt-to-OpenCSW-environment.patch
===================================================================
--- csw/mgar/pkg/namazu/trunk/files/0001-Adapt-to-OpenCSW-environment.patch	                        (rev 0)
+++ csw/mgar/pkg/namazu/trunk/files/0001-Adapt-to-OpenCSW-environment.patch	2012-07-10 09:57:53 UTC (rev 18692)
@@ -0,0 +1,56 @@
+From 5299e0f46150b59b8deb0f1d2b0271df059e9c32 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 10 Jul 2012 11:46:42 +0200
+Subject: [PATCH] Adapt to OpenCSW environment
+
+---
+ tknamazu/tknamazu.tcl.in |    2 +-
+ tknamazu/tknamazurc.in   |    8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tknamazu/tknamazu.tcl.in b/tknamazu/tknamazu.tcl.in
+index 2656392..9321ee6 100644
+--- a/tknamazu/tknamazu.tcl.in
++++ b/tknamazu/tknamazu.tcl.in
+@@ -41,7 +41,7 @@ proc SetDefaultResources {} {
+ 	set conf(UNCOMPRESS) {@ZCAT@}
+ 	set conf(MANPAGE) {@GROFF@}
+ 	set conf(MANPAGEFILTER) {}
+-	set conf(MANPATH) {/usr/local/man /usr/share/man /usr/bin/man /usr/man /usr/X11R6/man /usr/openwin/man}
++	set conf(MANPATH) {/opt/csw/share/man /usr/share/man /usr/bin/man /usr/man /usr/X11R6/man /usr/openwin/man}
+ 	set conf(GNUINFO) {@INFO@}
+ 	set conf(GNUINFOFILTER) {}
+ 	set conf(GNUINFOTMP) {/tmp/.gnuinfotmp}
+diff --git a/tknamazu/tknamazurc.in b/tknamazu/tknamazurc.in
+index 74d3265..c5eae1f 100644
+--- a/tknamazu/tknamazurc.in
++++ b/tknamazu/tknamazurc.in
+@@ -35,7 +35,7 @@ MANPAGEFILTER
+ 
+ # manual \xA4򸡺\x{1E4E64}\xEB path \xA4򥹥ڡ\xBC\xA5\xB9\xA4Ƕ\xE8\xC0ڤä\xC6\xCE\xF3\xB5󤷤Ƥ\xAF\xA4\xC0\xA4\xB5\xA4\xA4\xA1\xA3
+ # \xA4\xC1\xA4ʤߤ˺\xB8¦\xA4˽񤤤\xBF path \xA4\xAB\xA4\xE9\xBD\xE7\xC8֤˸\xA1\xBA\x{1E4D64}\xEC\xA4ޤ\xB9\xA1\xA3
+-MANPATH			/usr/local/man /usr/share/man /usr/bin/man /usr/man /usr/X11R6/man /usr/openwin/man
++MANPATH			/opt/csw/share/man /usr/share/man /usr/bin/man /usr/man /usr/X11R6/man /usr/openwin/man
+ 
+ # info \xA4Τ\xA2\xA4\xEB\xBD\xEA\xA4\xF2 full path \xA4ǻ\xD8\xC4ꤷ\xA4Ƥ\xAF\xA4\xC0\xA4\xB5\xA4\xA4\xA1\xA3
+ GNUINFO			@INFO@
+@@ -109,13 +109,13 @@ THOUGHTFULFIND
+ # NMZ.* \xA4Τ\xA2\xA4\xEB\xBE\xEC\xBD\xEA\xA4\xF2 Index Selecter \xA4\xCB\xC0\xDF\xC4ꤷ\xA4ޤ\xB9\xA1\xA3
+ # \xB0\xEC\xA4\xC4\xCCܤ\xCF title \xA4򡢤\xBD\xA4θ\xE5\xA4\xED\xA4\xCB<SPACE>\xA4Ƕ\xE8\xC0ڤä\xC6 NMZ.i \xA4\xCE directory \xA4\xF2\xCE\xF3\xB5󤷤\xC6
+ # \xB2\xBC\xA4\xB5\xA4\xA4\xA1\xA3
+-INDEXES1		main /usr/local/var/namazu/index
+-INDEXES2		hogehoge /usr/local/var/namazu/index/hogehoge
++INDEXES1		main /var/opt/csw/namazu/index
++INDEXES2		hogehoge /var/opt/csw/namazu/index/hogehoge
+ 
+ # \xC9\xD1\xC8ˤ˥\xA2\xA5\xAF\xA5\xBB\xA5\xB9\xA4\xB9\xA4\xEB file \xA4\xE4 URL \xA4\xF2\xC5\xD0Ͽ\xA4\xB9\xA4뤳\xA4Ȥ\xAC\xA4Ǥ\xAD\xA4ޤ\xB9\xA1\xA3
+ # \xB0\xEC\xA4\xC4\xCCܤ\xCF title \xA4򡢤\xBD\xA4θ\xE5\xA4\xED\xA4\xCB<SPACE>\xA4Ƕ\xE8\xC0ڤä\xC6 full path \xA4Υե\xA1\xA5\xA4\xA5\xEB̾\xA4\xE4
+ # URL \xA4\xF2\xBD񤤤Ʋ\xBC\xA4\xB5\xA4\xA4\xA1\xA3
+-BOOKMARKS1		Namazu-manual /usr/local/share/namazu/doc/ja/manual.html
++BOOKMARKS1		Namazu-manual /opt/csw/share/doc/namazu/ja/manual.html
+ BOOKMARKS2		Namazu-Homepage http://www.namazu.org/
+ 
+ 
+-- 
+1.7.10.3
+

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

More information about the devel mailing list