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

mattdarcy at users.sourceforge.net mattdarcy at users.sourceforge.net
Mon Jun 17 13:21:13 CEST 2013


Revision: 21353
          http://gar.svn.sourceforge.net/gar/?rev=21353&view=rev
Author:   mattdarcy
Date:     2013-06-17 11:21:10 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
BTS test branch for recipe testing - please ignore temporary only

Modified Paths:
--------------
    csw/mgar/pkg/gd/branches/nim/Makefile

Added Paths:
-----------
    csw/mgar/pkg/gd/branches/nim/

Modified: csw/mgar/pkg/gd/branches/nim/Makefile
===================================================================
--- csw/mgar/pkg/gd/trunk/Makefile	2013-06-03 08:51:06 UTC (rev 21242)
+++ csw/mgar/pkg/gd/branches/nim/Makefile	2013-06-17 11:21:10 UTC (rev 21353)
@@ -19,36 +19,36 @@
 
 PATCHFILES += gdkanji.c.patch
 
-PACKAGES = CSWgd
-CATALOGNAME_CSWgd = gd
-SPKG_DESC_CSWgd = Utilities facilitating libgd for dynamic image creation
+PACKAGES = NIMOSSgd
+CATALOGNAME_NIMOSSgd = gd
+SPKG_DESC_NIMOSSgd = Utilities facilitating libgd for dynamic image creation
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWgd += CSWlibgd2
+RUNTIME_DEP_PKGS_NIMOSSgd += NIMOSSlibgd2
 
-PACKAGES += CSWlibgd2
-CATALOGNAME_CSWlibgd2 = libgd2
-SPKG_DESC_CSWlibgd2 = A library used for dynamic image creation providing libgd.so.2
-PKGFILES_CSWlibgd2 += $(call pkgfiles_lib,libgd.so.2)
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibpng15-15
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibxpm4
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibz1
+PACKAGES += NIMOSSlibgd2
+CATALOGNAME_NIMOSSlibgd2 = libgd2
+SPKG_DESC_NIMOSSlibgd2 = A library used for dynamic image creation providing libgd.so.2
+PKGFILES_NIMOSSlibgd2 += $(call pkgfiles_lib,libgd.so.2)
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibfontconfig1
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibfreetype6
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibiconv2
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibjpeg7
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibpng15-15
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibxpm4
+RUNTIME_DEP_PKGS_NIMOSSlibgd2 += NIMOSSlibz1
 
-PACKAGES += CSWlibgd-dev
-CATALOGNAME_CSWlibgd-dev = libgd_dev
-SPKG_DESC_CSWlibgd-dev = Development files for libgd.so.2
-PKGFILES_CSWlibgd-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibgd-dev = CSWlibgd2
+PACKAGES += NIMOSSlibgd-dev
+CATALOGNAME_NIMOSSlibgd-dev = libgd_dev
+SPKG_DESC_NIMOSSlibgd-dev = Development files for libgd.so.2
+PKGFILES_NIMOSSlibgd-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_NIMOSSlibgd-dev = NIMOSSlibgd2
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-CSW_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype
+NIMOSS_DEFAULT_FONTPATH = $(sharedstatedir)/fonts/truetype
 
 # This is evaluated twice, quote properly
-EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(CSW_DEFAULT_FONTPATH)\\\"
+EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(NIMOSS_DEFAULT_FONTPATH)\\\"
 
 BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
@@ -66,17 +66,17 @@
 TEST_SCRIPTS =
 
 # 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
+# We made sure that the $NIMOSS_DEFAULT_FONTPATH is the first one in the list.
+CHECKPKG_OVERRIDES_NIMOSSlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gd.h
 
 include gar/category.mk
 
 # Make sure GDFONTPATH is set correctly
 post-extract-modulated:
-	perl -pi -e 's,/usr/share/fonts/truetype,$(CSW_DEFAULT_FONTPATH),' \
+	perl -pi -e 's,/usr/share/fonts/truetype,$(NIMOSS_DEFAULT_FONTPATH),' \
 		$(WORKSRC)/gdtestft.c \
 		$(WORKSRC)/annotate.c
-	perl -pi -e 's,(DEFAULT_FONTPATH\s+"),\1$(CSW_DEFAULT_FONTPATH):,' \
+	perl -pi -e 's,(DEFAULT_FONTPATH\s+"),\1$(NIMOSS_DEFAULT_FONTPATH):,' \
 		$(WORKSRC)/gd.h
 	@$(MAKECOOKIE)
 

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