packages: pacparser/pacparser-libdir.patch, pacparser/pacparser-make.patch ...

[lisu]

Author: lisu                         Date: Fri Jul 30 08:44:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 1.1.1

---- Files affected:
packages/pacparser:
   pacparser-libdir.patch (1.1 -> 1.2) , pacparser-make.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/pacparser/pacparser-libdir.patch
diff -u packages/pacparser/pacparser-libdir.patch:1.1 packages/pacparser/pacparser-libdir.patch:1.2
--- packages/pacparser/pacparser-libdir.patch:1.1	Wed Feb 10 18:23:39 2010
+++ packages/pacparser/pacparser-libdir.patch	Fri Jul 30 10:44:17 2010
@@ -1,11 +1,11 @@
---- pacparser-1.0.9/Makefile~	2010-02-10 19:13:05.000000000 +0100
-+++ pacparser-1.0.9/Makefile	2010-02-10 19:15:50.000000000 +0100
-@@ -39,7 +39,7 @@
+--- pacparser-1.1.1/Makefile~	2010-07-30 10:41:55.756371202 +0200
++++ pacparser-1.1.1/Makefile	2010-07-30 10:42:17.029701260 +0200
+@@ -45,7 +45,7 @@
+ LDFLAGS += -lm
  
  LIBRARY = libpacparser.$(SO_SUFFIX).$(LIB_VER)
- PREFIX ?= /usr
 -LIB_PREFIX = $(DESTDIR)$(PREFIX)/lib
 +LIB_PREFIX = $(DESTDIR)$(PREFIX)/$(LIB)
+ PYLIB_PREFIX = $(DESTDIR)$(PREFIX)/lib
  INC_PREFIX = $(DESTDIR)$(PREFIX)/include
  BIN_PREFIX = $(DESTDIR)$(PREFIX)/bin
- MAN_PREFIX = $(DESTDIR)$(PREFIX)/share/man

================================================================
Index: packages/pacparser/pacparser-make.patch
diff -u packages/pacparser/pacparser-make.patch:1.2 packages/pacparser/pacparser-make.patch:1.3
--- packages/pacparser/pacparser-make.patch:1.2	Wed Feb 10 18:06:54 2010
+++ packages/pacparser/pacparser-make.patch	Fri Jul 30 10:44:17 2010
@@ -1,85 +1,24 @@
---- pacparser-1.0.9/Makefile.orig	2009-11-25 13:07:37.000000000 +0100
-+++ pacparser-1.0.9/Makefile	2010-02-10 18:37:01.000000000 +0100
-@@ -23,7 +23,6 @@
- ifeq ($(OS_ARCH),Linux)
-   SO_SUFFIX = so
-   MKSHLIB = $(CC) -shared
--  LDFLAGS += -Wl,-soname=$(LIBRARY)
- endif
- ifeq ($(OS_ARCH),Darwin)
-   SO_SUFFIX = dylib
-@@ -32,64 +31,12 @@
+--- pacparser-1.1.1/Makefile~	2010-06-19 10:17:44.000000000 +0200
++++ pacparser-1.1.1/Makefile	2010-07-30 10:41:23.360530968 +0200
+@@ -54,24 +54,18 @@
+ .PHONY: clean pymod install-pymod
+ all: pactester
  
- LIB_VER = 1
- CFLAGS = -g -DXP_UNIX -Wall
--SHFLAGS = -fPIC
-+SHFLAGS = -fPIC -Wl,-soname=$(LIBRARY)
- 
- ifndef PYTHON
-   PYTHON = python
- endif
- 
--NOSO = clean
--
--ifndef SM_LIB
--ifeq (yes, $(shell [ -e /usr/lib/libjs.$(SO_SUFFIX) -o -e /usr/local/lib/libjs.$(SO_SUFFIX) ] && echo yes))
--  SM_LIB = -ljs
--else
--  ifeq (yes, $(shell [ -e /opt/local/lib/libjs.$(SO_SUFFIX) ] && echo yes))
--    SM_LIB = -ljs
--    LDFLAGS += -L/opt/local/lib
--  else
--    ifeq (yes, $(shell [ -e /usr/lib/libsmjs.$(SO_SUFFIX) ] && echo yes))
--      SM_LIB = -lsmjs
--    else
--      ifeq (yes, $(shell [ -e /usr/lib/libmozjs.$(SO_SUFFIX) ] && echo yes))
--        SM_LIB = -lmozjs
--      endif
--    endif
--  endif
--endif
--endif
--
--ifndef SM_INC
--ifeq (yes, $(shell [ -e /usr/local/include/js ] && echo yes))
--  SM_INC = -I/usr/local/include/js
--else
--  ifeq (yes, $(shell [ -e /opt/local/include/js ] && echo yes))
--    SM_INC = -I/opt/local/include/js
--  else
--    ifeq (yes, $(shell [ -e /usr/include/smjs ] && echo yes))
--      SM_INC = -I/usr/include/smjs
--    else
--      ifeq (yes, $(shell [ -e /usr/include/mozjs ] && echo yes))
--        SM_INC = -I/usr/include/mozjs
--      endif
--    endif
--  endif
--endif
--endif
+-jsapi: spidermonkey/js.tar.gz
+-	cd spidermonkey && $(MAKE) jsapi
 -
--ifeq ($(NOSO), $(filter-out $(MAKECMDGOALS),$(NOSO)))
--  ifndef SM_LIB
--  $(error SpiderMonkey library not found. See 'README_SM' file.)
--  else
--    LDFLAGS += ${SM_LIB}
--  endif
--  ifdef SM_INC
--    CFLAGS += ${SM_INC}
--  else
--    $(error SpiderMonkey api not found. See 'README_SM' file.)
--  endif
--endif
+-libjs.a: spidermonkey/js.tar.gz
+-	cd spidermonkey && $(MAKE) jslib
 -
- LIBRARY = libpacparser.$(SO_SUFFIX).$(LIB_VER)
- PREFIX ?= /usr
- LIB_PREFIX = $(DESTDIR)$(PREFIX)/lib
-@@ -101,12 +48,12 @@
+-pacparser.o: pacparser.c pac_utils.h jsapi
++pacparser.o: pacparser.c pac_utils.h
+ 	$(CC) $(CFLAGS) $(SHFLAGS) -c pacparser.c -o pacparser.o
  	touch pymod/pacparser_o_buildstamp
  
- $(LIBRARY): pacparser.o
--	$(MKSHLIB) -o $(LIBRARY) pacparser.o $(LDFLAGS)
-+	$(MKSHLIB) -o $(LIBRARY) pacparser.o $(LDFLAGS) $(SHFLAGS)
+-$(LIBRARY): pacparser.o libjs.a
+-	$(MKSHLIB) $(LIB_OPTS) -o $(LIBRARY) pacparser.o libjs.a $(LDFLAGS)
++$(LIBRARY): pacparser.o
++	$(MKSHLIB) $(LIB_OPTS) -o $(LIBRARY) pacparser.o $(LDFLAGS)
  
  libpacparser.$(SO_SUFFIX): $(LIBRARY)
  	ln -sf $(LIBRARY) libpacparser.$(SO_SUFFIX)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pacparser/pacparser-libdir.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pacparser/pacparser-make.patch?r1=1.2&r2=1.3&f=u