Revision: 4922
http://gar.svn.sourceforge.net/gar/?rev=4922&view=rev
Author: valholla
Date: 2009-05-17 20:42:05 +0000 (Sun, 17 May 2009)
Log Message:
-----------
update for latest gar
Modified Paths:
--------------
csw/mgar/pkg/gd/trunk/Makefile
csw/mgar/pkg/gd/trunk/checksums
csw/mgar/pkg/gd/trunk/files/fixme.sh
Modified: csw/mgar/pkg/gd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gd/trunk/Makefile 2009-05-17 20:28:37 UTC (rev 4921)
+++ csw/mgar/pkg/gd/trunk/Makefile 2009-05-17 20:42:05 UTC (rev 4922)
@@ -14,13 +14,12 @@
MASTER_SITES = http://www.libgd.org/releases/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += fixme.sh
PACKAGES = CSWgd
CATALOGNAME_CSWgd = gd
SPKG_DESC_CSWgd = $(DESCRIPTION)
-PATCHFILES = Makefile.diff
+#PATCHFILES = Makefile.diff
REQUIRED_PKGS_CSWgd = CSWexpat CSWfconfig CSWftype2 CSWiconv
REQUIRED_PKGS_CSWgd += CSWjpeg CSWpng CSWxpm CSWzlib
@@ -30,7 +29,7 @@
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
BUILD64 = 1
-NO_ISAEXEC = 0
+STRIP_LIBTOOL = 1
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix)
@@ -41,15 +40,16 @@
CONFIGURE_ARGS += --with-xpm=$(prefix)
CONFIGURE_ARGS += --disable-fast-install
-post-configure-modulated:
- @(echo "~~~ Fixing Libtool ~~~")
- @$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
- $(DONADA)
-
## There are no tests for this
TEST_SCRIPTS = skip
test-skip:
$(DONADA)
+post-extract-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
+
include gar/category.mk
Modified: csw/mgar/pkg/gd/trunk/checksums
===================================================================
--- csw/mgar/pkg/gd/trunk/checksums 2009-05-17 20:28:37 UTC (rev 4921)
+++ csw/mgar/pkg/gd/trunk/checksums 2009-05-17 20:42:05 UTC (rev 4922)
@@ -1,3 +1,3 @@
+88e69d03742a55f979e2822d97c525c1 download/Makefile.diff
+c9a4f9ee0fdef233a2ab0f5394672f2c download/fixme.sh
6c6c3dbb7bf079e0bb5fbbfd3bb8a71c download/gd-2.0.35.tar.bz2
-41ec540885de7c34625768aa1fb9682b download/fixme.sh
-88e69d03742a55f979e2822d97c525c1 download/Makefile.diff
Modified: csw/mgar/pkg/gd/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/gd/trunk/files/fixme.sh 2009-05-17 20:28:37 UTC (rev
4921)
+++ csw/mgar/pkg/gd/trunk/files/fixme.sh 2009-05-17 20:42:05 UTC (rev
4922)
@@ -21,6 +21,7 @@
## 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/")
@@ -37,11 +38,13 @@
## 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}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
