[csw-devel] SF.net SVN: gar:[4317] csw/mgar/pkg/mysql5/trunk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Wed Apr 15 15:53:17 CEST 2009


Revision: 4317
          http://gar.svn.sourceforge.net/gar/?rev=4317&view=rev
Author:   bdwalton
Date:     2009-04-15 13:53:17 +0000 (Wed, 15 Apr 2009)

Log Message:
-----------
Convert to dynamic gspec, add initial framework for package splitting.

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/trunk/Makefile
    csw/mgar/pkg/mysql5/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.gspec

Modified: csw/mgar/pkg/mysql5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/trunk/Makefile	2009-04-15 12:56:06 UTC (rev 4316)
+++ csw/mgar/pkg/mysql5/trunk/Makefile	2009-04-15 13:53:17 UTC (rev 4317)
@@ -10,9 +10,18 @@
   (Structured Query Language) database server.
 endef
 
+PACKAGES  = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel
+PACKAGES += CSWmysql5rt CSWmysql5test
+
+CATALOGNAME_CSWmysql5 = $(GARNAME)
+CATALOGNAME_CSWmysql5bench = $(GARNAME)bench
+CATALOGNAME_CSWmysql5clien = $(GARNAME)client
+CATALOGNAME_CSWmysql5devel = $(GARNAME)devel
+CATALOGNAME_CSWmysql5rt = $(GARNAME)rt
+CATALOGNAME_CSWmysql5test = $(GARNAME)test
+
 MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/
 DISTFILES  = mysql-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWmysql5,)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -20,8 +29,8 @@
 # Change prefix to /opt/csw/mysql5
 prefix = /opt/csw/mysql5
 
-WORKSRC = $(WORKDIR)/mysql-$(GARVERSION)
-
+# because we alter the prefix.  this gets us proper linking as well as
+# LD_OPTIONS (RPATH)
 EXTRA_LIB = /opt/csw/lib
 
 # Set ./configure options
@@ -42,3 +51,9 @@
 
 include gar/category.mk
 
+post-extract-modulated:
+	@( cd $(WORKDIR); \
+		if test -d mysql-$(GARVERSION); then \
+			mv mysql-$(GARVERSION) $(DISTNAME); \
+		fi; )
+	@$(MAKECOOKIE)
\ No newline at end of file

Modified: csw/mgar/pkg/mysql5/trunk/checksums
===================================================================
--- csw/mgar/pkg/mysql5/trunk/checksums	2009-04-15 12:56:06 UTC (rev 4316)
+++ csw/mgar/pkg/mysql5/trunk/checksums	2009-04-15 13:53:17 UTC (rev 4317)
@@ -1,2 +1 @@
 9c5711e9bea4514df6f2659f283f0aa0  download/mysql-5.1.33.tar.gz
-5a55ac71abe980fe2a909d9712364cae  download/CSWmysql5.gspec

Deleted: csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.gspec
===================================================================
--- csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.gspec	2009-04-15 12:56:06 UTC (rev 4316)
+++ csw/mgar/pkg/mysql5/trunk/files/CSWmysql5.gspec	2009-04-15 13:53:17 UTC (rev 4317)
@@ -1,4 +0,0 @@
-%var            bitname mysql5
-%var            pkgname CSWmysql5
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE


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