[csw-devel] SF.net SVN: gar:[10050] csw/mgar/pkg/gd/branches

[dmichelsen at users.sourceforge.net]

Revision: 10050
          http://gar.svn.sourceforge.net/gar/?rev=10050&view=rev
Author:   dmichelsen
Date:     2010-05-31 13:28:21 +0000 (Mon, 31 May 2010)

Log Message:
-----------
gd/x11-reloaded: Rebuild against SUNW x11

Modified Paths:
--------------
    csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile

Added Paths:
-----------
    csw/mgar/pkg/gd/branches/gd-x11-reloaded/

Removed Paths:
-------------
    csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/Makefile.diff
    csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/fixme.sh

Modified: csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile
===================================================================
--- csw/mgar/pkg/gd/trunk/Makefile	2010-05-31 06:16:45 UTC (rev 10049)
+++ csw/mgar/pkg/gd/branches/gd-x11-reloaded/Makefile	2010-05-31 13:28:21 UTC (rev 10050)
@@ -16,24 +16,16 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 
 PACKAGES = CSWgd
-CATALOGNAME_CSWgd = gd
-SPKG_DESC_CSWgd = $(DESCRIPTION)
+CATALOGNAME = gd
 
-#PATCHFILES = Makefile.diff
+RUNTIME_DEP_PKGS_CSWgd  = CSWfconfig CSWftype2 CSWiconv 
+RUNTIME_DEP_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib
 
-RUNTIME_DEP_PKGS_CSWgd  = CSWexpat CSWfconfig CSWftype2 CSWiconv 
-RUNTIME_DEP_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib CSWlibx11
-RUNTIME_DEP_PKGS_CSWgd += CSWlibxpm
-
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 BUILD64 = 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,14 +35,11 @@
 CONFIGURE_ARGS += --with-xpm=$(prefix)
 CONFIGURE_ARGS += --disable-fast-install
 
-## There are no tests for this
-TEST_SCRIPTS = skip
+# There are no tests for this
+TEST_SCRIPTS =
 
 include gar/category.mk
 
-test-skip:
-	$(DONADA)
-
 pre-configure-modulated:
 	grm -f $(WORKSRC)/config/ltmain.sh
 	gcp /opt/csw/share/libtool/config/ltmain.sh $(WORKSRC)/config/ltmain.sh

Deleted: csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/Makefile.diff
===================================================================
--- csw/mgar/pkg/gd/trunk/files/Makefile.diff	2010-05-31 06:16:45 UTC (rev 10049)
+++ csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/Makefile.diff	2010-05-31 13:28:21 UTC (rev 10050)
@@ -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/branches/gd-x11-reloaded/files/fixme.sh
===================================================================
--- csw/mgar/pkg/gd/trunk/files/fixme.sh	2010-05-31 06:16:45 UTC (rev 10049)
+++ csw/mgar/pkg/gd/branches/gd-x11-reloaded/files/fixme.sh	2010-05-31 13:28:21 UTC (rev 10050)
@@ -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.