[csw-devel] SF.net SVN: gar:[7117] csw/mgar/pkg/texinfo/trunk

[dmichelsen at users.sourceforge.net]

Revision: 7117
          http://gar.svn.sourceforge.net/gar/?rev=7117&view=rev
Author:   dmichelsen
Date:     2009-11-05 10:10:53 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
texinfo: Rework revision and make sure existing .info-files are registered

Modified Paths:
--------------
    csw/mgar/pkg/texinfo/trunk/Makefile
    csw/mgar/pkg/texinfo/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall

Modified: csw/mgar/pkg/texinfo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/texinfo/trunk/Makefile	2009-11-05 09:51:37 UTC (rev 7116)
+++ csw/mgar/pkg/texinfo/trunk/Makefile	2009-11-05 10:10:53 UTC (rev 7117)
@@ -1,7 +1,5 @@
 GARNAME = texinfo
-RELEASE = a
-GARVERSION = 4.13
-DISTVERSION = $(GARVERSION)$(RELEASE)
+GARVERSION = 4.13a
 CATEGORIES = utils
 
 DESCRIPTION = The GNU Documentation System
@@ -11,7 +9,8 @@
 endef
 
 MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(GARNAME)-$(DISTVERSION).tar.gz
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += CSWtexinfo.postinstall
 DISTFILES += mkdirentries
 
 SPKG_SOURCEURL = http://www.gnu.org/software/texinfo/
@@ -20,12 +19,16 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 REQUIRED_PKGS = CSWbash CSWgsed CSWncurses CSWiconv CSWggettextrt
+# CSWgzip is needed for zdiff
+PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWgzip
 
+DISTNAME = $(GARNAME)-4.13
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # /opt/csw/lib is added automatically during the build and the
 # required libraries don't offer optimized versions, hence no $ISALIST.
-RUNPATH_LINKER_FLAGS =
+NORUNPATH = 1
 
 TEST_TARGET = check
 
@@ -33,12 +36,13 @@
 
 include gar/category.mk
 
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
-
 post-extract-modulated:
 	perl -pi -e "s(#! /bin/sh)(#!/opt/csw/bin/bash)" $(WORKSRC)/util/texi2dvi
 	@$(MAKECOOKIE)
 
+# Some older packages execute this on postinstall.
+# It can be removed when the last package using this has been updated with the
+# cswtexinfo class.
 post-install-modulated:
 	ginstall -d $(DESTDIR)$(sbindir)
 	ginstall -m 755 $(WORKDIR)/mkdirentries $(DESTDIR)$(sbindir)/mkdirentries

Modified: csw/mgar/pkg/texinfo/trunk/checksums
===================================================================
--- csw/mgar/pkg/texinfo/trunk/checksums	2009-11-05 09:51:37 UTC (rev 7116)
+++ csw/mgar/pkg/texinfo/trunk/checksums	2009-11-05 10:10:53 UTC (rev 7117)
@@ -1,2 +1,3 @@
-71ba711519209b5fb583fed2b3d86fcb  download/texinfo-4.13a.tar.gz
-f5860ae7b0ff06605975c93e2f59fc07  download/mkdirentries
+e125eda2f15f31ec8d4b0d34be449aae  CSWtexinfo.postinstall
+f5860ae7b0ff06605975c93e2f59fc07  mkdirentries
+71ba711519209b5fb583fed2b3d86fcb  texinfo-4.13a.tar.gz

Copied: csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall (from rev 6855, csw/mgar/pkg/texinfo/trunk/files/mkdirentries)
===================================================================
--- csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall	                        (rev 0)
+++ csw/mgar/pkg/texinfo/trunk/files/CSWtexinfo.postinstall	2009-11-05 10:10:53 UTC (rev 7117)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+BASE=${PKG_INSTALL_ROOT}/opt/csw
+
+echo "Registering existing texinfo-files..."
+
+FILES=`ls $BASE/share/info/*.info $BASE/share/info/*.info-*`
+
+for i in $FILES; do
+        /opt/csw/bin/install-info $i $BASE/share/info/dir 2> /dev/null
+done
+


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