# 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)
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 ""
# 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 ""
for i in announce.txt p_doc.css privoxy-index.html; do
cp -v ../${SOURCE_DIR}/doc/webserver/$i pkg\ content/usr/local/share/doc/privoxy/$i
done
+# copy p_doc.css down into user-manual subdir (as per the make install target)
+cp -v ../${SOURCE_DIR}/doc/webserver/p_doc.css pkg\ content/usr/local/share/doc/privoxy/user-manual/p_doc.css
# copy the project's AUTHORS, ChangeLog, LICENSE and README files
for i in AUTHORS ChangeLog LICENSE README; do
cp -v ../${SOURCE_DIR}/$i pkg\ content/usr/local/share/doc/privoxy/$i
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 ""