[csw-devel] SF.net SVN: gar:[8068] csw/mgar/pkg/libproxy/tags
hson at users.sourceforge.net
hson at users.sourceforge.net
Mon Jan 18 10:34:38 CET 2010
Revision: 8068
http://gar.svn.sourceforge.net/gar/?rev=8068&view=rev
Author: hson
Date: 2010-01-18 09:34:38 +0000 (Mon, 18 Jan 2010)
Log Message:
-----------
libproxy: Tag release version
Added Paths:
-----------
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch
Removed Paths:
-------------
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.15/
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums
csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch
Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile
===================================================================
--- csw/mgar/pkg/libproxy/trunk/Makefile 2010-01-11 15:28:58 UTC (rev 7969)
+++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile 2010-01-18 09:34:38 UTC (rev 8068)
@@ -1,33 +0,0 @@
-GARNAME = libproxy
-GARVERSION = 0.3.0
-CATEGORIES = lib
-
-DESCRIPTION = A library that provides automatic proxy configuration management
-define BLURB
- libproxy exists to answer the question: Given a network resource, how do I
- reach it? It handles all the details, enabling you to get back to programming.
- GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just
- ask libproxy what proxy to use: you get simple code and your users get correct,
- consistant behavior and broad infrastructure compatibility.
-endef
-
-MASTER_SITES = http://libproxy.googlecode.com/files/
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch
-PATCHFILES += 0002-Dont-preset-CFLAGS.patch
-
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
-EXTRA_LINKER_FLAGS = -lnsl
-BUILD64 = 1
-CONFIGURE_ARGS = $(DIRPATHS)
-
-TEST_TARGET = check
-
-include gar/category.mk
-
-# There is actually the cpp executable in /usr/lib
-PATH := $(PATH):/usr/lib
Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile (from rev 8065, csw/mgar/pkg/libproxy/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile (rev 0)
+++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/Makefile 2010-01-18 09:34:38 UTC (rev 8068)
@@ -0,0 +1,100 @@
+GARNAME = libproxy
+GARVERSION = 0.3.0
+CATEGORIES = lib
+
+DESCRIPTION = A library that provides automatic proxy configuration management
+define BLURB
+ libproxy exists to answer the question: Given a network resource, how do I
+ reach it? It handles all the details, enabling you to get back to programming.
+ GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter! Just
+ ask libproxy what proxy to use: you get simple code and your users get correct,
+ consistant behavior and broad infrastructure compatibility.
+endef
+
+MASTER_SITES = http://libproxy.googlecode.com/files/
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += SunStudio-have-no-stdc99-flag.patch
+DISTFILES += Solaris8-have-no-stdc99-flag.patch
+DISTFILES += stdfiles.patch
+DISTFILES += proxy.c.patch
+DISTFILES += 0002-Dont-preset-CFLAGS.patch
+
+PACKAGING_PLATFORMS = solaris8-sparc solaris8-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+
+#PATCHFILES = 0001-Use-xc99-for-Sun-Studio-compiler.patch
+# For Solaris 10 targets
+PATCHFILES_solaris10-sparc += SunStudio-have-no-stdc99-flag.patch
+PATCHFILES_solaris10-i386 += SunStudio-have-no-stdc99-flag.patch
+#For Solaris 8 targets
+PATCHFILES_solaris8-sparc += Solaris8-have-no-stdc99-flag.patch
+PATCHFILES_solaris8-sparc += stdfiles.patch
+PATCHFILES_solaris8-sparc += proxy.c.patch
+PATCHFILES_solaris8-i386_isa-amd64 += SunStudio-have-no-stdc99-flag.patch
+PATCHFILES_solaris8-i386_isa-i386 += Solaris8-have-no-stdc99-flag.patch
+PATCHFILES_solaris8-i386_isa-i386 += stdfiles.patch
+PATCHFILES_solaris8-i386_isa-i386 += proxy.c.patch
+PATCHFILES += $(PATCHFILES_$(PLATFORM))
+PATCHFILES += $(PATCHFILES_$(PLATFORM)_$(MODULATION))
+PATCHFILES += 0002-Dont-preset-CFLAGS.patch
+
+
+PACKAGES = CSWlibproxy CSWlibproxydevel CSWpy-libproxy
+CATALOGNAME_CSWlibproxy = libproxy
+CATALOGNAME_CSWlibproxydevel = libproxy_devel
+CATALOGNAME_CSWpy-libproxy = py_libproxy
+SPKG_DESC_CSWlibproxy = A library that provides automatic proxy configuration management
+SPKG_DESC_CSWlibproxydevel = A library that provides automatic proxy configuration management - development files
+SPKG_DESC_CSWpy-libproxy = A library that provides automatic proxy configuration management - Python bindings
+
+REQUIRED_PKGS_CSWlibproxy += CSWlibice CSWlibsm CSWlibx11 CSWlibxmu CSWlibxt
+REQUIRED_PKGS_CSWlibproxydevel += CSWlibproxy
+REQUIRED_PKGS_CSWpy-libproxy += CSWpython CSWlibproxy
+PREREQUISITE_PKGS += CSWlibx11devel CSWlibxmudevel CSWlibdbusdev
+#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version
+#PREREQUISITE_PKGS += CSWmozilla CSWseamonkey CSWfirefox
+
+PKGFILES_CSWlibproxydevel = $(PKGFILES_DEVEL)
+PKGFILES_CSWpy-libproxy = $(libdir).*/python/site-packages/.*
+
+ARCHALL_CSWpy-libproxy = 1
+
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+#PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+EXTRA_LINKER_FLAGS = -lnsl
+BUILD64 = 1
+
+EXTRA_INC = $(prefix)/X11/include
+EXTRA_LIB = $(prefix)/X11/lib
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version
+#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/lib
+#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/firefox/lib
+#EXTRA_PKG_CONFIG_DIRS += $(prefix)/mozilla/seamonkey/lib
+
+
+CONFIGURE_ARGS = $(DIRPATHS)
+#Disable Mozilla/Firefox/Seamonkey plugin until there is a 64-bit version
+CONFIGURE_ARGS += --without-mozjs
+CONFIGURE_ARGS += --with-python
+CONFIGURE_ARGS += --disable-silent-rules
+
+TEST_TARGET = check
+
+include gar/category.mk
+
+#pre-configure-modulated:
+# @echo " ==> Regenerating build tools..."
+# @(cd $(WORKSRC) ; \
+# aclocal && \
+# autoconf && \
+# libtoolize --automake --force && \
+# aclocal && \
+# automake -a )
+# @$(MAKECOOKIE)
+
+
+# There is actually the cpp executable in /usr/lib
+PATH := $(PATH):/usr/lib
Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums
===================================================================
--- csw/mgar/pkg/libproxy/trunk/checksums 2010-01-11 15:28:58 UTC (rev 7969)
+++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums 2010-01-18 09:34:38 UTC (rev 8068)
@@ -1,3 +0,0 @@
-ce2d836df293fa8183265176459cf87e 0001-Use-xc99-for-Sun-Studio-compiler.patch
-acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch
-6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz
Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums (from rev 8006, csw/mgar/pkg/libproxy/trunk/checksums)
===================================================================
--- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums (rev 0)
+++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/checksums 2010-01-18 09:34:38 UTC (rev 8068)
@@ -0,0 +1,6 @@
+acd3e61f107ff188722fb1335e0ed37c 0002-Dont-preset-CFLAGS.patch
+dd08c0fd4795084e5970d59f8de149dd Solaris8-have-no-stdc99-flag.patch
+95c2645311c9e840c0ed81c7a9aefadb SunStudio-have-no-stdc99-flag.patch
+6ded75a6c6aef53be657ece207cc26c4 libproxy-0.3.0.tar.gz
+647cefd3bb414eb269cb59aace9eb35b proxy.c.patch
+7dd25dd1f615fe7a3c2a1d9c9a179e74 stdfiles.patch
Deleted: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch
===================================================================
--- csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-11 15:28:58 UTC (rev 7969)
+++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-18 09:34:38 UTC (rev 8068)
@@ -1,56 +0,0 @@
-From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 5 Jan 2010 15:29:01 +0100
-Subject: [PATCH] Use xc99 for Sun Studio compiler
-
----
- src/bin/Makefile.am | 2 +-
- src/bin/Makefile.in | 2 +-
- src/lib/Makefile.am | 2 +-
- src/lib/Makefile.in | 2 +-
- src/modules/Makefile.am | 2 +-
- src/modules/Makefile.in | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
-index 625fbb3..ed8cd56 100644
---- a/src/bin/Makefile.in
-+++ b/src/bin/Makefile.in
-@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@
-
- # Command line interface to libproxy
- proxy_SOURCES = proxy.c
--proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99
-+proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99
- proxy_LDADD = ../lib/libproxy.la
- all: all-am
-
-diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
-index 77bb2da..73e087c 100644
---- a/src/lib/Makefile.in
-+++ b/src/lib/Makefile.in
-@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \
- strdict.c strdict.h \
- url.c url.h
-
--libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
-+libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L
- libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
- include_HEADERS = proxy.h
- all: all-am
-diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
-index 6965056..45c9c57 100644
---- a/src/modules/Makefile.in
-+++ b/src/modules/Makefile.in
-@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@
- xmu_CFLAGS = @xmu_CFLAGS@
- xmu_LIBS = @xmu_LIBS@
- moduledir = @MODULEDIR@
--AM_CFLAGS = -std=c99
-+AM_CFLAGS = -xc99
- AM_LDFLAGS = -module -avoid-version -no-undefined
-
- # Which modules to build
---
-1.6.6
-
Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (from rev 8005, csw/mgar/pkg/libproxy/trunk/files/0001-Use-xc99-for-Sun-Studio-compiler.patch)
===================================================================
--- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch (rev 0)
+++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/0001-Use-xc99-for-Sun-Studio-compiler.patch 2010-01-18 09:34:38 UTC (rev 8068)
@@ -0,0 +1,56 @@
+From 3ea26b980c8929de2f92a33de49a09dc12f63a68 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 5 Jan 2010 15:29:01 +0100
+Subject: [PATCH] Use xc99 for Sun Studio compiler
+
+---
+ src/bin/Makefile.am | 2 +-
+ src/bin/Makefile.in | 2 +-
+ src/lib/Makefile.am | 2 +-
+ src/lib/Makefile.in | 2 +-
+ src/modules/Makefile.am | 2 +-
+ src/modules/Makefile.in | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
+index 625fbb3..ed8cd56 100644
+--- a/src/bin/Makefile.in
++++ b/src/bin/Makefile.in
+@@ -239,7 +239,7 @@ xmu_LIBS = @xmu_LIBS@
+
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99
++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99
+ proxy_LDADD = ../lib/libproxy.la
+ all: all-am
+
+diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
+index 77bb2da..73e087c 100644
+--- a/src/lib/Makefile.in
++++ b/src/lib/Makefile.in
+@@ -277,7 +277,7 @@ libproxy_la_SOURCES = \
+ strdict.c strdict.h \
+ url.c url.h
+
+-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L
+ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
+ include_HEADERS = proxy.h
+ all: all-am
+diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
+index 6965056..45c9c57 100644
+--- a/src/modules/Makefile.in
++++ b/src/modules/Makefile.in
+@@ -359,7 +359,7 @@ x11_LIBS = @x11_LIBS@
+ xmu_CFLAGS = @xmu_CFLAGS@
+ xmu_LIBS = @xmu_LIBS@
+ moduledir = @MODULEDIR@
+-AM_CFLAGS = -std=c99
++AM_CFLAGS = -xc99
+ AM_LDFLAGS = -module -avoid-version -no-undefined
+
+ # Which modules to build
+--
+1.6.6
+
Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/Solaris8-have-no-stdc99-flag.patch)
===================================================================
--- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch (rev 0)
+++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/Solaris8-have-no-stdc99-flag.patch 2010-01-18 09:34:38 UTC (rev 8068)
@@ -0,0 +1,134 @@
+diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am
+--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200
++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100
+@@ -2,5 +2,5 @@
+
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99
++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib
+ proxy_LDADD = ../lib/libproxy.la
+diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am
+--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200
++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100
+@@ -10,8 +10,8 @@
+ strdict.c strdict.h \
+ url.c url.h
+
+-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\"
+ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
+
+ include_HEADERS = proxy.h
+
+diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in
+--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200
++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100
+@@ -277,7 +277,7 @@
+ strdict.c strdict.h \
+ url.c url.h
+
+-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\"
+ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
+ include_HEADERS = proxy.h
+ all: all-am
+diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am
+--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200
++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100
+@@ -1,5 +1,5 @@
+ moduledir = @MODULEDIR@
+-AM_CFLAGS = -std=c99
++AM_CFLAGS =
+ AM_LDFLAGS = -module -avoid-version -no-undefined
+
+
+@@ -50,7 +50,7 @@
+
+ # GConf/GNOME Config Module
+ config_gnome_la_SOURCES = config_gnome.c xhasclient.c
+-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@
++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@
+ config_gnome_la_LIBADD = ../lib/libproxy.la
+ config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@
+
+@@ -77,12 +77,12 @@
+
+ # IP Ignore Module
+ ignore_ip_la_SOURCES = ignore_ip.c
+-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L
++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib
+ ignore_ip_la_LIBADD = ../lib/libproxy.la
+
+ # WebKit (JavaScriptCore) based PAC runner
+ pacrunner_webkit_la_SOURCES = pacrunner_webkit.c
+-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L
++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@
+ pacrunner_webkit_la_LIBADD = ../lib/libproxy.la
+ if MINGW32
+ pacrunner_webkit_la_LIBADD += ../platform/win32/libwinutils.la
+@@ -92,7 +92,7 @@
+
+ # Mozilla (Spidermonkey) based PAC runner
+ pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c
+-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L
++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@
+ pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la
+ pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@
+ nodist_pacrunner_mozjs_la_SOURCES = pacutils.h
+diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in
+--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200
++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100
+@@ -359,7 +359,7 @@
+ xmu_CFLAGS = @xmu_CFLAGS@
+ xmu_LIBS = @xmu_LIBS@
+ moduledir = @MODULEDIR@
+-AM_CFLAGS = -std=c99
++AM_CFLAGS =
+ AM_LDFLAGS = -module -avoid-version -no-undefined
+
+ # Which modules to build
+@@ -385,7 +385,7 @@
+
+ # GConf/GNOME Config Module
+ config_gnome_la_SOURCES = config_gnome.c xhasclient.c
+-config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@
++config_gnome_la_CPPFLAGS = -I$(top_srcdir)/src/lib -DGCONFTOOLBIN='"@GCONFTOOLBIN@"' @GNOME_CFLAGS@
+ config_gnome_la_LIBADD = ../lib/libproxy.la
+ config_gnome_la_LDFLAGS = $(AM_LDFLAGS) @GNOME_LIBS@
+
+@@ -412,19 +412,19 @@
+
+ # IP Ignore Module
+ ignore_ip_la_SOURCES = ignore_ip.c
+-ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib -D_POSIX_C_SOURCE=200112L
++ignore_ip_la_CPPFLAGS = -I$(top_srcdir)/src/lib
+ ignore_ip_la_LIBADD = ../lib/libproxy.la
+
+ # WebKit (JavaScriptCore) based PAC runner
+ pacrunner_webkit_la_SOURCES = pacrunner_webkit.c
+-pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@ -D_POSIX_C_SOURCE=200112L
++pacrunner_webkit_la_CPPFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@
+ pacrunner_webkit_la_LIBADD = ../lib/libproxy.la $(am__append_10)
+ pacrunner_webkit_la_LDFLAGS = $(AM_LDFLAGS) @WEBKIT_LIBS@
+ nodist_pacrunner_webkit_la_SOURCES = pacutils.h
+
+ # Mozilla (Spidermonkey) based PAC runner
+ pacrunner_mozjs_la_SOURCES = pacrunner_mozjs.c
+-pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@ -D_POSIX_C_SOURCE=200112L
++pacrunner_mozjs_la_CPPFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@
+ pacrunner_mozjs_la_LIBADD = ../lib/libproxy.la
+ pacrunner_mozjs_la_LDFLAGS = $(AM_LDFLAGS) @MOZJS_LIBS@
+ nodist_pacrunner_mozjs_la_SOURCES = pacutils.h
+diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in
+--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200
++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100
+@@ -239,7 +239,7 @@
+
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99
++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib
+ proxy_LDADD = ../lib/libproxy.la
+ all: all-am
+
Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/SunStudio-have-no-stdc99-flag.patch)
===================================================================
--- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch (rev 0)
+++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/SunStudio-have-no-stdc99-flag.patch 2010-01-18 09:34:38 UTC (rev 8068)
@@ -0,0 +1,69 @@
+diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.am libproxy-0.3.0/src/bin/Makefile.am
+--- libproxy-0.3.0.orig/src/bin/Makefile.am 2009-08-14 21:00:32.000000000 +0200
++++ libproxy-0.3.0/src/bin/Makefile.am 2010-01-07 12:16:16.608932753 +0100
+@@ -2,5 +2,5 @@
+
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99
++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99
+ proxy_LDADD = ../lib/libproxy.la
+diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.am libproxy-0.3.0/src/lib/Makefile.am
+--- libproxy-0.3.0.orig/src/lib/Makefile.am 2009-08-14 21:00:32.000000000 +0200
++++ libproxy-0.3.0/src/lib/Makefile.am 2010-01-07 12:17:37.568266736 +0100
+@@ -10,8 +10,8 @@
+ strdict.c strdict.h \
+ url.c url.h
+
+-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L
+ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
+
+ include_HEADERS = proxy.h
+
+diff -Nru libproxy-0.3.0.orig/src/lib/Makefile.in libproxy-0.3.0/src/lib/Makefile.in
+--- libproxy-0.3.0.orig/src/lib/Makefile.in 2009-08-14 21:05:15.000000000 +0200
++++ libproxy-0.3.0/src/lib/Makefile.in 2010-01-07 11:58:19.284179024 +0100
+@@ -277,7 +277,7 @@
+ strdict.c strdict.h \
+ url.c url.h
+
+-libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -std=c99 -D_POSIX_C_SOURCE=200112L
++libproxy_la_CFLAGS = -DMODULEDIR=\"@MODULEDIR@@DIR_SEPARATOR@\" -DSYSCONFDIR=\"@SYSCONFDIR@@DIR_SEPARATOR@\" -xc99 -D_POSIX_C_SOURCE=200112L
+ libproxy_la_LDFLAGS = -lpthread -lm -no-undefined
+ include_HEADERS = proxy.h
+ all: all-am
+diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.am libproxy-0.3.0/src/modules/Makefile.am
+--- libproxy-0.3.0.orig/src/modules/Makefile.am 2009-08-14 21:06:30.000000000 +0200
++++ libproxy-0.3.0/src/modules/Makefile.am 2010-01-07 12:18:24.020865842 +0100
+@@ -1,5 +1,5 @@
+ moduledir = @MODULEDIR@
+-AM_CFLAGS = -std=c99
++AM_CFLAGS = -xc99
+ AM_LDFLAGS = -module -avoid-version -no-undefined
+
+
+diff -Nru libproxy-0.3.0.orig/src/modules/Makefile.in libproxy-0.3.0/src/modules/Makefile.in
+--- libproxy-0.3.0.orig/src/modules/Makefile.in 2009-08-14 21:07:00.000000000 +0200
++++ libproxy-0.3.0/src/modules/Makefile.in 2010-01-14 18:03:41.850944638 +0100
+@@ -359,7 +359,7 @@
+ xmu_CFLAGS = @xmu_CFLAGS@
+ xmu_LIBS = @xmu_LIBS@
+ moduledir = @MODULEDIR@
+-AM_CFLAGS = -std=c99
++AM_CFLAGS = -xc99
+ AM_LDFLAGS = -module -avoid-version -no-undefined
+
+ # Which modules to build
+diff -Nru libproxy-0.3.0.orig/src/bin/Makefile.in libproxy-0.3.0/src/bin/Makefile.in
+--- libproxy-0.3.0.orig/src/bin/Makefile.in 2009-08-14 21:05:15.000000000 +0200
++++ libproxy-0.3.0/src/bin/Makefile.in 2010-01-14 18:04:24.531275033 +0100
+@@ -239,7 +239,7 @@
+
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+-proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -std=c99
++proxy_CPPFLAGS = -I$(top_srcdir)/src/lib -xc99
+ proxy_LDADD = ../lib/libproxy.la
+ all: all-am
+
Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/proxy.c.patch)
===================================================================
--- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch (rev 0)
+++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/proxy.c.patch 2010-01-18 09:34:38 UTC (rev 8068)
@@ -0,0 +1,40 @@
+diff -Nru libproxy-0.3.0.orig/src/lib/proxy.c libproxy-0.3.0/src/lib/proxy.c
+--- libproxy-0.3.0.orig/src/lib/proxy.c 2009-08-14 21:00:32.000000000 +0200
++++ libproxy-0.3.0/src/lib/proxy.c 2010-01-07 11:57:19.188739832 +0100
+@@ -162,17 +162,37 @@
+ if (!px_module_manager_register_type(self->mm, pxWPADModule, _px_wpad_module_cmp, false)) goto error;
+
+ /* If we have a config file, load the config order from it */
++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9)))
++ char *envp;
++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+3);
++ sprintf(envp,"_PX_CONFIG_ORDER=");
++ putenv(envp);
++#else
+ setenv("_PX_CONFIG_ORDER", "", 1);
++#endif
+ pxConfigFile *cf = px_config_file_new(SYSCONFDIR "proxy.conf");
+ if (cf)
+ {
+ char *tmp = px_config_file_get_value(cf, PX_CONFIG_FILE_DEFAULT_SECTION, "config_order");
+ px_config_file_free(cf);
++#if (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9)))
++ if (tmp) {
++ int retval;
++ envp = px_malloc0(strlen("_PX_CONFIG_ORDER")+strlen(tmp)+2);
++ sprintf(envp,"_PX_CONFIG_ORDER=%s",tmp);
++ retval = putenv(envp);
++ if(retval) {
++ px_free(tmp);
++ goto error;
++ }
++ }
++#else
+ if (tmp && setenv("_PX_CONFIG_ORDER", tmp, 1))
+ {
+ px_free(tmp);
+ goto error;
+ }
++#endif
+ px_free(tmp);
+ }
Copied: csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch (from rev 8006, csw/mgar/pkg/libproxy/trunk/files/stdfiles.patch)
===================================================================
--- csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch (rev 0)
+++ csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/files/stdfiles.patch 2010-01-18 09:34:38 UTC (rev 8068)
@@ -0,0 +1,34 @@
+diff -Nru libproxy-0.3.0.orig/src/lib/stdbool.h libproxy-0.3.0/src/lib/stdbool.h
+--- libproxy-0.3.0.orig/src/lib/stdbool.h 1970-01-01 01:00:00.000000000 +0100
++++ libproxy-0.3.0/src/lib/stdbool.h 2010-01-15 00:49:51.930719445 +0100
+@@ -0,0 +1,17 @@
++#ifndef _STDBOOL_H
++#ifndef _MY_STDBOOL_H
++#define _MY_STDBOOL_H
++
++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9)))
++
++#ifndef bool
++#define bool int
++#define false 0
++#define true 1
++#endif /* bool */
++
++#endif /* Compiler has bool */
++
++
++#endif /* _MY_BOOL_H_*/
++#endif /* _STDBOOL_H_*/
+diff -Nru libproxy-0.3.0.orig/src/lib/stdint.h libproxy-0.3.0/src/lib/stdint.h
+--- libproxy-0.3.0.orig/src/lib/stdint.h 1970-01-01 01:00:00.000000000 +0100
++++ libproxy-0.3.0/src/lib/stdint.h 2010-01-15 01:00:57.971084112 +0100
+@@ -0,0 +1,9 @@
++#ifndef _STDINT_H
++#ifndef _MY_STDINT_H
++#define _MY_STDINT_H
++
++#if !defined(__GNUG__) && (defined(__SUNPRO_C) && ( defined(__SunOS_5_8) || defined(__SunOS_5_9)))
++#include <sys/inttypes.h>
++#endif /* Compiler has stdint.h */
++#endif /* _MY_STDINT_H */
++#endif /* _STDINT_H */
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