[csw-devel] SF.net SVN: gar:[13414] csw/mgar/pkg/gd/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Sun Feb 20 13:58:59 CET 2011


Revision: 13414
          http://gar.svn.sourceforge.net/gar/?rev=13414&view=rev
Author:   dmichelsen
Date:     2011-02-20 12:58:59 +0000 (Sun, 20 Feb 2011)

Log Message:
-----------
gd: Build against SUNW X11 again, use /opt/csw/... fontpath, split packages

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

Removed Paths:
-------------
    csw/mgar/pkg/gd/trunk/files/Makefile.diff
    csw/mgar/pkg/gd/trunk/files/fixme.sh

Modified: csw/mgar/pkg/gd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gd/trunk/Makefile	2011-02-20 12:34:15 UTC (rev 13413)
+++ csw/mgar/pkg/gd/trunk/Makefile	2011-02-20 12:58:59 UTC (rev 13414)
@@ -17,23 +17,47 @@
 
 PACKAGES = CSWgd
 CATALOGNAME_CSWgd = gd
-SPKG_DESC_CSWgd = $(DESCRIPTION)
+SPKG_DESC_CSWgd = Utilities facilitating libgd for dynamic image creation
+# PKGFILES is catchall
+RUNTIME_DEP_pkgs_CSWgd = CSWlibgd2
+RUNTIME_DEP_PKGS_CSWgd += CSWiconv
+RUNTIME_DEP_PKGS_CSWgd += CSWpng
+RUNTIME_DEP_PKGS_CSWgd += CSWjpeg
+RUNTIME_DEP_PKGS_CSWgd += CSWzlib
+RUNTIME_DEP_PKGS_CSWgd += CSWftype2
+RUNTIME_DEP_PKGS_CSWgd += CSWlibgd2
+RUNTIME_DEP_PKGS_CSWgd += CSWxpm
+RUNTIME_DEP_PKGS_CSWgd += CSWfconfig
 
-#PATCHFILES = Makefile.diff
+PACKAGES += CSWlibgd2
+CATALOGNAME_CSWlibgd2 = libgd2
+SPKG_DESC_CSWlibgd2 = A library used for dynamic image creation providing libgd.so.2
+PKGFILES_CSWlibgd2 = $(call baseisadirs,$(libdir),libgd\.so\.2(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWiconv 
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWjpeg
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWpng
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWxpm
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWzlib
 
-RUNTIME_DEP_PKGS_CSWgd  = CSWexpat CSWfconfig CSWftype2 CSWiconv 
-RUNTIME_DEP_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib CSWlibx11
-RUNTIME_DEP_PKGS_CSWgd += CSWlibxpm
+PACKAGES += CSWlibgd-dev
+CATALOGNAME_CSWlibgd-dev = libgd_dev
+SPKG_DESC_CSWlibgd-dev = Development files for libgd.so
+PKGFILES_CSWlibgd-dev = $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibgd-dev = CSWlibgd2
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
+CSW_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype
+
+# This is evaluated twice, quote properly
+EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(CSW_DEFAULT_FONTPATH)\\\"
+
 BUILD64 = 1
+NOISAEXEC = 1
 STRIP_LIBTOOL = 1
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix)
 CONFIGURE_ARGS += --with-png=$(prefix)
@@ -43,18 +67,30 @@
 CONFIGURE_ARGS += --with-xpm=$(prefix)
 CONFIGURE_ARGS += --disable-fast-install
 
-## There are no tests for this
-TEST_SCRIPTS = skip
+# GD does not have a testsuite
+TEST_SCRIPTS =
 
+MERGE_DIRS_isa-extra = $(libdir)
+
+# This is ok as there are a number of search pathes for fonts in there.
+# We made sure that the $CSW_DEFAULT_FONTPATH is the first one in the list.
+CHECKPKG_OVERRIDES_CSWlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gd.h
+
 include gar/category.mk
 
-test-skip:
-	$(DONADA)
+# Make sure GDFONTPATH is set correctly
+post-extract-modulated:
+	perl -pi -e 's,/usr/share/fonts/truetype,$(CSW_DEFAULT_FONTPATH),' \
+		$(WORKSRC)/gdtestft.c \
+		$(WORKSRC)/annotate.c
+	perl -pi -e 's,(DEFAULT_FONTPATH\s+"),\1$(CSW_DEFAULT_FONTPATH):,' \
+		$(WORKSRC)/gd.h
+	@$(MAKECOOKIE)
 
+# The shipped libtool doesn't know about Sun Studio C++ compiler 'CC'
 pre-configure-modulated:
 	grm -f $(WORKSRC)/config/ltmain.sh
 	gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh
-	cd $(WORKSRC); aclocal
-	cd $(WORKSRC); automake
+	cd $(WORKSRC) && aclocal && automake
 	@$(MAKECOOKIE)
 

Deleted: csw/mgar/pkg/gd/trunk/files/Makefile.diff
===================================================================
--- csw/mgar/pkg/gd/trunk/files/Makefile.diff	2011-02-20 12:34:15 UTC (rev 13413)
+++ csw/mgar/pkg/gd/trunk/files/Makefile.diff	2011-02-20 12:58:59 UTC (rev 13414)
@@ -1,10 +0,0 @@
---- gd-2.0.35/Makefile.in.orig	2009-02-20 16:42:35.992955622 -0600
-+++ gd-2.0.35/Makefile.in	2009-02-20 16:42:39.401892868 -0600
-@@ -399,6 +399,7 @@
- 	cd $(top_srcdir) && $(AUTOHEADER)
- 	rm -f stamp-h1
-+	@$(srcdir)../fixme.sh $(srcdir)
- 	touch $@
- 
- distclean-hdr:
- 	-rm -f config.h stamp-h1

Deleted: csw/mgar/pkg/gd/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/gd/trunk/files/fixme.sh	2011-02-20 12:34:15 UTC (rev 13413)
+++ csw/mgar/pkg/gd/trunk/files/fixme.sh	2011-02-20 12:58:59 UTC (rev 13414)
@@ -1,52 +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
-    gcp ${mk} ${mk}.orig
-    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}
-    done
-done
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
-    gcp ${lt} ${lt}.orig
-    gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
-    gmv ${lt}.new ${lt}
-done
-
-LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print)
-gcp ${LTMAIN} ${LTMAIN}.orig
-if [ -f ${LTMAIN} ]; then
-    gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
-    gmv ${LTMAIN}.new ${LTMAIN}
-fi
-


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