ports/63751: Update port: irc/ctrlproxy to 2.6.1
KATO Tsuguru
tkato at prontomail.com
Thu Mar 4 12:10:11 UTC 2004
>Number: 63751
>Category: ports
>Synopsis: Update port: irc/ctrlproxy to 2.6.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 04 04:10:11 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 2.6.1
New file:
files/patch-doc:Makefile.in
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/irc/ctrlproxy/Makefile irc/ctrlproxy/Makefile
--- /usr/ports/irc/ctrlproxy/Makefile Wed Feb 4 18:59:54 2004
+++ irc/ctrlproxy/Makefile Thu Mar 4 19:17:23 2004
@@ -7,8 +7,7 @@
#
PORTNAME= ctrlproxy
-PORTVERSION= 2.6
-PORTREVISION= 2
+PORTVERSION= 2.6.1
CATEGORIES= irc
MASTER_SITES= http://jelmer.vernstok.nl/ctrlproxy/
@@ -19,14 +18,11 @@
pcre.0:${PORTSDIR}/devel/pcre \
tdb.1:${PORTSDIR}/databases/tdb
-USE_REINPLACE= yes
USE_OPENSSL= yes
-USE_GNOME= libxml2 glib20
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+USE_GNOME= glib20 libxml2
USE_GMAKE= yes
-MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= ctrlproxy.1
MAN5= ctrlproxyrc.5
@@ -37,8 +33,15 @@
repl_highlight.7ctrlproxy repl_none.7ctrlproxy repl_simple.7ctrlproxy \
socket.7ctrlproxy stats.7ctrlproxy strip.7ctrlproxy
-post-patch:
- @${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${GREP} -lR "malloc\.h" | \
- ${XARGS} ${REINPLACE_CMD} -e "s at malloc.h@stdlib.h at g"
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
+
+post-install:
+.if !defined(NOPORTDOC)
+ @${MKDIR} ${DOCSDIR}
+.for file in AUTHORS TODO doc/ctrlproxy.html doc/ctrlproxy.pdf
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
.include <bsd.port.mk>
diff -urN /usr/ports/irc/ctrlproxy/distinfo irc/ctrlproxy/distinfo
--- /usr/ports/irc/ctrlproxy/distinfo Thu Jan 29 20:26:56 2004
+++ irc/ctrlproxy/distinfo Thu Mar 4 18:55:54 2004
@@ -1,2 +1,2 @@
-MD5 (ctrlproxy-2.6.tar.gz) = f4d242cad2175f1626bb1d5558a8326a
-SIZE (ctrlproxy-2.6.tar.gz) = 409600
+MD5 (ctrlproxy-2.6.1.tar.gz) = 07e802ab99309ecce7ad3b87b16399fb
+SIZE (ctrlproxy-2.6.1.tar.gz) = 409600
diff -urN /usr/ports/irc/ctrlproxy/files/patch-Makefile.in irc/ctrlproxy/files/patch-Makefile.in
--- /usr/ports/irc/ctrlproxy/files/patch-Makefile.in Wed Jan 7 11:53:20 2004
+++ irc/ctrlproxy/files/patch-Makefile.in Thu Mar 4 19:02:28 2004
@@ -1,11 +1,29 @@
---- Makefile.in.orig Tue Oct 14 02:15:45 2003
-+++ Makefile.in Wed Oct 22 22:47:20 2003
-@@ -23,7 +23,7 @@
+--- Makefile.in.orig Mon Jan 12 09:26:24 2004
++++ Makefile.in Thu Mar 4 19:02:20 2004
+@@ -24,7 +24,7 @@
$(CC) $(LIBS) -rdynamic -o $@ $(OBJS)
printstats: printstats.o
- $(CC) -ltdb -o $@ $<
-+ $(CC) ${LIBS} -ltdb -o $@ $<
++ $(CC) -ltdb -o $@ $< @LDFLAGS@
%.o: %.c
$(CC) $(CFLAGS) -c $<
+@@ -36,7 +36,6 @@
+ $(INSTALL) -d $(DESTDIR)$(man5dir)
+ $(INSTALL) -d $(DESTDIR)$(includedir)
+ $(INSTALL) -d $(DESTDIR)$(modulesdir)
+- $(INSTALL) -d $(DESTDIR)$(docdir)
+ $(INSTALL) -d $(DESTDIR)$(datadir)
+ $(MAKE) -C doc install
+
+@@ -45,9 +44,6 @@
+
+ install-doc:
+ $(INSTALL) ctrlproxy.h $(DESTDIR)$(includedir)
+- $(INSTALL) AUTHORS $(DESTDIR)$(docdir)
+- $(INSTALL) COPYING $(DESTDIR)$(docdir)
+- $(INSTALL) TODO $(DESTDIR)$(docdir)
+
+ install-data:
+ $(INSTALL) motd $(DESTDIR)$(datadir)
diff -urN /usr/ports/irc/ctrlproxy/files/patch-doc:Makefile.in irc/ctrlproxy/files/patch-doc:Makefile.in
--- /usr/ports/irc/ctrlproxy/files/patch-doc:Makefile.in Thu Jan 1 09:00:00 1970
+++ irc/ctrlproxy/files/patch-doc:Makefile.in Thu Mar 4 19:01:55 2004
@@ -0,0 +1,15 @@
+--- doc/Makefile.in.orig Tue Jan 20 04:29:52 2004
++++ doc/Makefile.in Thu Mar 4 19:01:46 2004
+@@ -51,12 +51,9 @@
+ $(INSTALL) -d $(DESTDIR)$(man1dir)
+ $(INSTALL) -d $(DESTDIR)$(man5dir)
+ $(INSTALL) -d $(DESTDIR)$(man7dir)
+- $(INSTALL) -d $(DESTDIR)$(docdir)
+ $(INSTALL) ctrlproxy.1 $(DESTDIR)$(man1dir)
+ $(INSTALL) ctrlproxyrc.5 $(DESTDIR)$(man5dir)
+ $(INSTALL) $(MOD_MANPAGES) $(DESTDIR)$(man7dir)
+- $(INSTALL) ctrlproxy.pdf $(DESTDIR)$(docdir)
+- $(INSTALL) ctrlproxy.html $(DESTDIR)$(docdir)
+ else
+ @echo
+ @echo "---------------------------------------------------------------"
diff -urN /usr/ports/irc/ctrlproxy/files/patch-mods:Makefile.in irc/ctrlproxy/files/patch-mods:Makefile.in
--- /usr/ports/irc/ctrlproxy/files/patch-mods:Makefile.in Fri Oct 24 11:57:10 2003
+++ irc/ctrlproxy/files/patch-mods:Makefile.in Thu Mar 4 18:58:25 2004
@@ -5,7 +5,7 @@
libstats.so: stats.o
- $(CC) $(CFLAGS) -shared -o $@ $< -ltdb @LIB_PCRE@
-+ $(CC) $(CFLAGS) -shared -o $@ $< @LIBS@ -ltdb @LIB_PCRE@
++ $(CC) $(CFLAGS) -shared -o $@ $< -ltdb @LIB_PCRE@ @LDFLAGS@
libsocket.so: @SOCKET_OBJS@
$(CC) $(CFLAGS) -shared -o $@ @SOCKET_OBJS@ @SSL_LIB@
diff -urN /usr/ports/irc/ctrlproxy/files/patch-mods:stats.c irc/ctrlproxy/files/patch-mods:stats.c
--- /usr/ports/irc/ctrlproxy/files/patch-mods:stats.c Wed Jan 7 10:24:32 2004
+++ irc/ctrlproxy/files/patch-mods:stats.c Thu Mar 4 19:08:27 2004
@@ -1,8 +1,11 @@
---- mods/stats.c.orig Wed Jan 7 09:20:11 2004
-+++ mods/stats.c Wed Jan 7 09:20:19 2004
-@@ -28,9 +28,9 @@
- #include <malloc.h>
+--- mods/stats.c.orig Wed Dec 10 05:46:40 2003
++++ mods/stats.c Thu Mar 4 19:08:20 2004
+@@ -25,12 +25,10 @@
#include <stdio.h>
+ #include <stdarg.h>
+ #include <string.h>
+-#include <malloc.h>
+-#include <stdio.h>
#include <time.h>
-#include <tdb.h>
#include <sys/types.h>
diff -urN /usr/ports/irc/ctrlproxy/pkg-plist irc/ctrlproxy/pkg-plist
--- /usr/ports/irc/ctrlproxy/pkg-plist Sat Jan 31 14:43:21 2004
+++ irc/ctrlproxy/pkg-plist Thu Mar 4 19:06:18 2004
@@ -18,12 +18,11 @@
lib/ctrlproxy/libsocket.so
lib/ctrlproxy/libstats.so
lib/ctrlproxy/libstrip.so
-share/ctrlproxy/motd
+%%DATADIR%%/motd
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/ctrlproxy.html
%%PORTDOCS%%%%DOCSDIR%%/ctrlproxy.pdf
%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm share/ctrlproxy
+ at dirrm %%DATADIR%%
@dirrm lib/ctrlproxy
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list