[csw-devel] SF.net SVN: gar:[16436] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Dec 9 11:26:26 CET 2011


Revision: 16436
          http://gar.svn.sourceforge.net/gar/?rev=16436&view=rev
Author:   dmichelsen
Date:     2011-12-09 10:26:26 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
libgsf1: Factor out legacy library

Added Paths:
-----------
    csw/mgar/pkg/libgsf1/
    csw/mgar/pkg/libgsf1/trunk/Makefile
    csw/mgar/pkg/libgsf1/trunk/checksums
    csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.i386
    csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.sparc
    csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.i386
    csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.sparc

Removed Paths:
-------------
    csw/mgar/pkg/libgsf1/trunk/Makefile
    csw/mgar/pkg/libgsf1/trunk/checksums
    csw/mgar/pkg/libgsf1/trunk/files/fixme.sh
    csw/mgar/pkg/libgsf1/trunk/files/fixme2.sh
    csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.i
    csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.s
    csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.i
    csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.s

Deleted: csw/mgar/pkg/libgsf1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgsf/trunk/Makefile	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/libgsf1/trunk/Makefile	2011-12-09 10:26:26 UTC (rev 16436)
@@ -1,48 +0,0 @@
-NAME = libgsf
-VERSION = 1.14.11
-CATEGORIES = gnome
-
-DESCRIPTION = GNOME Structured File Library
-define BLURB
-	The GNOME Structured File Library (GSF) is an I/O abstraction for
-	reading/writing compound files. GSF is released under the GNU Lesser
-	General Public License (GNU LGPL), which allows for flexible licensing of
-	client applications. 
-endef
-
-MASTER_SITES = $(GNOME_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-
-BUILD_DEP_PKGS += CSWgnulinks CSWgtk-doc CSWglib2devel CSWlibxml2devel
-
-RUNTIME_DEP_PKGS += CSWbonobo2 CSWbzip2 CSWgconf2 CSWggettextrt CSWglib2
-RUNTIME_DEP_PKGS += CSWgnomevfs2 CSWlibxml2 CSWorbit2 CSWzlib
-
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-EXTRA_LD_OPTIONS = -L../gsf/.libs -L../../gsf/.libs
-
-CONFIGURE_ARGS = $(DIRPATHS)
-#CONFIGURE_ARGS = "PATH=$(NPATH)" $(DIRPATHS)
-#CONFIGURE_ARGS += --enable-gtk-doc=no
-#CONFIGURE_ARGS += --disable-man-gtk-doc
-
-TEST_TARGET = check
-
-# Missing 64-bit libs:
-# libgnomevfs-2.so libgconf-2.so libbonobo-2.so libbonobo-activation.so
-#BUILD64 = 1
-
-STRIP_LIBTOOL = 1
-
-include gar/category.mk
-
-PATH := /opt/csw/gnu:$(PATH)
-
-post-install-isa-sparcv8:
-	@cp -p $(FILEDIR)/libgsf-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-1.so.1
-	@cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.s $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1
-
-post-install-isa-i386:
-	@cp -p $(FILEDIR)/libgsf-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-1.so.1
-	@cp -p $(FILEDIR)/libgsf-gnome-1.so.1.9.1.i $(INSTALLISADIR)$(libdir)/libgsf-gnome-1.so.1

Copied: csw/mgar/pkg/libgsf1/trunk/Makefile (from rev 16434, csw/mgar/pkg/libgsf/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/libgsf1/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libgsf1/trunk/Makefile	2011-12-09 10:26:26 UTC (rev 16436)
@@ -0,0 +1,49 @@
+NAME = libgsf
+VERSION = 1.9.1
+CATEGORIES = gnome
+
+DESCRIPTION = GNOME Structured File Library
+define BLURB
+	The GNOME Structured File Library (GSF) is an I/O abstraction for
+	reading/writing compound files. GSF is released under the GNU Lesser
+	General Public License (GNU LGPL), which allows for flexible licensing of
+	client applications. 
+endef
+
+DISTFILES += libgsf-1.so.1.9.1.i386
+DISTFILES += libgsf-1.so.1.9.1.sparc
+DISTFILES += libgsf-gnome-1.so.1.9.1.i386
+DISTFILES += libgsf-gnome-1.so.1.9.1.sparc
+
+VENDOR_URL = http://ftp.gnome.org/pub/GNOME/sources/libgsf/
+
+PACKAGES += CSWlibgsf
+SPKG_DESC_CSWlibgsf = GNOME structured file library, legacy libgsf-1.so.1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibgsf += CSWorbit2
+RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibz-dev
+RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibintl3
+RUNTIME_DEP_PKGS_CSWlibgsf += CSWbonobo2
+RUNTIME_DEP_PKGS_CSWlibgsf += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibgsf += CSWgnomevfs2
+RUNTIME_DEP_PKGS_CSWlibgsf += CSWglib2
+
+# This is old crud, just override
+CHECKPKG_OVERRIDES_CSWlibgsf += license-missing|/opt/csw/share/doc/libgsf/license
+CHECKPKG_OVERRIDES_CSWlibgsf += bad-rpath-entry|/usr/ucblib|opt/csw/lib/libgsf-gnome-1.so.1
+CHECKPKG_OVERRIDES_CSWlibgsf += shared-lib-pkgname-mismatch
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -d $(DESTDIR)$(libdir)
+	ginstall $(WORKDIR)/libgsf-1.so.1.9.1.$(GARCH) $(DESTDIR)$(libdir)/libgsf-1.so.1
+	ginstall $(WORKDIR)/libgsf-gnome-1.so.1.9.1.$(GARCH) $(DESTDIR)$(libdir)/libgsf-gnome-1.so.1
+	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/libgsf1/trunk/checksums
===================================================================
--- csw/mgar/pkg/libgsf/trunk/checksums	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/libgsf1/trunk/checksums	2011-12-09 10:26:26 UTC (rev 16436)
@@ -1 +0,0 @@
-7d6fa1c26ebb58dcf2128c3b9c7d1a2a  libgsf-1.14.11.tar.gz

Copied: csw/mgar/pkg/libgsf1/trunk/checksums (from rev 16434, csw/mgar/pkg/libgsf/trunk/checksums)
===================================================================
Deleted: csw/mgar/pkg/libgsf1/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/libgsf/trunk/files/fixme.sh	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/libgsf1/trunk/files/fixme.sh	2011-12-09 10:26:26 UTC (rev 16436)
@@ -1,51 +0,0 @@
-#!/bin/bash
-####################################################
-#
-#  fixme.sh
-#  Intended to remove the use of libtool's 
-#  pseudo-libraries for opencsw builds.
-#
-#  Author: Mike Watters  mwatters_at_opencsw.org
-#  Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
-    gecho "USAGE: $(basename $0) WORKSRC"
-    exit 1
-fi
-BASEPATH=$1
-
-## Fix Makefiles
-for mk in $(gfind ${BASEPATH} -name Makefile -print); do
-    LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
-        gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-    
-    for file in ${LT_FILES}; do
-        LIB_NAME=$(ggrep 'dlname=' ${file} | \
-            gsed -e "s/.*'\(.*\)'/\1/" \
-                -e "s/^lib//" \
-                -e "s/\.so.*$//")
-        fixpath=$(gecho $file |gsed 's/\//\\\//g')
-        gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
-        gmv Makefile.new ${mk}
-        gchmod +x ${mk}
-    done
-done
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
-    gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
-    gmv ${lt}.new ${lt}
-    gchmod +x ${lt}
-done
-
-for LTMAIN in $(gfind ${BASEPATH} -name ltmain.sh -print); do
-    gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
-    gmv ${LTMAIN}.new ${LTMAIN}
-    gchmod +x ${LTMAIN}
-done
-

Deleted: csw/mgar/pkg/libgsf1/trunk/files/fixme2.sh
===================================================================
--- csw/mgar/pkg/libgsf/trunk/files/fixme2.sh	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/libgsf1/trunk/files/fixme2.sh	2011-12-09 10:26:26 UTC (rev 16436)
@@ -1,29 +0,0 @@
-#!/bin/bash
-####################################################
-#
-#  fixme2.sh
-#  Intended to patch libtool so relink isn't
-#  performend during install
-# 
-#  Loosely based on Mike Watters fixme.sh
-#
-#  Author: Roger Hakansson hson at opencsw.org
-#  Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
-    gecho "USAGE: $(basename $0) WORKSRC"
-    exit 1
-fi
-BASEPATH=$1
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
-    gsed 's/test "$mode" != relink && rpath/rpath/' ${lt} > ${lt}.new
-    gmv ${lt}.new ${lt}
-    gchmod +x ${lt}
-done

Deleted: csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.i
===================================================================
(Binary files differ)

Copied: csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.i386 (from rev 16195, csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.i)
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.s
===================================================================
(Binary files differ)

Copied: csw/mgar/pkg/libgsf1/trunk/files/libgsf-1.so.1.9.1.sparc (from rev 16195, csw/mgar/pkg/libgsf/trunk/files/libgsf-1.so.1.9.1.s)
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.i
===================================================================
(Binary files differ)

Copied: csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.i386 (from rev 16195, csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.i)
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.s
===================================================================
(Binary files differ)

Copied: csw/mgar/pkg/libgsf1/trunk/files/libgsf-gnome-1.so.1.9.1.sparc (from rev 16195, csw/mgar/pkg/libgsf/trunk/files/libgsf-gnome-1.so.1.9.1.s)
===================================================================
(Binary files differ)

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