X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=blobdiff_plain;f=constructPkgContent.sh;h=ac2edb2b06690269f92153dea6fa5a3e6d20df86;hb=a0b4fc0e8c97b17fc577332c9153799334a0d763;hp=e9856b292c9b970f0c90a7526b844f8aed477bbf;hpb=d862a6edfafeff9af7ab902df6cb59d852c49615;p=OSXPackageBuilder.git

diff --git a/constructPkgContent.sh b/constructPkgContent.sh
index e9856b2..ac2edb2 100755
--- a/constructPkgContent.sh
+++ b/constructPkgContent.sh
@@ -28,7 +28,8 @@
 #                USA
 #
 # Modification : If you modify this file please consider whether your 
-#                changes ought to be passed back to the macsetup module.
+#                changes ought to be passed back to the OSXPackageBuilder
+#                module.
 #
 
 # Use the common script to locate the directory containing Privoxy's source ($SOURCEDIR)
@@ -45,13 +46,6 @@ echo "Copy the package skeleton (the unchanging content) to a new folder named '
 echo ""
 cp -vR pkg\ content\ skeleton pkg\ content
 
-# Replace the version number placeholders in the uninstallation script
-echo ""
-echo "Replace the version number placeholders in the uninstallation script"
-echo ""
-VERSION=`perl findversion.pl ../${SOURCE_DIR}/ChangeLog`
-sed "s/PRIVOXY_VERSION/${VERSION}/g" pkg\ content\ skeleton/Applications/Privoxy/uninstall.command > pkg\ content/Applications/Privoxy/uninstall.command
-
 # Copy the compiled privoxy binary from the '${SOURCE_DIR}' directory
 echo ""
 echo ""
@@ -77,11 +71,12 @@ done
 # Enter the correct values for confdir and logdir into the config file 
 echo ""
 echo ""
-echo "Copy the config file from the '${SOURCE_DIR}' directory, modifying the confdir and logdir in passing"
+echo "Copy the config file from the '${SOURCE_DIR}' directory, modifying the confdir, logdir and user-manual settings in passing"
 echo ""
-sed 's/confdir ./confdir \/usr\/local\/etc\/privoxy/g' ../${SOURCE_DIR}/config > pkg\ content/usr/local/etc/privoxy/vanilla/config_temp
-sed 's/logdir ./logdir \/var\/log\/privoxy/g' pkg\ content/usr/local/etc/privoxy/vanilla/config_temp > pkg\ content/usr/local/etc/privoxy/vanilla/config
-rm -f pkg\ content/usr/local/etc/privoxy/vanilla/config_temp
+sed 's/confdir ./confdir \/usr\/local\/etc\/privoxy/g' ../${SOURCE_DIR}/config > pkg\ content/usr/local/etc/privoxy/vanilla/config_temp1
+sed 's/logdir ./logdir \/var\/log\/privoxy/g' pkg\ content/usr/local/etc/privoxy/vanilla/config_temp1 > pkg\ content/usr/local/etc/privoxy/vanilla/config_temp2
+sed 's/#user-manual http:\/\/www.privoxy.org\/user-manual\//user-manual \/usr\/local\/share\/doc\/privoxy\/user-manual\//g' pkg\ content/usr/local/etc/privoxy/vanilla/config_temp2 > pkg\ content/usr/local/etc/privoxy/vanilla/config
+rm -f pkg\ content/usr/local/etc/privoxy/vanilla/config_temp*
 
 # Copy the documentation hierarchy from the '${SOURCE_DIR}' directory
 echo ""
@@ -108,6 +103,18 @@ echo "Copy the manpage from the '${SOURCE_DIR}' directory"
 echo ""
 cp -v ../${SOURCE_DIR}/privoxy.1 pkg\ content/usr/local/share/man/man1
 
+# Optionally copy the PCRE libraries
+if [ "$1" == "-pcre" ]; then
+	echo ""
+	echo ""
+	echo "Copy the external PCRE libraries"
+	echo ""
+	mkdir pkg\ content/usr/local/lib
+	cp -v /usr/local/lib/libpcre* pkg\ content/usr/local/lib
+	mkdir pkg\ content/usr/local/lib/pkgconfig
+	cp -v /usr/local/lib/pkgconfig/libpcre* pkg\ content/usr/local/lib/pkgconfig
+fi
+
 # Remove CVS administration files
 echo ""
 echo ""