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

[lisu]

Author: lisu                         Date: Tue Aug 10 09:25:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

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

---- Diffs:

================================================================
Index: packages/pacparser/pacparser-libdir.patch
diff -u packages/pacparser/pacparser-libdir.patch:1.2 packages/pacparser/pacparser-libdir.patch:1.3
--- packages/pacparser/pacparser-libdir.patch:1.2	Fri Jul 30 10:44:17 2010
+++ packages/pacparser/pacparser-libdir.patch	Tue Aug 10 11:25:24 2010
@@ -1,11 +1,11 @@
---- 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
+--- pacparser-1.2.0rc2/src/Makefile~	2010-07-30 10:04:31.984092717 +0200
++++ pacparser-1.2.0rc2/src/Makefile	2010-07-30 10:05:19.269915096 +0200
+@@ -50,7 +50,7 @@
  
- LIBRARY = libpacparser.$(SO_SUFFIX).$(LIB_VER)
--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
+ LIBRARY_LINK = $(LIBRARY_NAME).$(SO_SUFFIX)
+ PREFIX := $(DESTDIR)$(PREFIX)
+-LIB_PREFIX = $(PREFIX)/lib
++LIB_PREFIX = $(PREFIX)/$(LIB)
+ INC_PREFIX = $(PREFIX)/include
+ BIN_PREFIX = $(PREFIX)/bin
+ MAN_PREFIX = $(PREFIX)/share/man

================================================================
Index: packages/pacparser/pacparser-make.patch
diff -u packages/pacparser/pacparser-make.patch:1.3 packages/pacparser/pacparser-make.patch:1.4
--- packages/pacparser/pacparser-make.patch:1.3	Fri Jul 30 10:44:17 2010
+++ packages/pacparser/pacparser-make.patch	Tue Aug 10 11:25:24 2010
@@ -1,8 +1,8 @@
---- 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 @@
+--- pacparser-1.2.0rc2/src/Makefile~	2010-07-30 10:29:08.446447618 +0200
++++ pacparser-1.2.0rc2/src/Makefile	2010-07-30 10:29:06.156447979 +0200
+@@ -58,24 +58,18 @@
  .PHONY: clean pymod install-pymod
- all: pactester
+ all: testpactester
  
 -jsapi: spidermonkey/js.tar.gz
 -	cd spidermonkey && $(MAKE) jsapi
@@ -20,12 +20,12 @@
 +$(LIBRARY): pacparser.o
 +	$(MKSHLIB) $(LIB_OPTS) -o $(LIBRARY) pacparser.o $(LDFLAGS)
  
- libpacparser.$(SO_SUFFIX): $(LIBRARY)
- 	ln -sf $(LIBRARY) libpacparser.$(SO_SUFFIX)
+ $(LIBRARY_LINK): $(LIBRARY)
+ 	ln -sf $(LIBRARY) $(LIBRARY_LINK)
  
- pactester: pactester.c pacparser.h libpacparser.$(SO_SUFFIX)
+ pactester: pactester.c pacparser.h $(LIBRARY_LINK)
 -	$(CC) pactester.c -o pactester -lpacparser -L. -I.
 +	$(CC) $(CFLAGS) $(LDFLAGS) pactester.c -o pactester -lpacparser -L. -I.
  
- install: all
- 	install -d $(LIB_PREFIX) $(INC_PREFIX) $(BIN_PREFIX)
+ testpactester: pactester
+ 	echo "Running tests for pactester."
================================================================

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