[csw-devel] SF.net SVN: gar:[2573] csw/mgar/pkg/openjade/trunk

[bdwalton at users.sourceforge.net]

Revision: 2573
          http://gar.svn.sourceforge.net/gar/?rev=2573&view=rev
Author:   bdwalton
Date:     2008-12-13 18:53:19 +0000 (Sat, 13 Dec 2008)

Log Message:
-----------
now builds properly under gar v2

Modified Paths:
--------------
    csw/mgar/pkg/openjade/trunk/Makefile
    csw/mgar/pkg/openjade/trunk/checksums
    csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec

Removed Paths:
-------------
    csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend

Modified: csw/mgar/pkg/openjade/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjade/trunk/Makefile	2008-12-13 18:14:37 UTC (rev 2572)
+++ csw/mgar/pkg/openjade/trunk/Makefile	2008-12-13 18:53:19 UTC (rev 2573)
@@ -3,7 +3,10 @@
 PATCHLEVEL = 27
 CATEGORIES = apps
 
-PREREQUISITES = CSWopensp
+PREREQUISITE_PKGS = CSWopensp
+REQUIRED_PKGS = CSWgcc3core CSWgcc3corert CSWgcc3g++ CSWgcc3g++rt
+REQUIRED_PKGS += CSWggettext CSWiconv CSWopensp CSWsgmlcommon
+REQUIRED_PKGS += CSWxmlcommon
 
 DESCRIPTION = A DSSSL implementation.
 define BLURB
@@ -17,14 +20,15 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWopenjade,depend postinstall preremove)
+DISTFILES += $(call admfiles,CSWopenjade,postinstall preremove)
 
 PATCHFILES = openjade-1.3.1-nsl.patch
 
-# use gnu c/c++ for this one...(matches opensp and the c++ doesn't want to
-# play with sun_cc...)
-GARCOMPILER = GNU
-GNU_CC_HOME = /opt/csw/gcc3
+# Use gcc3 to build this.  a) it matches opensp b) the c++ used has
+# some issues w/sun c++ and c) gcc4 generates object files that get
+# the sun linker upset.  [we could likely force gld or a strip in the
+# middle somewhere, but this works too.]
+GARCOMPILER = GCC3
 
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 CONFIGURE_ARGS += --datadir=$(datadir)/sgml/$(GARNAME)-$(GARVERSION)
@@ -36,13 +40,16 @@
 
 include gar/category.mk
 
+#squish the pesky post strip la files...
+MERGE_EXCLUDE_DEFAULT += $(libdir)/.*\.la\~
+
 sgmldir = $(DESTDIR)/$(datadir)/sgml/$(GARNAME)-$(GARVERSION)
 sgmldoc = $(DESTDIR)/$(docdir)/$(GARNAME)
 INSTALL = /opt/csw/bin/ginstall -c
 INSTALL_DATA = $(INSTALL) -m 0644
 INSTALL_DIR = $(INSTALL) -m 0755 -d
 
-post-install:
+post-install-modulated:
 	@echo Installing catalog files.
 	@( cd $(WORKSRC); \
 		$(INSTALL_DIR) $(sgmldir)/; \
@@ -55,7 +62,6 @@
 		touch $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).soc; \
 		ln -s $(GARNAME)-$(GARVERSION)-$(PATCHLEVEL).soc $(GARNAME).soc; \
 	)
-	
 	@echo Installing docs.
 	@( cd $(WORKSRC); \
 		$(INSTALL_DIR) $(sgmldoc); \
@@ -65,4 +71,4 @@
 		$(INSTALL_DATA) dsssl/README.jadetex $(sgmldoc)/; \
 		$(INSTALL_DATA) README COPYING VERSION $(sgmldoc)/; \
 	)
-	@$(MAKECOOKIE)
\ No newline at end of file
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/openjade/trunk/checksums
===================================================================
--- csw/mgar/pkg/openjade/trunk/checksums	2008-12-13 18:14:37 UTC (rev 2572)
+++ csw/mgar/pkg/openjade/trunk/checksums	2008-12-13 18:53:19 UTC (rev 2573)
@@ -1,6 +1,5 @@
 7df692e3186109cc00db6825b777201e  download/openjade-1.3.2.tar.gz
-3bceb78eeb9bdb38e98e75c6fb20714e  download/CSWopenjade.gspec
-ea3dd2c469bf7e8efd183f82b743c90f  download/CSWopenjade.depend
+12f647d82faad16570aa84667ca9ed61  download/CSWopenjade.gspec
 a31c09c1e08da2712e87446762d9fcdc  download/CSWopenjade.postinstall
 b35aca62389881efb0c0ebb296d9ae14  download/CSWopenjade.preremove
 ca3a0ff43d8ed182f432d723927cd2e9  download/openjade-1.3.1-nsl.patch

Deleted: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend
===================================================================
--- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend	2008-12-13 18:14:37 UTC (rev 2572)
+++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.depend	2008-12-13 18:53:19 UTC (rev 2573)
@@ -1,12 +0,0 @@
-P CSWcommon common - common files and dirs for CSW packages
-P CSWgcc3core gcc3core - GNU C Compiler
-P CSWgcc3corert gcc3corert - GNU C Compiler Run Time
-P CSWgcc3g++ gcc3g++ - GNU C++ Compiler
-P CSWgcc3g++rt gcc3g++rt - GNU C++ Compiler Run Time
-P CSWgcc4corert gcc4corert - GNU C Compiler Run Time
-P CSWgcc4g++rt gcc4g++rt - GNU C++ Compiler Run Time
-P CSWggettext ggettext - GNU gettext
-P CSWiconv libiconv - GNU iconv library
-P CSWopensp opensp - a SGML parser called OpenSP
-P CSWsgmlcommon sgmlcommon - A collection of entities and DTDs
-P CSWxmlcommon xmlcommon - A collection of entities and DTDs

Modified: csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec
===================================================================
--- csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec	2008-12-13 18:14:37 UTC (rev 2572)
+++ csw/mgar/pkg/openjade/trunk/files/CSWopenjade.gspec	2008-12-13 18:53:19 UTC (rev 2573)
@@ -1,4 +1,4 @@
 %var            bitname openjade
 %var            pkgname CSWopenjade
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING


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