[or-cvs] r13107: Update makefile for panther, update polipo version where nee (tor/trunk/contrib/polipo)
phobos at seul.org
phobos at seul.org
Fri Jan 11 14:25:49 UTC 2008
Author: phobos
Date: 2008-01-11 09:25:49 -0500 (Fri, 11 Jan 2008)
New Revision: 13107
Added:
tor/trunk/contrib/polipo/Makefile.osx-panther
Modified:
tor/trunk/contrib/polipo/PolipoDesc.plist
tor/trunk/contrib/polipo/PolipoInfo.plist
tor/trunk/contrib/polipo/package.sh
tor/trunk/contrib/polipo/polipo-mingw.nsi
Log:
Update makefile for panther, update polipo version where needed.
Added: tor/trunk/contrib/polipo/Makefile.osx-panther
===================================================================
--- tor/trunk/contrib/polipo/Makefile.osx-panther (rev 0)
+++ tor/trunk/contrib/polipo/Makefile.osx-panther 2008-01-11 14:25:49 UTC (rev 13107)
@@ -0,0 +1,97 @@
+PREFIX = /Library/Polipo
+BINDIR = $(PREFIX)/bin
+MANDIR = $(PREFIX)/man
+INFODIR = $(PREFIX)/info
+LOCAL_ROOT = $(PREFIX)/www
+DISK_CACHE_ROOT = $(PREFIX)/cache
+
+CC = gcc
+# CDEBUGFLAGS = -Os -g -Wall -std=gnu99
+CDEBUGFLAGS = -Os -g -Wall
+
+FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \
+ -DDISK_CACHE_ROOT=\"$(DISK_CACHE_ROOT)/\"
+
+# You may optionally also add any of the following to DEFINES:
+#
+# -DNO_DISK_CACHE to compile out the on-disk cache and local web server;
+# -DNO_IPv6 to avoid using the RFC 3493 API and stick to stock
+# Berkeley sockets;
+# -DHAVE_IPv6 to force the use of the RFC 3493 API on systems other
+# than GNU/Linux and BSD (let me know if it works);
+# -DNO_FANCY_RESOLVER to compile out the asynchronous name resolution
+# code;
+# -DNO_STANDARD_RESOLVER to compile out the code that falls back to
+# gethostbyname/getaddrinfo when DNS requests fail;
+# -DNO_TUNNEL to compile out the code that handles CONNECT requests;
+# -DNO_SOCKS to compile out the SOCKS gateway code.
+# -DNO_FORBIDDEN to compile out the all of the forbidden URL code
+# -DNO_REDIRECTOR to compile out the Squid-style redirector code
+
+DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES)
+
+CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES)
+
+SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \
+ config.c local.c http.c client.c server.c auth.c tunnel.c \
+ http_parse.c parse_time.c dns.c forbidden.c \
+ md5import.c md5.c ftsimport.c fts_compat.c socks.c
+
+OBJS = util.o event.o io.o chunk.o atom.o object.o log.o diskcache.o main.o \
+ config.o local.o http.o client.o server.o auth.o tunnel.o \
+ http_parse.o parse_time.o dns.o forbidden.o \
+ md5import.o ftsimport.o socks.o
+
+polipo: $(OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o polipo $(OBJS) $(MD5LIBS) $(LDLIBS)
+
+ftsimport.o: ftsimport.c fts_compat.c
+
+md5import.o: md5import.c md5.c
+
+.PHONY: all install install.binary install.man
+
+all: polipo
+
+install: install.binary install.man
+
+install.binary: all
+ mkdir -p $(TARGET)$(BINDIR)
+ mkdir -p $(TARGET)$(LOCAL_ROOT)
+ mkdir -p $(TARGET)$(LOCAL_ROOT)/doc
+ mkdir -p $(TARGET)$(DISK_CACHE_ROOT)
+ cp -f polipo $(TARGET)$(BINDIR)/
+ cp -f localindex.html $(TARGET)$(LOCAL_ROOT)/index.html
+ cp -f config.osx $(TARGET)$(LOCAL_ROOT)/config
+ texi2html polipo.texi && cp -f polipo.html $(TARGET)$(LOCAL_ROOT)/doc/index.html
+ groff polipo.man -T ps -m man | pstopdf -i -o $(TARGET)/polipo.pdf
+ mkdir -p /Library/StartupItems/Polipo
+ cp -f contrib/Polipo /Library/StartupItems/Polipo/
+ cp -f contrib/StartupParameters.plist /Library/StartupItems/Polipo/
+ echo "POLIPO=-YES-" >> /etc/hostconfig
+
+install.man: all
+ mkdir -p $(TARGET)$(MANDIR)/man1
+ cp -f polipo.man $(TARGET)$(MANDIR)/man1/polipo.1
+
+TAGS: $(SRCS)
+ etags $(SRCS)
+
+.PHONY: clean
+
+clean:
+ -rm -f polipo *.o *~ core TAGS gmon.out
+ -rm -f polipo.cp polipo.fn polipo.log polipo.vr
+ -rm -f polipo.cps polipo.info* polipo.pg polipo.toc polipo.vrs
+ -rm -f polipo.aux polipo.dvi polipo.ky polipo.ps polipo.tp
+ -rm -f polipo.dvi polipo.ps polipo.ps.gz polipo.pdf polipo.html
+ -rm -rf ./html/
+ -rm -f polipo.man.html
+
+.PHONY: uninstall
+
+uninstall:
+ rm -rf /Library/Polipo
+ rm -rf /Library/StartupItems/Polipo
+ cp -f /etc/hostconfig /etc/hostconfig.polipo.saved
+ cat /etc/hostconfig.polipo.saved | grep -v POLIPO > /etc/hostconfig
Modified: tor/trunk/contrib/polipo/PolipoDesc.plist
===================================================================
--- tor/trunk/contrib/polipo/PolipoDesc.plist 2008-01-11 12:27:06 UTC (rev 13106)
+++ tor/trunk/contrib/polipo/PolipoDesc.plist 2008-01-11 14:25:49 UTC (rev 13107)
@@ -5,6 +5,6 @@
<key>IFPkgDescriptionTitle</key>
<string>Polipo</string>
<key>IFPkgDescriptionVersion</key>
- <string>20061218</string>
+ <string>1.0.4</string>
</dict>
</plist>
Modified: tor/trunk/contrib/polipo/PolipoInfo.plist
===================================================================
--- tor/trunk/contrib/polipo/PolipoInfo.plist 2008-01-11 12:27:06 UTC (rev 13106)
+++ tor/trunk/contrib/polipo/PolipoInfo.plist 2008-01-11 14:25:49 UTC (rev 13107)
@@ -3,13 +3,13 @@
<plist version="1.0">
<dict>
<key>CFBundleIdentifier</key>
- <string>Polipo 20061218</string>
+ <string>Polipo 1.0.4</string>
<key>CFBundleGetInfoString</key>
- <string>Polipo 20061218</string>
+ <string>Polipo 1.0.4</string>
<key>CFBundleName</key>
<string>Polipo</string>
<key>CFBundleSortVersionString</key>
- <string>20061218</string>
+ <string>1.0.4</string>
<key>IFPkgFlagAllowBackRev</key>
<true/>
<key>IFPkgFlagAuthorizationAction</key>
Modified: tor/trunk/contrib/polipo/package.sh
===================================================================
--- tor/trunk/contrib/polipo/package.sh 2008-01-11 12:27:06 UTC (rev 13106)
+++ tor/trunk/contrib/polipo/package.sh 2008-01-11 14:25:49 UTC (rev 13107)
@@ -9,7 +9,7 @@
# http://developer.apple.com/documentation/DeveloperTools/Conceptual/SoftwareDistribution/index.html
# man packagemaker
-VERSION="1.0.3"
+VERSION="1.0.4"
## Determine OSX Version
# map version to name
Modified: tor/trunk/contrib/polipo/polipo-mingw.nsi
===================================================================
--- tor/trunk/contrib/polipo/polipo-mingw.nsi 2008-01-11 12:27:06 UTC (rev 13106)
+++ tor/trunk/contrib/polipo/polipo-mingw.nsi 2008-01-11 14:25:49 UTC (rev 13107)
@@ -6,7 +6,7 @@
;
!include "MUI.nsh"
-!define VERSION "1.0.3"
+!define VERSION "1.0.4"
!define INSTALLER "polipo-${VERSION}-win32.exe"
!define WEBSITE "http://www.pps.jussieu.fr/~jch/software/polipo/"
@@ -28,7 +28,7 @@
VIAddVersionKey "ProductName" "Polipo: A caching web proxy"
VIAddVersionKey "Comments" "http://www.pps.jussieu.fr/~jch/software/polipo/"
VIAddVersionKey "LegalTrademarks" "See COPYING"
-VIAddVersionKey "LegalCopyright" "©2007, Juliusz Chroboczek"
+VIAddVersionKey "LegalCopyright" "©2008, Juliusz Chroboczek"
VIAddVersionKey "FileDescription" "Polipo is a caching web proxy."
VIAddVersionKey "FileVersion" "${VERSION}"
More information about the tor-commits
mailing list