Date: Sun, 7 Jan 2007 04:00:13 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/107630: Update port: irc/ctrlproxy to 3.0.1 Message-ID: <20070107040013.8e23876a.tkato432@yahoo.com> Resent-Message-ID: <200701061920.l06JKHes061117@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 107630 >Category: ports >Synopsis: Update port: irc/ctrlproxy to 3.0.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: Sat Jan 06 19:20:16 GMT 2007 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p26 i386 >Organization: >Environment: >Description: - Update to version 3.0.1 New file: files/patch-Makefile files/patch-src__internals.h files/patch-src__network.h Remove file: files/patch-Makefile.in files/patch-doc-Makefile.in files/patch-mods:Makefile.in files/patch-mods:stats.c files/patch-printstats.c >How-To-Repeat: >Fix: diff -urN /usr/ports/irc/ctrlproxy/Makefile irc/ctrlproxy/Makefile --- /usr/ports/irc/ctrlproxy/Makefile Sat Nov 5 20:50:58 2005 +++ irc/ctrlproxy/Makefile Fri Jan 5 23:46:46 2007 @@ -7,70 +7,36 @@ # PORTNAME= ctrlproxy -PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTVERSION= 3.0.1 CATEGORIES= irc -MASTER_SITES= http://jelmer.vernstok.nl/releases/ +MASTER_SITES= http://ctrlproxy.vernstok.nl/releases/ MAINTAINER= ports@FreeBSD.org COMMENT= Flexible IRC proxy -LIB_DEPENDS= tdb.1:${PORTSDIR}/databases/tdb \ - pcre.0:${PORTSDIR}/devel/pcre \ - popt.0:${PORTSDIR}/devel/popt +LIB_DEPENDS= gnutls.15:${PORTSDIR}/security/gnutls -USE_OPENSSL= yes -USE_GNOME= glib20 libxml2 +USE_GNOME= glib20 gnometarget +USE_GCC= 3.4+ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -PORTDOCS1= AUTHORS ChangeLog README TODO -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib - -.if defined(WITH_CTRLPROXY_DOC) -BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto -BUILD_DEPENDS+= dia:${PORTSDIR}/graphics/dia -CONFIGURE_ARGS+= --enable-docs MAN1= ctrlproxy.1 -MAN5= ctrlproxyrc.5 -MAN7= admin.7ctrlproxy antiflood.7ctrlproxy \ - auto-away.7ctrlproxy ctcp.7ctrlproxy \ - linestack_file.7ctrlproxy linestack_memory.7ctrlproxy \ - log_custom.7ctrlproxy log_irssi.7ctrlproxy \ - motd-file.7ctrlproxy nickserv.7ctrlproxy \ - noticelog.7ctrlproxy repl_command.7ctrlproxy \ - repl_highlight.7ctrlproxy repl_none.7ctrlproxy \ - repl_simple.7ctrlproxy socket.7ctrlproxy \ - stats.7ctrlproxy strip.7ctrlproxy -PORTDOCS2= ctrlproxy.html overview.png overview2.png -.endif +MAN5= ctrlproxy_config.5 -PORTDOCS= ${PORTDOCS1} ${PORTDOCS2} +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib post-install: -.if !defined(NOPORTDOC) + ${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy.1 ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy_config.5 ${MANPREFIX}/man/man5 +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for i in ${PORTDOCS1} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/ -.endfor -.endif -.if defined(WITH_CTRLPROXY_DOC) -.for i in ${MAN1} - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man1/ -.endfor -.for i in ${MAN5} - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man5/ -.endfor -.for i in ${MAN7} - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man7/ -.endfor -.if !defined(NOPORTDOC) -.for i in ${PORTDOCS2} - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}/ +.for file in AUTHORS BUGS HACKING NEWS README UPGRADING + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor -.endif + ${INSTALL_DATA} ${WRKSRC}/doc/user-guide.html ${DOCSDIR} .endif .include <bsd.port.mk> diff -urN /usr/ports/irc/ctrlproxy/distinfo irc/ctrlproxy/distinfo --- /usr/ports/irc/ctrlproxy/distinfo Mon Nov 21 01:39:33 2005 +++ irc/ctrlproxy/distinfo Fri Jan 5 23:06:42 2007 @@ -1,3 +1,3 @@ -MD5 (ctrlproxy-2.6.2.tar.gz) = 62fc258cb17902b38b39dc5c5a4e27f9 -SHA256 (ctrlproxy-2.6.2.tar.gz) = c15f94f89881d6354fc32187ac368b88d8aa13490eab741658ad98c659a0db3a -SIZE (ctrlproxy-2.6.2.tar.gz) = 184320 +MD5 (ctrlproxy-3.0.1.tar.gz) = 060a264fd698a83afa13ca1a2c932a11 +SHA256 (ctrlproxy-3.0.1.tar.gz) = 0ae5e06f2ca459550013b4bdfb4297dc7788e923a60660fc12b86726485856e2 +SIZE (ctrlproxy-3.0.1.tar.gz) = 203873 diff -urN /usr/ports/irc/ctrlproxy/files/patch-Makefile irc/ctrlproxy/files/patch-Makefile --- /usr/ports/irc/ctrlproxy/files/patch-Makefile Thu Jan 1 09:00:00 1970 +++ irc/ctrlproxy/files/patch-Makefile Fri Jan 5 23:44:59 2007 @@ -0,0 +1,21 @@ +--- Makefile.orig Fri Jan 5 06:33:03 2007 ++++ Makefile Fri Jan 5 23:44:47 2007 +@@ -96,17 +96,14 @@ + $(INSTALL) -d $(DESTDIR)$(bindir) + $(INSTALL) -d $(DESTDIR)$(destincludedir) + $(INSTALL) -d $(DESTDIR)$(modulesdir) +- $(INSTALL) -d $(DESTDIR)$(docdir) + $(INSTALL) -d $(DESTDIR)$(cdatadir) +- $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig ++ $(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig + + install-bin: + $(INSTALL) ctrlproxy$(EXEEXT) $(DESTDIR)$(bindir) + + install-doc: doc + $(INSTALL) -m 0644 $(headers) $(DESTDIR)$(destincludedir) +- $(INSTALL) -m 0644 UPGRADING $(DESTDIR)$(docdir) +- $(MAKE) -C doc install PACKAGE_VERSION=$(PACKAGE_VERSION) + + install-data: + $(INSTALL) -m 0644 motd $(DESTDIR)$(cdatadir) diff -urN /usr/ports/irc/ctrlproxy/files/patch-Makefile.in irc/ctrlproxy/files/patch-Makefile.in --- /usr/ports/irc/ctrlproxy/files/patch-Makefile.in Fri Apr 22 02:36:31 2005 +++ irc/ctrlproxy/files/patch-Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,29 +0,0 @@ ---- Makefile.in.orig Wed Feb 4 10:28:45 2004 -+++ Makefile.in Thu Apr 21 02:05:12 2005 -@@ -24,7 +24,7 @@ - $(CC) $(LIBS) -rdynamic -o $@ $(OBJS) - - printstats: printstats.o -- $(CC) -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)$(cdatadir) - $(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)$(cdatadir) 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 Tue Oct 11 15:11:10 2005 +++ irc/ctrlproxy/files/patch-doc-Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig Mon Jan 5 22:30:51 2004 -+++ doc/Makefile.in Tue Oct 11 07:25:39 2005 -@@ -2,7 +2,7 @@ - MOD_MANPAGES = $(patsubst %.mod.xml,%.7ctrlproxy,$(MOD_SOURCES)) - MOD_MANPAGES_HTML = $(patsubst %.mod.xml,%.7ctrlproxy.html,$(MOD_SOURCES)) - MODS = $(patsubst %.mod.xml,%.xml,$(MOD_SOURCES)) --DOCS = ctrlproxy.1 ctrlproxyrc.5 ctrlproxy.pdf ctrlproxy.html $(MOD_MANPAGES) -+DOCS = ctrlproxy.1 ctrlproxyrc.5 overview.png overview2.png ctrlproxy.html $(MOD_MANPAGES) - XSLTPROC = @XSLTPROC@ --xinclude - PDFLATEX = @PDFLATEX@ - XMLTO = @XMLTO@ 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 Mar 5 10:43:13 2004 +++ irc/ctrlproxy/files/patch-mods:Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- mods/Makefile.in.orig Wed Oct 22 22:37:21 2003 -+++ mods/Makefile.in Wed Oct 22 22:37:47 2003 -@@ -17,7 +17,7 @@ - $(CC) $(CFLAGS) -fPIC -c $< - - libstats.so: stats.o -- $(CC) $(CFLAGS) -shared -o $@ $< -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 Fri Mar 5 10:43:13 2004 +++ irc/ctrlproxy/files/patch-mods:stats.c Thu Jan 1 09:00:00 1970 @@ -1,16 +0,0 @@ ---- 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> - #include <sys/stat.h> -+#include <tdb.h> - #include <fcntl.h> - - #define MAX_REGEX_SUBMATCHES 30 diff -urN /usr/ports/irc/ctrlproxy/files/patch-printstats.c irc/ctrlproxy/files/patch-printstats.c --- /usr/ports/irc/ctrlproxy/files/patch-printstats.c Wed Jan 7 11:53:22 2004 +++ irc/ctrlproxy/files/patch-printstats.c Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- printstats.c.orig Wed Jan 7 09:18:37 2004 -+++ printstats.c Wed Jan 7 09:18:46 2004 -@@ -27,9 +27,9 @@ - #include <stdlib.h> - #include <stdio.h> - #include <time.h> --#include <tdb.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <tdb.h> - #include <fcntl.h> - - int traverse_keys(TDB_CONTEXT *tdb_context, TDB_DATA key, TDB_DATA value, void *pattern) diff -urN /usr/ports/irc/ctrlproxy/files/patch-src__internals.h irc/ctrlproxy/files/patch-src__internals.h --- /usr/ports/irc/ctrlproxy/files/patch-src__internals.h Thu Jan 1 09:00:00 1970 +++ irc/ctrlproxy/files/patch-src__internals.h Fri Jan 5 23:27:54 2007 @@ -0,0 +1,18 @@ +--- src/internals.h.orig Fri Jan 5 06:33:06 2007 ++++ src/internals.h Fri Jan 5 23:27:32 2007 +@@ -29,12 +29,13 @@ + # include <unistd.h> + #endif + #include <netdb.h> +-#include <sys/socket.h> + #include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> ++#include <arpa/inet.h> + #include <errno.h> + #include <stdio.h> + #include <stdlib.h> +-#include <sys/types.h> + #include <string.h> + #include <stdarg.h> + #include <signal.h> diff -urN /usr/ports/irc/ctrlproxy/files/patch-src__network.h irc/ctrlproxy/files/patch-src__network.h --- /usr/ports/irc/ctrlproxy/files/patch-src__network.h Thu Jan 1 09:00:00 1970 +++ irc/ctrlproxy/files/patch-src__network.h Fri Jan 5 23:29:48 2007 @@ -0,0 +1,13 @@ +--- src/network.h.orig Fri Jan 5 06:33:07 2007 ++++ src/network.h Fri Jan 5 23:29:33 2007 +@@ -30,7 +30,10 @@ + #endif + + #include "state.h" ++#include <sys/types.h> + #include <sys/socket.h> ++#include <netinet/in.h> ++#include <arpa/inet.h> + + struct global; + struct network; diff -urN /usr/ports/irc/ctrlproxy/pkg-descr irc/ctrlproxy/pkg-descr --- /usr/ports/irc/ctrlproxy/pkg-descr Tue Jan 24 03:45:42 2006 +++ irc/ctrlproxy/pkg-descr Fri Jan 5 21:18:36 2007 @@ -5,4 +5,4 @@ if you don't want to leave IRC but still want to be able to use it from home, school or work. -WWW: http://jelmer.vernstok.nl/oss/ctrlproxy +WWW: http://ctrlproxy.vernstok.nl/ diff -urN /usr/ports/irc/ctrlproxy/pkg-plist irc/ctrlproxy/pkg-plist --- /usr/ports/irc/ctrlproxy/pkg-plist Tue Oct 11 16:36:35 2005 +++ irc/ctrlproxy/pkg-plist Fri Jan 5 23:49:51 2007 @@ -1,23 +1,40 @@ bin/ctrlproxy -include/ctrlproxy.h -lib/ctrlproxy/libadmin.so -lib/ctrlproxy/libantiflood.so -lib/ctrlproxy/libauto-away.so -lib/ctrlproxy/libctcp.so -lib/ctrlproxy/liblinestack_memory.so +include/ctrlproxy-3.0/admin.h +include/ctrlproxy-3.0/client.h +include/ctrlproxy-3.0/ctcp.h +include/ctrlproxy-3.0/ctrlproxy.h +include/ctrlproxy-3.0/hooks.h +include/ctrlproxy-3.0/irc.h +include/ctrlproxy-3.0/line.h +include/ctrlproxy-3.0/linestack.h +include/ctrlproxy-3.0/log.h +include/ctrlproxy-3.0/network.h +include/ctrlproxy-3.0/repl.h +include/ctrlproxy-3.0/settings.h +include/ctrlproxy-3.0/ssl.h +include/ctrlproxy-3.0/state.h +lib/ctrlproxy/libauto_away.so +lib/ctrlproxy/liblistener.so lib/ctrlproxy/liblog_custom.so lib/ctrlproxy/liblog_irssi.so -lib/ctrlproxy/libmotd_file.so -lib/ctrlproxy/libnickserv.so -lib/ctrlproxy/libnoticelog.so -lib/ctrlproxy/librepl_command.so lib/ctrlproxy/librepl_highlight.so -lib/ctrlproxy/librepl_memory.so -lib/ctrlproxy/librepl_none.so +lib/ctrlproxy/librepl_lastdisconnect.so lib/ctrlproxy/librepl_simple.so -lib/ctrlproxy/libsocket.so -lib/ctrlproxy/libstats.so -lib/ctrlproxy/libstrip.so +lib/ctrlproxy/libsocks.so +libdata/pkgconfig/ctrlproxy.pc +%%DATADIR%%/default/config +%%DATADIR%%/default/networks/admin %%DATADIR%%/motd +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/BUGS +%%PORTDOCS%%%%DOCSDIR%%/HACKING +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/UPGRADING +%%PORTDOCS%%%%DOCSDIR%%/user-guide.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/default/networks +@dirrm %%DATADIR%%/default @dirrm %%DATADIR%% @dirrm lib/ctrlproxy +@dirrm include/ctrlproxy-3.0 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070107040013.8e23876a.tkato432>