[csw-devel] SF.net SVN: gar:[21440] csw/mgar/pkg/pacparser/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Jul 5 10:52:37 CEST 2013
Revision: 21440
http://gar.svn.sourceforge.net/gar/?rev=21440&view=rev
Author: dmichelsen
Date: 2013-07-05 08:52:34 +0000 (Fri, 05 Jul 2013)
Log Message:
-----------
pacparser/trunk: Update to 1.3.1
Modified Paths:
--------------
csw/mgar/pkg/pacparser/trunk/Makefile
csw/mgar/pkg/pacparser/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch
csw/mgar/pkg/pacparser/trunk/files/0002-Do-not-add-Wall-unconditionally.patch
csw/mgar/pkg/pacparser/trunk/files/0003-Search-libpacparser.so-in-current-directory-first-do.patch
Modified: csw/mgar/pkg/pacparser/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pacparser/trunk/Makefile 2013-07-05 07:31:16 UTC (rev 21439)
+++ csw/mgar/pkg/pacparser/trunk/Makefile 2013-07-05 08:52:34 UTC (rev 21440)
@@ -1,6 +1,6 @@
# $Id$
NAME = pacparser
-VERSION = 1.2.7
+VERSION = 1.3.1
GARTYPE = v2
DESCRIPTION = A library to parse proxy auto-config (PAC) files
@@ -17,34 +17,44 @@
MASTER_SITES = $(GOOGLE_MIRROR)
DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES = 0001-Adjust-Makefile.patch
+#PATCHFILES = 0001-Adjust-Makefile.patch
-PATCHFILES += 0003-Only-GNU-grep-knows-q.patch
-PATCHFILES += 0004-Some-more-Makefile-tweaks.patch
-PATCHFILES += 0005-Fix-soname-and-pactester-compilation.patch
+#PATCHFILES += 0003-Only-GNU-grep-knows-q.patch
+#PATCHFILES += 0004-Some-more-Makefile-tweaks.patch
+#PATCHFILES += 0005-Fix-soname-and-pactester-compilation.patch
PATCHFILES += 0006-Add-flags-to-make-library-self-sufficient.patch
-PATCHFILES += 0007-Add-config-for-spidermonkey-i386.patch
+#PATCHFILES += 0007-Add-config-for-spidermonkey-i386.patch
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES += 0001-Add-spidermonkey-config-for-Solaris-10.patch
+PATCHFILES += 0002-Do-not-add-Wall-unconditionally.patch
+PATCHFILES += 0003-Search-libpacparser.so-in-current-directory-first-do.patch
-PACKAGES = CSWpacparser CSWlibpacparser1 CSWlibpacparser-devel CSWpy-libpacparser
-CATALOGNAME_CSWpacparser = pacparser
-CATALOGNAME_CSWlibpacparser1 = libpacparser1
-CATALOGNAME_CSWlibpacparser-devel = libpacparser_devel
-CATALOGNAME_CSWpy-libpacparser = py_libpacparser
+VENDOR_URL = http://code.google.com/p/pacparser/
+PACKAGES += CSWpacparser
SPKG_DESC_CSWpacparser = $(DESCRIPTION)
-SPKG_DESC_CSWlibpacparser1 = Library libpacparser.so.1
-SPKG_DESC_CSWlibpacparser-devel = Development Files for libpacparser.so
-SPKG_DESC_CSWpy-libpacparser = Python Bindings for libpacparser
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWpacparser += CSWlibpacparser1
-RUNTIME_DEP_PKGS_CSWpacparser = CSWlibpacparser1
-RUNTIME_DEP_PKGS_CSWlibpacparser-devel = CSWlibpacparser1
-RUNTIME_DEP_PKGS_CSWpy-libpacparser = CSWlibpython2-6-1-0 CSWpython
+PACKAGES += CSWlibpacparser1
+SPKG_DESC_CSWlibpacparser1 = A library to parse proxy auto-config (PAC) files, libpacparser.so.1
+PKGFILES_CSWlibpacparser1 += $(call pkgfiles_lib,libpacparser.so.1)
-VENDOR_URL = http://code.google.com/p/pacparser/
+PACKAGES += CSWlibpacparser-dev
+SPKG_DESC_CSWlibpacparser-dev = Development Files for libpacparser.so.1
+PKGFILES_CSWlibpacparser-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibpacparser-dev += $(docdir)/pacparser/html/.*
+PKGFILES_CSWlibpacparser-dev += .*\.c
+RUNTIME_DEP_PKGS_CSWlibpacparser-dev += CSWlibpacparser1
+OBSOLETED_BY_CSWlibpacparser-dev += CSWlibpacparser-devel
+PACKAGES += CSWpy-libpacparser
+SPKG_DESC_CSWpy-libpacparser = Python Bindings for libpacparser
+PKGFILES_CSWpy-libpacparser += $(libdir)/python/.*
+PKGFILES_CSWpy-libpacparser += .*\.py
+RUNTIME_DEP_PKGS_CSWpy-libpacparser += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWpy-libpacparser += CSWpython
+
# There is some Python stuff in the package
PYCOMPILE = 1
@@ -60,26 +70,20 @@
# Tests are run after build
TEST_SCRIPTS =
+# Needed for 'install' during build and install-phase
+BUILD_ENV_PATH = /opt/csw/gnu:$(PATH)
+INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH)
+
INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile
INSTALL_ARGS = install install-pymod
INSTALL_OVERRIDE_DIRS = PREFIX
PREFIX=$(prefix)
-PKGFILES_CSWlibpacparser1 = $(PKGFILES_RT)
-PKGFILES_CSWlibpacparser-devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibpacparser-devel += $(docdir)/pacparser/html/.*
-PKGFILES_CSWlibpacparser-devel += .*\.c
-PKGFILES_CSWpy-libpacparser = $(libdir)/python/.*
-PKGFILES_CSWpy-libpacparser += .*\.py
-
include gar/category.mk
-# Needed for 'install' during install-phase
-PATH := /opt/csw/gnu:$(PATH)
-
-post-extract-modulated:
+post-extract:
@# We have patched something in although the package has not been unpacked.
@# Make sure it is uncompressed afterwards.
-cd $(WORKSRC)/src && gtar xzvf spidermonkey/js-?.?.?.tar.gz -C spidermonkey
- $(if $(filter sparc,$(GARCH)),echo "Sparc is fast!!",rm -f $(WORKSRC)/src/spidermonkey/js/src/lock_SunOS.s)
- @$(MAKECOOKIE)
+ # $(if $(filter sparc,$(GARCH)),echo "Sparc is fast!!",rm -f $(WORKSRC)/src/spidermonkey/js/src/lock_SunOS.s)
+ #@$(MAKECOOKIE)
Modified: csw/mgar/pkg/pacparser/trunk/checksums
===================================================================
--- csw/mgar/pkg/pacparser/trunk/checksums 2013-07-05 07:31:16 UTC (rev 21439)
+++ csw/mgar/pkg/pacparser/trunk/checksums 2013-07-05 08:52:34 UTC (rev 21440)
@@ -1 +1 @@
-d97cd4136403ee73c1ec6aa96b6708ae pacparser-1.2.7.tar.gz
+97010ef3c18f81f8734e3cc3d6f92619 pacparser-1.3.1.tar.gz
Added: csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch
===================================================================
--- csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch (rev 0)
+++ csw/mgar/pkg/pacparser/trunk/files/0001-Add-spidermonkey-config-for-Solaris-10.patch 2013-07-05 08:52:34 UTC (rev 21440)
@@ -0,0 +1,63 @@
+From e4aa9f4eb3694d1609c55a7f1282781dbc18212d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 5 Jul 2013 09:57:06 +0200
+Subject: [PATCH 1/3] Add spidermonkey config for Solaris 10
+
+---
+ src/spidermonkey/js/src/config/SunOS5.10.mk | 44 +++++++++++++++++++++++++++++
+ 1 file changed, 44 insertions(+)
+ create mode 100644 src/spidermonkey/js/src/config/SunOS5.10.mk
+
+diff --git a/src/spidermonkey/js/src/config/SunOS5.10.mk b/src/spidermonkey/js/src/config/SunOS5.10.mk
+new file mode 100644
+index 0000000..b01ec9c
+--- /dev/null
++++ b/src/spidermonkey/js/src/config/SunOS5.10.mk
+@@ -0,0 +1,44 @@
++# -*- Mode: makefile -*-
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is Mozilla Communicator client code, released
++# March 31, 1998.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1999
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++#
++# Config stuff for SunOS5.9
++#
++
++include $(DEPTH)/config/SunOS5.5.mk
+--
+1.8.3.1
+
Added: csw/mgar/pkg/pacparser/trunk/files/0002-Do-not-add-Wall-unconditionally.patch
===================================================================
--- csw/mgar/pkg/pacparser/trunk/files/0002-Do-not-add-Wall-unconditionally.patch (rev 0)
+++ csw/mgar/pkg/pacparser/trunk/files/0002-Do-not-add-Wall-unconditionally.patch 2013-07-05 08:52:34 UTC (rev 21440)
@@ -0,0 +1,25 @@
+From 95eac472c83226b233e38406bd3c4f1c00419c1e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 5 Jul 2013 09:58:03 +0200
+Subject: [PATCH 2/3] Do not add -Wall unconditionally
+
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 84fd389..8c6ccbc 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -55,7 +55,7 @@ ifeq ($(OS_ARCH),Darwin)
+ endif
+ endif
+
+-CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION)
++CFLAGS = -g -DXP_UNIX -DVERSION=$(VERSION)
+
+ ifndef PYTHON
+ PYTHON = python
+--
+1.8.3.1
+
Added: csw/mgar/pkg/pacparser/trunk/files/0003-Search-libpacparser.so-in-current-directory-first-do.patch
===================================================================
--- csw/mgar/pkg/pacparser/trunk/files/0003-Search-libpacparser.so-in-current-directory-first-do.patch (rev 0)
+++ csw/mgar/pkg/pacparser/trunk/files/0003-Search-libpacparser.so-in-current-directory-first-do.patch 2013-07-05 08:52:34 UTC (rev 21440)
@@ -0,0 +1,35 @@
+From a54c4f8f3c4dcbc5085bf7f36403c769faa29504 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 5 Jul 2013 10:02:05 +0200
+Subject: [PATCH 3/3] Search libpacparser.so in current directory first, do not
+ use non-generic link option
+
+---
+ src/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 8c6ccbc..9e2380e 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -38,7 +38,7 @@ LIB_VER = 1
+ SO_SUFFIX = so
+ LIBRARY = $(LIBRARY_NAME).$(SO_SUFFIX).$(LIB_VER)
+ MKSHLIB = $(CC) -shared
+-LIB_OPTS = -Wl,-soname=$(LIBRARY) -Wl,-exclude-libs=libjs.a
++LIB_OPTS = -Wl,-soname=$(LIBRARY)
+ SHFLAGS = -fPIC
+ SMCFLAGS = -DHAVE_VA_COPY -DVA_COPY=__va_copy
+
+@@ -97,7 +97,7 @@ $(LIBRARY_LINK): $(LIBRARY)
+ ln -sf $(LIBRARY) $(LIBRARY_LINK)
+
+ pactester: pactester.c pacparser.h $(LIBRARY_LINK)
+- $(CC) pactester.c -o pactester -lpacparser -L. -I.
++ $(CC) pactester.c -o pactester -L. -lpacparser -I.
+
+ testpactester: pactester
+ echo "Running tests for pactester."
+--
+1.8.3.1
+
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