diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2007-01-09 22:54:57 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2007-01-09 22:54:57 +0000 |
commit | 4bb2802cdda90076c139902c2c03268a9364d42d (patch) | |
tree | fab38ab5d9dd11ea2d9d10655e0191056275c6cf /irc/ctrlproxy | |
parent | * add version number to LIB_DEPENDS. (diff) |
- Update to 3.0.1
PR: ports/107630
Submitted by: KATO Tsuguru <tkato432@yahoo.com>
Notes
Notes:
svn path=/head/; revision=181928
Diffstat (limited to 'irc/ctrlproxy')
-rw-r--r-- | irc/ctrlproxy/Makefile | 62 | ||||
-rw-r--r-- | irc/ctrlproxy/distinfo | 6 | ||||
-rw-r--r-- | irc/ctrlproxy/files/patch-Makefile | 21 | ||||
-rw-r--r-- | irc/ctrlproxy/files/patch-Makefile.in | 29 | ||||
-rw-r--r-- | irc/ctrlproxy/files/patch-doc-Makefile.in | 11 | ||||
-rw-r--r-- | irc/ctrlproxy/files/patch-mods:Makefile.in | 11 | ||||
-rw-r--r-- | irc/ctrlproxy/files/patch-mods:stats.c | 16 | ||||
-rw-r--r-- | irc/ctrlproxy/files/patch-printstats.c | 13 | ||||
-rw-r--r-- | irc/ctrlproxy/files/patch-src__internals.h | 18 | ||||
-rw-r--r-- | irc/ctrlproxy/files/patch-src__network.h | 13 | ||||
-rw-r--r-- | irc/ctrlproxy/pkg-descr | 2 | ||||
-rw-r--r-- | irc/ctrlproxy/pkg-plist | 33 |
12 files changed, 88 insertions, 147 deletions
diff --git a/irc/ctrlproxy/Makefile b/irc/ctrlproxy/Makefile index bf2af3867d86..b85c1b9887bd 100644 --- a/irc/ctrlproxy/Makefile +++ b/irc/ctrlproxy/Makefile @@ -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}/ +.for file in AUTHORS BUGS HACKING NEWS README UPGRADING + ${INSTALL_DATA} ${WRKSRC}/${file} ${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}/ -.endfor -.endif + ${INSTALL_DATA} ${WRKSRC}/doc/user-guide.html ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/irc/ctrlproxy/distinfo b/irc/ctrlproxy/distinfo index 9671b7f31610..2bb74259e515 100644 --- a/irc/ctrlproxy/distinfo +++ b/irc/ctrlproxy/distinfo @@ -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 --git a/irc/ctrlproxy/files/patch-Makefile b/irc/ctrlproxy/files/patch-Makefile new file mode 100644 index 000000000000..6aea93895d83 --- /dev/null +++ b/irc/ctrlproxy/files/patch-Makefile @@ -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 --git a/irc/ctrlproxy/files/patch-Makefile.in b/irc/ctrlproxy/files/patch-Makefile.in deleted file mode 100644 index ad956004efc1..000000000000 --- a/irc/ctrlproxy/files/patch-Makefile.in +++ /dev/null @@ -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 --git a/irc/ctrlproxy/files/patch-doc-Makefile.in b/irc/ctrlproxy/files/patch-doc-Makefile.in deleted file mode 100644 index 184c13379be2..000000000000 --- a/irc/ctrlproxy/files/patch-doc-Makefile.in +++ /dev/null @@ -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 --git a/irc/ctrlproxy/files/patch-mods:Makefile.in b/irc/ctrlproxy/files/patch-mods:Makefile.in deleted file mode 100644 index b6ae43ad360c..000000000000 --- a/irc/ctrlproxy/files/patch-mods:Makefile.in +++ /dev/null @@ -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 --git a/irc/ctrlproxy/files/patch-mods:stats.c b/irc/ctrlproxy/files/patch-mods:stats.c deleted file mode 100644 index 3c25b0f6ea2d..000000000000 --- a/irc/ctrlproxy/files/patch-mods:stats.c +++ /dev/null @@ -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 --git a/irc/ctrlproxy/files/patch-printstats.c b/irc/ctrlproxy/files/patch-printstats.c deleted file mode 100644 index 85bd160b93bb..000000000000 --- a/irc/ctrlproxy/files/patch-printstats.c +++ /dev/null @@ -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 --git a/irc/ctrlproxy/files/patch-src__internals.h b/irc/ctrlproxy/files/patch-src__internals.h new file mode 100644 index 000000000000..b92da079656e --- /dev/null +++ b/irc/ctrlproxy/files/patch-src__internals.h @@ -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 --git a/irc/ctrlproxy/files/patch-src__network.h b/irc/ctrlproxy/files/patch-src__network.h new file mode 100644 index 000000000000..49e4de7b7b36 --- /dev/null +++ b/irc/ctrlproxy/files/patch-src__network.h @@ -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 --git a/irc/ctrlproxy/pkg-descr b/irc/ctrlproxy/pkg-descr index 238a9a866ef8..3ebc213cad46 100644 --- a/irc/ctrlproxy/pkg-descr +++ b/irc/ctrlproxy/pkg-descr @@ -5,4 +5,4 @@ any number of clients, providing access to these servers. This is very useful 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 --git a/irc/ctrlproxy/pkg-plist b/irc/ctrlproxy/pkg-plist index cad90502fa0c..06bb6883033c 100644 --- a/irc/ctrlproxy/pkg-plist +++ b/irc/ctrlproxy/pkg-plist @@ -1,23 +1,26 @@ 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 +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 +%%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%% +lib/pkgconfig +@dirrm %%DATADIR%%/default/networks +@dirrm %%DATADIR%%/default @dirrm %%DATADIR%% @dirrm lib/ctrlproxy +@dirrm include/ctrlproxy-3.0 |