Date: Sun, 29 Jan 2006 15:11:05 -0800 (PST) From: infofarmer@gmail.com To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92519: update www/webredirect Message-ID: <43dd4b89.39c86f0a.2652.7dff@mx.gmail.com> Resent-Message-ID: <200601300110.k0U1A3Ad057893@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92519
>Category: ports
>Synopsis: update www/webredirect
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 30 01:10:02 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Andrew Pantyukhin
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD sat64.net17 6.0-STABLE FreeBSD 6.0-STABLE #4: Fri Jan 20 02:24:10 MSK 2006 sat@sat64.net17:/usr/obj/usr/src/sys/SATCUR32 i386
>Description:
o Add rcng script
o Remove superfluous pkg-message
o Rename patches as suggested by portlint
>How-To-Repeat:
>Fix:
--- webredirect.diff begins here ---
diff -urN /usr/ports/www/webredirect/Makefile webredirect/Makefile
--- /usr/ports/www/webredirect/Makefile Fri Feb 6 16:12:43 2004
+++ webredirect/Makefile Mon Jan 30 02:06:10 2006
@@ -17,8 +17,7 @@
MAN1= webredirect.1
PLIST_FILES= bin/webredirect
-
-.include <bsd.port.pre.mk>
+USE_RC_SUBR= webredirect.sh
pre-build:
@${TOUCH} ${WRKSRC}/incu/depend.mk
@@ -28,7 +27,4 @@
${INSTALL_PROGRAM} ${WRKSRC}/webredirect ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/webredirect.1 ${PREFIX}/man/man1
-post-install:
- @${SETENV} ${MAKE_ENV} ${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/www/webredirect/files/patch-incu-Makefile webredirect/files/patch-incu-Makefile
--- /usr/ports/www/webredirect/files/patch-incu-Makefile Thu Jan 1 03:00:00 1970
+++ webredirect/files/patch-incu-Makefile Mon Jan 30 02:00:02 2006
@@ -0,0 +1,22 @@
+
+$FreeBSD: ports/www/webredirect/files/patch-incu::Makefile,v 1.2 2003/07/18 03:34:53 leeym Exp $
+
+--- incu/Makefile 2001/03/14 15:13:51 1.1
++++ incu/Makefile 2001/03/14 15:14:08
+@@ -1,6 +1,6 @@
+ SRC = error.cc socket.cc log.cc system.cc time.cc pipe.cc
+ OBJS = ${SRC:.cc=.o}
+-CXXFLAGS = -I. -pipe -g -Wall -O2
++CXXFLAGS += -I. -pipe -Wall
+ RANLIB = ranlib
+
+ all: libincu.a depend.mk .cvsignore
+@@ -9,7 +9,7 @@
+ rm -f ${OBJS}
+
+ libincu.a: ${OBJS}
+- -rm $@
++ rm -f $@
+ ${AR} cq $@ ${OBJS} ${ARADD}
+ ${RANLIB} $@
+
diff -urN /usr/ports/www/webredirect/files/patch-incu-incu-log.hh webredirect/files/patch-incu-incu-log.hh
--- /usr/ports/www/webredirect/files/patch-incu-incu-log.hh Thu Jan 1 03:00:00 1970
+++ webredirect/files/patch-incu-incu-log.hh Mon Jan 30 02:00:02 2006
@@ -0,0 +1,18 @@
+--- incu/incu/log.hh.orig Fri Sep 12 00:55:24 2003
++++ incu/incu/log.hh Fri Sep 12 01:17:07 2003
+@@ -34,10 +34,15 @@
+ static void setTreshold(LogGrade t) { silence = t; }
+ /** Boring workaround ... Without this, the first thing to get appended to
+ * the Log gets broken. */
++
++ // The following does not work with gcc 2.95.4, but it was a workaround
++ // for GCC 3.x brokenness anyway.
++#if !defined (__GNUC__) || __GNUC__ > 2
+ template<typename T>
+ std::ostream& operator << (const T& t) {
+ return *((std::ostream*)(this)) << t;
+ }
++#endif
+ private:
+ static LogGrade silence;
+ class DeviceMgr;
diff -urN /usr/ports/www/webredirect/files/patch-incu::Makefile webredirect/files/patch-incu::Makefile
--- /usr/ports/www/webredirect/files/patch-incu::Makefile Fri Jul 18 07:34:53 2003
+++ webredirect/files/patch-incu::Makefile Thu Jan 1 03:00:00 1970
@@ -1,22 +0,0 @@
-
-$FreeBSD: ports/www/webredirect/files/patch-incu::Makefile,v 1.2 2003/07/18 03:34:53 leeym Exp $
-
---- incu/Makefile 2001/03/14 15:13:51 1.1
-+++ incu/Makefile 2001/03/14 15:14:08
-@@ -1,6 +1,6 @@
- SRC = error.cc socket.cc log.cc system.cc time.cc pipe.cc
- OBJS = ${SRC:.cc=.o}
--CXXFLAGS = -I. -pipe -g -Wall -O2
-+CXXFLAGS += -I. -pipe -Wall
- RANLIB = ranlib
-
- all: libincu.a depend.mk .cvsignore
-@@ -9,7 +9,7 @@
- rm -f ${OBJS}
-
- libincu.a: ${OBJS}
-- -rm $@
-+ rm -f $@
- ${AR} cq $@ ${OBJS} ${ARADD}
- ${RANLIB} $@
-
diff -urN /usr/ports/www/webredirect/files/patch-incu::incu::log.hh webredirect/files/patch-incu::incu::log.hh
--- /usr/ports/www/webredirect/files/patch-incu::incu::log.hh Tue Sep 23 02:09:17 2003
+++ webredirect/files/patch-incu::incu::log.hh Thu Jan 1 03:00:00 1970
@@ -1,18 +0,0 @@
---- incu/incu/log.hh.orig Fri Sep 12 00:55:24 2003
-+++ incu/incu/log.hh Fri Sep 12 01:17:07 2003
-@@ -34,10 +34,15 @@
- static void setTreshold(LogGrade t) { silence = t; }
- /** Boring workaround ... Without this, the first thing to get appended to
- * the Log gets broken. */
-+
-+ // The following does not work with gcc 2.95.4, but it was a workaround
-+ // for GCC 3.x brokenness anyway.
-+#if !defined (__GNUC__) || __GNUC__ > 2
- template<typename T>
- std::ostream& operator << (const T& t) {
- return *((std::ostream*)(this)) << t;
- }
-+#endif
- private:
- static LogGrade silence;
- class DeviceMgr;
diff -urN /usr/ports/www/webredirect/files/webredirect.sh.in webredirect/files/webredirect.sh.in
--- /usr/ports/www/webredirect/files/webredirect.sh.in Thu Jan 1 03:00:00 1970
+++ webredirect/files/webredirect.sh.in Mon Jan 30 02:02:39 2006
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PROVIDE: webredirect
+# REQUIRE: DAEMON
+
+#
+# Add the following lines to /etc/rc.conf to enable webredirect:
+#
+# webredirect_enable="YES" # YES or NO (default)
+# webredirect_flags="" # webredirect command line flags
+#
+
+. %%RC_SUBR%%
+
+name="webredirect"
+rcvar=`set_rcvar`
+command_args="&"
+
+load_rc_config $name
+
+: ${webredirect_enable="NO"}
+: ${webredirect_flags="-t http://www.freebsd.org -n"}
+
+command="%%PREFIX%%/bin/${name}"
+
+run_rc_command "$1"
diff -urN /usr/ports/www/webredirect/pkg-message webredirect/pkg-message
--- /usr/ports/www/webredirect/pkg-message Fri Jul 18 07:34:53 2003
+++ webredirect/pkg-message Thu Jan 1 03:00:00 1970
@@ -1,4 +0,0 @@
-Webredirect is installed but does not start automatically. Read the manpage
-to find out what options you like. Then start webredirect manually. If you
-want webredirect to start automatically on boot, create a small script in
-${PREFIX}/etc/rc.d to do so.
--- webredirect.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?43dd4b89.39c86f0a.2652.7dff>