svn commit: r385950 - in head/www/tinyproxy: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sun May 10 12:45:42 UTC 2015
Author: sunpoet
Date: Sun May 10 12:45:39 2015
New Revision: 385950
URL: https://svnweb.freebsd.org/changeset/ports/385950
Log:
- Cleanup CONFIGURE_ARGS: --localstatedir=/var was added by bsd.port.mk since r384380
- Cleanup Makefile
- Regenerate patch files with makepatch:
Added:
head/www/tinyproxy/files/patch-etc-Makefile.in
- copied, changed from r385904, head/www/tinyproxy/files/patch-etc__Makefile.in
head/www/tinyproxy/files/patch-src-main.c
- copied, changed from r385904, head/www/tinyproxy/files/patch-src__main.c
Deleted:
head/www/tinyproxy/files/patch-etc__Makefile.in
head/www/tinyproxy/files/patch-src__main.c
Modified:
head/www/tinyproxy/Makefile
head/www/tinyproxy/files/patch-Makefile.in
head/www/tinyproxy/files/patch-configure
Modified: head/www/tinyproxy/Makefile
==============================================================================
--- head/www/tinyproxy/Makefile Sun May 10 12:45:34 2015 (r385949)
+++ head/www/tinyproxy/Makefile Sun May 10 12:45:39 2015 (r385950)
@@ -22,7 +22,6 @@ XHEADER_DESC= X-Tinyproxy header
CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \
--disable-silent-rules \
- --localstatedir=/var \
--program-transform-name=""
GNU_CONFIGURE= yes
USE_RC_SUBR= ${PORTNAME}
@@ -39,16 +38,6 @@ post-patch:
${WRKSRC}/docs/man8/tinyproxy.txt.in \
${WRKSRC}/etc/tinyproxy.conf.in
@${REINPLACE_CMD} -e '/\/usr\/share\/tinyproxy/d' ${WRKSRC}/etc/tinyproxy.conf.in
-# @${REINPLACE_CMD} \
-# -e 's|/etc/tinyproxy/tinyproxy.conf|${PREFIX}/etc/tinyproxy.conf|' \
-# -e 's|/var/log/tinyproxy/tinyproxy.log|/var/log/tinyproxy.log|' \
-# 's|/var/run/tinyproxy/tinyproxy.pid|/var/run/tinyproxy.pid|' \
-# ${WRKSRC}/docs/man5/tinyproxy.conf.txt.in ${WRKSRC}/docs/man8/tinyproxy.txt.in
-# @${REINPLACE_CMD} \
-# -e 's|/log/tinyproxy/|/log/|' \
-# -e 's|/run/tinyproxy/|/run/|' \
-# -e 's|/usr/share/tinyproxy|${DATADIR}|' \
-# ${WRKSRC}/etc/tinyproxy.conf.in
post-install:
${INSTALL_DATA} ${WRKSRC}/etc/tinyproxy.conf ${STAGEDIR}${PREFIX}/etc/tinyproxy.conf.sample
Modified: head/www/tinyproxy/files/patch-Makefile.in
==============================================================================
--- head/www/tinyproxy/files/patch-Makefile.in Sun May 10 12:45:34 2015 (r385949)
+++ head/www/tinyproxy/files/patch-Makefile.in Sun May 10 12:45:39 2015 (r385950)
@@ -1,6 +1,6 @@
---- ./Makefile.in.orig 2011-08-16 08:27:58.000000000 -0400
-+++ ./Makefile.in 2011-10-22 08:11:22.000000000 -0400
-@@ -222,7 +222,6 @@
+--- Makefile.in.orig 2011-08-16 12:27:58 UTC
++++ Makefile.in
+@@ -222,7 +222,6 @@ SUBDIRS = \
src \
data \
etc \
Modified: head/www/tinyproxy/files/patch-configure
==============================================================================
--- head/www/tinyproxy/files/patch-configure Sun May 10 12:45:34 2015 (r385949)
+++ head/www/tinyproxy/files/patch-configure Sun May 10 12:45:39 2015 (r385950)
@@ -1,6 +1,38 @@
---- ./configure.orig 2011-10-22 08:06:07.000000000 -0400
-+++ ./configure 2011-10-22 08:06:26.000000000 -0400
-@@ -6865,11 +6865,7 @@
+--- configure.orig 2011-08-16 12:27:59 UTC
++++ configure
+@@ -3626,13 +3626,13 @@ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+- CFLAGS="-g -O2"
++ CFLAGS="-g "
+ else
+ CFLAGS="-g"
+ fi
+ else
+ if test "$GCC" = yes; then
+- CFLAGS="-O2"
++ CFLAGS=""
+ else
+ CFLAGS=
+ fi
+@@ -4889,13 +4889,13 @@ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+- CFLAGS="-g -O2"
++ CFLAGS="-g "
+ else
+ CFLAGS="-g"
+ fi
+ else
+ if test "$GCC" = yes; then
+- CFLAGS="-O2"
++ CFLAGS=""
+ else
+ CFLAGS=
+ fi
+@@ -6865,11 +6865,7 @@ else
HAVE_A2X_FALSE=
fi
Copied and modified: head/www/tinyproxy/files/patch-etc-Makefile.in (from r385904, head/www/tinyproxy/files/patch-etc__Makefile.in)
==============================================================================
--- head/www/tinyproxy/files/patch-etc__Makefile.in Sat May 9 16:50:00 2015 (r385904, copy source)
+++ head/www/tinyproxy/files/patch-etc-Makefile.in Sun May 10 12:45:39 2015 (r385950)
@@ -1,6 +1,6 @@
---- ./etc/Makefile.in.orig 2010-06-21 10:10:59.000000000 -0400
-+++ ./etc/Makefile.in 2010-06-21 10:11:42.000000000 -0400
-@@ -248,8 +248,10 @@
+--- etc/Makefile.in.orig 2011-08-16 12:27:58 UTC
++++ etc/Makefile.in
+@@ -248,8 +248,10 @@ install-sysconfDATA: $(sysconf_DATA)
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
Copied and modified: head/www/tinyproxy/files/patch-src-main.c (from r385904, head/www/tinyproxy/files/patch-src__main.c)
==============================================================================
--- head/www/tinyproxy/files/patch-src__main.c Sat May 9 16:50:00 2015 (r385904, copy source)
+++ head/www/tinyproxy/files/patch-src-main.c Sun May 10 12:45:39 2015 (r385950)
@@ -1,6 +1,6 @@
---- ./src/main.c.orig 2010-06-21 13:39:34.000000000 -0400
-+++ ./src/main.c 2010-06-21 13:40:20.000000000 -0400
-@@ -407,12 +407,9 @@
+--- src/main.c.orig 2011-08-16 12:14:34 UTC
++++ src/main.c
+@@ -407,12 +407,9 @@ main (int argc, char **argv)
exit (EX_OSERR);
}
@@ -16,7 +16,7 @@
/* Create log file after we drop privileges */
if (setup_logging ()) {
-@@ -427,6 +424,13 @@
+@@ -427,6 +424,13 @@ main (int argc, char **argv)
exit (EX_OSERR);
}
}
More information about the svn-ports-head
mailing list