using cvs diff -uN
-f
--
let me show you the world in my eyes.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/tinyproxy/Makefile,v
retrieving revision 1.20
diff -u -p -u -r1.20 Makefile
--- Makefile 22 Nov 2010 08:36:54 -0000 1.20
+++ Makefile 26 Feb 2012 18:32:11 -0000
@@ -1,38 +1,34 @@
# $OpenBSD: Makefile,v 1.20 2010/11/22 08:36:54 espie Exp $
-COMMENT= lightweight HTTP/SSL proxy
+COMMENT = lightweight HTTP/SSL proxy
-VERSION= 1.6.4
-DISTNAME= tinyproxy-${VERSION}
-CATEGORIES= www net
-
-HOMEPAGE= https://www.banu.com/tinyproxy/
-MASTER_SITES= https://www.banu.com/pub/tinyproxy/1.6/
-MAINTAINER= frantisek holop <min...@obiit.org>
-
-# GPLv3
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-
-WANTLIB= c
-
-SEPARATE_BUILD= concurrent
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --with-config=${SYSCONFDIR}/tinyproxy/tinyproxy.conf
-USE_GROFF = Yes
-
-REGRESS_TARGET= check
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/src/tinyproxy ${PREFIX}/sbin
- ${INSTALL_DATA} ${WRKSRC}/doc/tinyproxy.8 ${PREFIX}/man/man8
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tinyproxy
+V = 1.8.3
+DISTNAME = tinyproxy-${V}
+CATEGORIES = www net
+
+HOMEPAGE = https://www.banu.com/tinyproxy/
+MASTER_SITES = https://www.banu.com/pub/tinyproxy/1.8/
+MAINTAINER = frantisek holop <min...@obiit.org>
+
+# GPLv2+
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
+
+BUILD_DEPENDS = textproc/asciidoc
+
+SEPARATE_BUILD = concurrent
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += A2X=${LOCALBASE}/bin/a2x.py \
+ --localstatedir=/var
+
+WANTLIB = c
+REGRESS_TARGET = check
+
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tinyproxy
- ${INSTALL_DATA} ${WRKSRC}/doc/{debug,default,stats}.html \
- ${PREFIX}/share/doc/tinyproxy
- ${INSTALL_DATA} ${WRKSRC}/doc/tinyproxy.conf \
+ ${INSTALL_DATA} ${WRKBUILD}/etc/tinyproxy.conf \
${PREFIX}/share/examples/tinyproxy
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/tinyproxy/distinfo,v
retrieving revision 1.8
diff -u -p -u -r1.8 distinfo
--- distinfo 11 Apr 2009 23:54:12 -0000 1.8
+++ distinfo 26 Feb 2012 18:32:11 -0000
@@ -1,5 +1,5 @@
-MD5 (tinyproxy-1.6.4.tar.gz) = MVe5FZqNAF9CSM9NTWxl4g==
-RMD160 (tinyproxy-1.6.4.tar.gz) = CpFVkch/LTB1/nzyk0uYknZooXw=
-SHA1 (tinyproxy-1.6.4.tar.gz) = Gv3WqY6LH4arK2Z8DRXBJp7ao1w=
-SHA256 (tinyproxy-1.6.4.tar.gz) = 2a0jShscCA4qyTRJ5TGGEf/XJ3EzUrbqn/d9EKcbAkI=
-SIZE (tinyproxy-1.6.4.tar.gz) = 316567
+MD5 (tinyproxy-1.8.3.tar.gz) = 7Kkn9/apzoOUsrJWNhl4pw==
+RMD160 (tinyproxy-1.8.3.tar.gz) = QcrkyPzJllCnbXvtUqN5qd0PrvA=
+SHA1 (tinyproxy-1.8.3.tar.gz) = 6/S9pg/y0P3xhGRn8Hs7vZ75D68=
+SHA256 (tinyproxy-1.8.3.tar.gz) = aCQWyPD3M6gQbIe7OVxjEiJWl1H+Rhe8OB0EmbDwwBc=
+SIZE (tinyproxy-1.8.3.tar.gz) = 266744
Index: patches/patch-doc_tinyproxy_conf
===================================================================
RCS file: patches/patch-doc_tinyproxy_conf
diff -N patches/patch-doc_tinyproxy_conf
--- patches/patch-doc_tinyproxy_conf 11 Apr 2009 23:54:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-$OpenBSD: patch-doc_tinyproxy_conf,v 1.2 2009/04/11 23:54:12 sthen Exp $
---- doc/tinyproxy.conf.orig Sun Aug 24 06:58:43 2008
-+++ doc/tinyproxy.conf Tue Mar 24 03:09:09 2009
-@@ -6,8 +6,8 @@
- # Name of the user the tinyproxy daemon should switch to after the port
- # has been bound.
- #
--User nobody
--Group nogroup
-+User "_tinyproxy"
-+Group "_tinyproxy"
-
- #
- # Port to listen on.
-@@ -40,25 +40,25 @@ Timeout 600
- # /usr/share/tinyproxy
- # /etc/tinyproxy
- #
--# ErrorFile 404 "/usr/share/tinyproxy/404.html"
--# ErrorFile 400 "/usr/share/tinyproxy/400.html"
--# ErrorFile 503 "/usr/share/tinyproxy/503.html"
--# ErrorFile 403 "/usr/share/tinyproxy/403.html"
--# ErrorFile 408 "/usr/share/tinyproxy/408.html"
-+# ErrorFile 404 "/usr/local/share/tinyproxy/404.html"
-+# ErrorFile 400 "/usr/local/share/tinyproxy/400.html"
-+# ErrorFile 503 "/usr/local/share/tinyproxy/503.html"
-+# ErrorFile 403 "/usr/local/share/tinyproxy/403.html"
-+# ErrorFile 408 "/usr/local/share/tinyproxy/408.html"
-
- #
- # DefaultErrorFile: The HTML file that gets sent if there is no
- # HTML file defined with an ErrorFile keyword for the HTTP error
- # that has occured.
- #
--DefaultErrorFile "/usr/share/tinyproxy/default.html"
-+DefaultErrorFile "/usr/local/share/tinyproxy/default.html"
-
- #
- # StatFile: The HTML file that gets sent when a request is made
- # for the stathost. If this file doesn't exist a basic page is
- # hardcoded in tinyproxy.
- #
--StatFile "/usr/share/tinyproxy/stats.html"
-+StatFile "/usr/local/share/tinyproxy/stats.html"
-
- #
- # Where to log the information. Either LogFile or Syslog should be set,
Index: patches/patch-etc_tinyproxy_conf_in
===================================================================
RCS file: patches/patch-etc_tinyproxy_conf_in
diff -N patches/patch-etc_tinyproxy_conf_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-etc_tinyproxy_conf_in 26 Feb 2012 18:32:11 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- etc/tinyproxy.conf.in.orig Tue Oct 18 00:40:52 2011
++++ etc/tinyproxy.conf.in Tue Oct 18 00:41:09 2011
+@@ -12,8 +12,8 @@
+ # as the root user. Either the user or group name or the UID or GID
+ # number may be used.
+ #
+-User nobody
+-Group nobody
++User _tinyproxy
++Group _tinyproxy
+
+ #
+ # Port: Specify the port which tinyproxy will listen on. Please note
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/www/tinyproxy/pkg/DESCR,v
retrieving revision 1.5
diff -u -p -u -r1.5 DESCR
--- pkg/DESCR 3 Jan 2005 21:43:35 -0000 1.5
+++ pkg/DESCR 26 Feb 2012 18:32:11 -0000
@@ -1,7 +1,5 @@
-Tinyproxy is a lightweight HTTP/SSL proxy.
-Designed from the from the ground up to be fast and yet small,
-it is an ideal solution for sites where a full-featured HTTP
-proxy is required, but the system resources required to run a
-more demanding HTTP proxy are unavailable.
-Tinyproxy is fully compatible with all existing web browsers,
-and has a number of useful features.
+Tinyproxy is a light-weight HTTP/HTTPS proxy daemon for POSIX
+operating systems. Designed from the ground up to be fast and
+yet small, it is an ideal solution for use cases such as embedded
+deployments where a full featured HTTP proxy is required, but the
+system resources for a larger proxy are unavailable.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tinyproxy/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -r1.8 PLIST
--- pkg/PLIST 11 Apr 2009 23:54:12 -0000 1.8
+++ pkg/PLIST 26 Feb 2012 18:32:11 -0000
@@ -1,13 +1,19 @@
-@comment $OpenBSD: PLIST,v 1.8 2009/04/11 23:54:12 sthen Exp $
+@comment $OpenBSD$
@newgroup _tinyproxy:617
@newuser _tinyproxy:617:_tinyproxy:daemon:tinyproxy:/nonexistent:/sbin/nologin
+@man man/man5/tinyproxy.conf.5
@man man/man8/tinyproxy.8
@bin sbin/tinyproxy
-share/doc/tinyproxy/
-share/doc/tinyproxy/debug.html
-share/doc/tinyproxy/default.html
-share/doc/tinyproxy/stats.html
share/examples/tinyproxy/
-@sample ${SYSCONFDIR}/tinyproxy/
share/examples/tinyproxy/tinyproxy.conf
-@sample ${SYSCONFDIR}/tinyproxy/tinyproxy.conf
+@sample ${SYSCONFDIR}/
+@sample ${SYSCONFDIR}/tinyproxy.conf
+share/tinyproxy/
+share/tinyproxy/debug.html
+share/tinyproxy/default.html
+share/tinyproxy/stats.html
+@rcscript ${RCDIR}/tinyproxy
+@mode 700
+@owner _tinyproxy
+@group _tinyproxy
+@sample /var/log/tinyproxy/
Index: pkg/tinyproxy.rc
===================================================================
RCS file: pkg/tinyproxy.rc
diff -N pkg/tinyproxy.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/tinyproxy.rc 26 Feb 2012 18:32:11 -0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/sbin/tinyproxy"
+
+. /etc/rc.d/rc.subr
+
+rc_pre() {
+ install -d -o _tinyproxy -g _tinyproxy /var/run/tinyproxy
+}
+
+rc_cmd $1
