View | Details | Raw Unified | Return to bug 107630
Collapse All | Expand All

(-)irc/ctrlproxy/Makefile (-48 / +14 lines)
Lines 7-76 Link Here
7
#
7
#
8
8
9
PORTNAME=	ctrlproxy
9
PORTNAME=	ctrlproxy
10
PORTVERSION=	2.6.2
10
PORTVERSION=	3.0.1
11
PORTREVISION=	1
12
CATEGORIES=	irc
11
CATEGORIES=	irc
13
MASTER_SITES=	http://jelmer.vernstok.nl/releases/
12
MASTER_SITES=	http://ctrlproxy.vernstok.nl/releases/
14
13
15
MAINTAINER=	ports@FreeBSD.org
14
MAINTAINER=	ports@FreeBSD.org
16
COMMENT=	Flexible IRC proxy
15
COMMENT=	Flexible IRC proxy
17
16
18
LIB_DEPENDS=	tdb.1:${PORTSDIR}/databases/tdb \
17
LIB_DEPENDS=	gnutls.15:${PORTSDIR}/security/gnutls
19
		pcre.0:${PORTSDIR}/devel/pcre \
20
		popt.0:${PORTSDIR}/devel/popt
21
18
22
USE_OPENSSL=	yes
19
USE_GNOME=	glib20 gnometarget
23
USE_GNOME=	glib20 libxml2
20
USE_GCC=	3.4+
24
USE_GMAKE=	yes
21
USE_GMAKE=	yes
25
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
26
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
23
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
27
PORTDOCS1=	AUTHORS ChangeLog README TODO
28
24
29
CPPFLAGS=	-I${LOCALBASE}/include
30
LDFLAGS=	-L${LOCALBASE}/lib
31
32
.if defined(WITH_CTRLPROXY_DOC)
33
BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto
34
BUILD_DEPENDS+=	dia:${PORTSDIR}/graphics/dia
35
CONFIGURE_ARGS+=	--enable-docs
36
MAN1=		ctrlproxy.1
25
MAN1=		ctrlproxy.1
37
MAN5=		ctrlproxyrc.5
26
MAN5=		ctrlproxy_config.5
38
MAN7=		admin.7ctrlproxy antiflood.7ctrlproxy \
39
		auto-away.7ctrlproxy ctcp.7ctrlproxy \
40
		linestack_file.7ctrlproxy linestack_memory.7ctrlproxy \
41
		log_custom.7ctrlproxy log_irssi.7ctrlproxy \
42
		motd-file.7ctrlproxy nickserv.7ctrlproxy \
43
		noticelog.7ctrlproxy repl_command.7ctrlproxy \
44
		repl_highlight.7ctrlproxy repl_none.7ctrlproxy \
45
		repl_simple.7ctrlproxy socket.7ctrlproxy \
46
		stats.7ctrlproxy strip.7ctrlproxy
47
PORTDOCS2=	ctrlproxy.html overview.png overview2.png
48
.endif
49
27
50
PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
28
CPPFLAGS=	-I${LOCALBASE}/include
29
LDFLAGS=	-L${LOCALBASE}/lib
51
30
52
post-install:
31
post-install:
53
.if !defined(NOPORTDOC)
32
	${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy.1 ${MANPREFIX}/man/man1
33
	${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy_config.5 ${MANPREFIX}/man/man5
34
.if !defined(NOPORTDOCS)
54
	@${MKDIR} ${DOCSDIR}
35
	@${MKDIR} ${DOCSDIR}
55
.for i in ${PORTDOCS1}
36
.for file in AUTHORS BUGS HACKING NEWS README UPGRADING
56
	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
37
	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
57
.endfor
58
.endif
59
.if defined(WITH_CTRLPROXY_DOC)
60
.for i in ${MAN1}
61
	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man1/
62
.endfor
63
.for i in ${MAN5}
64
	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man5/
65
.endfor
66
.for i in ${MAN7}
67
	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man7/
68
.endfor
69
.if !defined(NOPORTDOC)
70
.for i in ${PORTDOCS2}
71
	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}/
72
.endfor
38
.endfor
73
.endif
39
	${INSTALL_DATA} ${WRKSRC}/doc/user-guide.html ${DOCSDIR}
74
.endif
40
.endif
75
41
76
.include <bsd.port.mk>
42
.include <bsd.port.mk>
(-)irc/ctrlproxy/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (ctrlproxy-2.6.2.tar.gz) = 62fc258cb17902b38b39dc5c5a4e27f9
1
MD5 (ctrlproxy-3.0.1.tar.gz) = 060a264fd698a83afa13ca1a2c932a11
2
SHA256 (ctrlproxy-2.6.2.tar.gz) = c15f94f89881d6354fc32187ac368b88d8aa13490eab741658ad98c659a0db3a
2
SHA256 (ctrlproxy-3.0.1.tar.gz) = 0ae5e06f2ca459550013b4bdfb4297dc7788e923a60660fc12b86726485856e2
3
SIZE (ctrlproxy-2.6.2.tar.gz) = 184320
3
SIZE (ctrlproxy-3.0.1.tar.gz) = 203873
(-)irc/ctrlproxy/files/patch-Makefile (+21 lines)
Line 0 Link Here
1
--- Makefile.orig	Fri Jan  5 06:33:03 2007
2
+++ Makefile	Fri Jan  5 23:44:47 2007
3
@@ -96,17 +96,14 @@
4
 	$(INSTALL) -d $(DESTDIR)$(bindir)
5
 	$(INSTALL) -d $(DESTDIR)$(destincludedir)
6
 	$(INSTALL) -d $(DESTDIR)$(modulesdir)
7
-	$(INSTALL) -d $(DESTDIR)$(docdir)
8
 	$(INSTALL) -d $(DESTDIR)$(cdatadir)
9
-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
10
+	$(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig
11
 
12
 install-bin:
13
 	$(INSTALL) ctrlproxy$(EXEEXT) $(DESTDIR)$(bindir)
14
 
15
 install-doc: doc
16
 	$(INSTALL) -m 0644 $(headers) $(DESTDIR)$(destincludedir)
17
-	$(INSTALL) -m 0644 UPGRADING $(DESTDIR)$(docdir)
18
-	$(MAKE) -C doc install PACKAGE_VERSION=$(PACKAGE_VERSION)
19
 
20
 install-data:
21
 	$(INSTALL) -m 0644 motd $(DESTDIR)$(cdatadir)
(-)irc/ctrlproxy/files/patch-Makefile.in (-29 lines)
Lines 1-29 Link Here
1
--- Makefile.in.orig	Wed Feb  4 10:28:45 2004
2
+++ Makefile.in	Thu Apr 21 02:05:12 2005
3
@@ -24,7 +24,7 @@
4
 	$(CC) $(LIBS) -rdynamic -o $@ $(OBJS)
5
 
6
 printstats: printstats.o
7
-	$(CC) -ltdb -o $@ $<
8
+	$(CC) -ltdb -o $@ $< @LDFLAGS@
9
 
10
 %.o: %.c
11
 	$(CC) $(CFLAGS) -c $<
12
@@ -36,7 +36,6 @@
13
 	$(INSTALL) -d $(DESTDIR)$(man5dir)
14
 	$(INSTALL) -d $(DESTDIR)$(includedir)
15
 	$(INSTALL) -d $(DESTDIR)$(modulesdir)
16
-	$(INSTALL) -d $(DESTDIR)$(docdir)
17
 	$(INSTALL) -d $(DESTDIR)$(cdatadir)
18
 	$(MAKE) -C doc install 
19
 	
20
@@ -45,9 +44,6 @@
21
 
22
 install-doc:
23
 	$(INSTALL) ctrlproxy.h $(DESTDIR)$(includedir)
24
-	$(INSTALL) AUTHORS $(DESTDIR)$(docdir)
25
-	$(INSTALL) COPYING $(DESTDIR)$(docdir)
26
-	$(INSTALL) TODO $(DESTDIR)$(docdir)
27
 
28
 install-data:
29
 	$(INSTALL) motd $(DESTDIR)$(cdatadir)
(-)irc/ctrlproxy/files/patch-doc-Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- doc/Makefile.in.orig	Mon Jan  5 22:30:51 2004
2
+++ doc/Makefile.in	Tue Oct 11 07:25:39 2005
3
@@ -2,7 +2,7 @@
4
 MOD_MANPAGES = $(patsubst %.mod.xml,%.7ctrlproxy,$(MOD_SOURCES))
5
 MOD_MANPAGES_HTML = $(patsubst %.mod.xml,%.7ctrlproxy.html,$(MOD_SOURCES))
6
 MODS = $(patsubst %.mod.xml,%.xml,$(MOD_SOURCES))
7
-DOCS = ctrlproxy.1 ctrlproxyrc.5 ctrlproxy.pdf ctrlproxy.html $(MOD_MANPAGES)
8
+DOCS = ctrlproxy.1 ctrlproxyrc.5 overview.png overview2.png ctrlproxy.html $(MOD_MANPAGES)
9
 XSLTPROC = @XSLTPROC@ --xinclude
10
 PDFLATEX = @PDFLATEX@
11
 XMLTO = @XMLTO@
(-)irc/ctrlproxy/files/patch-mods:Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- mods/Makefile.in.orig	Wed Oct 22 22:37:21 2003
2
+++ mods/Makefile.in	Wed Oct 22 22:37:47 2003
3
@@ -17,7 +17,7 @@
4
 	$(CC) $(CFLAGS) -fPIC -c $<
5
 
6
 libstats.so: stats.o
7
-	$(CC) $(CFLAGS) -shared -o $@ $< -ltdb @LIB_PCRE@
8
+	$(CC) $(CFLAGS) -shared -o $@ $< -ltdb @LIB_PCRE@ @LDFLAGS@
9
 
10
 libsocket.so: @SOCKET_OBJS@
11
 	$(CC) $(CFLAGS) -shared -o $@ @SOCKET_OBJS@ @SSL_LIB@
(-)irc/ctrlproxy/files/patch-mods:stats.c (-16 lines)
Lines 1-16 Link Here
1
--- mods/stats.c.orig	Wed Dec 10 05:46:40 2003
2
+++ mods/stats.c	Thu Mar  4 19:08:20 2004
3
@@ -25,12 +25,10 @@
4
 #include <stdio.h>
5
 #include <stdarg.h>
6
 #include <string.h>
7
-#include <malloc.h>
8
-#include <stdio.h>
9
 #include <time.h>
10
-#include <tdb.h>
11
 #include <sys/types.h>
12
 #include <sys/stat.h>
13
+#include <tdb.h>
14
 #include <fcntl.h>
15
 
16
 #define MAX_REGEX_SUBMATCHES 30
(-)irc/ctrlproxy/files/patch-printstats.c (-13 lines)
Lines 1-13 Link Here
1
--- printstats.c.orig	Wed Jan  7 09:18:37 2004
2
+++ printstats.c	Wed Jan  7 09:18:46 2004
3
@@ -27,9 +27,9 @@
4
 #include <stdlib.h>
5
 #include <stdio.h>
6
 #include <time.h>
7
-#include <tdb.h>
8
 #include <sys/types.h>
9
 #include <sys/stat.h>
10
+#include <tdb.h>
11
 #include <fcntl.h>
12
 
13
 int traverse_keys(TDB_CONTEXT *tdb_context, TDB_DATA key, TDB_DATA value, void *pattern)
(-)irc/ctrlproxy/files/patch-src__internals.h (+18 lines)
Line 0 Link Here
1
--- src/internals.h.orig	Fri Jan  5 06:33:06 2007
2
+++ src/internals.h	Fri Jan  5 23:27:32 2007
3
@@ -29,12 +29,13 @@
4
 #  include <unistd.h>
5
 #endif
6
 #include <netdb.h>
7
-#include <sys/socket.h>
8
 #include <sys/types.h>
9
+#include <sys/socket.h>
10
+#include <netinet/in.h>
11
+#include <arpa/inet.h>
12
 #include <errno.h>
13
 #include <stdio.h>
14
 #include <stdlib.h>
15
-#include <sys/types.h>
16
 #include <string.h>
17
 #include <stdarg.h>
18
 #include <signal.h>
(-)irc/ctrlproxy/files/patch-src__network.h (+13 lines)
Line 0 Link Here
1
--- src/network.h.orig	Fri Jan  5 06:33:07 2007
2
+++ src/network.h	Fri Jan  5 23:29:33 2007
3
@@ -30,7 +30,10 @@
4
 #endif
5
 
6
 #include "state.h"
7
+#include <sys/types.h>
8
 #include <sys/socket.h>
9
+#include <netinet/in.h>
10
+#include <arpa/inet.h>
11
 
12
 struct global;
13
 struct network;
(-)irc/ctrlproxy/pkg-descr (-1 / +1 lines)
Lines 5-8 Link Here
5
if you don't want to leave IRC but still want to be able to use it from home,
5
if you don't want to leave IRC but still want to be able to use it from home,
6
school or work.
6
school or work.
7
7
8
WWW: http://jelmer.vernstok.nl/oss/ctrlproxy
8
WWW: http://ctrlproxy.vernstok.nl/
(-)irc/ctrlproxy/pkg-plist (-15 / +32 lines)
Lines 1-23 Link Here
1
bin/ctrlproxy
1
bin/ctrlproxy
2
include/ctrlproxy.h
2
include/ctrlproxy-3.0/admin.h
3
lib/ctrlproxy/libadmin.so
3
include/ctrlproxy-3.0/client.h
4
lib/ctrlproxy/libantiflood.so
4
include/ctrlproxy-3.0/ctcp.h
5
lib/ctrlproxy/libauto-away.so
5
include/ctrlproxy-3.0/ctrlproxy.h
6
lib/ctrlproxy/libctcp.so
6
include/ctrlproxy-3.0/hooks.h
7
lib/ctrlproxy/liblinestack_memory.so
7
include/ctrlproxy-3.0/irc.h
8
include/ctrlproxy-3.0/line.h
9
include/ctrlproxy-3.0/linestack.h
10
include/ctrlproxy-3.0/log.h
11
include/ctrlproxy-3.0/network.h
12
include/ctrlproxy-3.0/repl.h
13
include/ctrlproxy-3.0/settings.h
14
include/ctrlproxy-3.0/ssl.h
15
include/ctrlproxy-3.0/state.h
16
lib/ctrlproxy/libauto_away.so
17
lib/ctrlproxy/liblistener.so
8
lib/ctrlproxy/liblog_custom.so
18
lib/ctrlproxy/liblog_custom.so
9
lib/ctrlproxy/liblog_irssi.so
19
lib/ctrlproxy/liblog_irssi.so
10
lib/ctrlproxy/libmotd_file.so
11
lib/ctrlproxy/libnickserv.so
12
lib/ctrlproxy/libnoticelog.so
13
lib/ctrlproxy/librepl_command.so
14
lib/ctrlproxy/librepl_highlight.so
20
lib/ctrlproxy/librepl_highlight.so
15
lib/ctrlproxy/librepl_memory.so
21
lib/ctrlproxy/librepl_lastdisconnect.so
16
lib/ctrlproxy/librepl_none.so
17
lib/ctrlproxy/librepl_simple.so
22
lib/ctrlproxy/librepl_simple.so
18
lib/ctrlproxy/libsocket.so
23
lib/ctrlproxy/libsocks.so
19
lib/ctrlproxy/libstats.so
24
libdata/pkgconfig/ctrlproxy.pc
20
lib/ctrlproxy/libstrip.so
25
%%DATADIR%%/default/config
26
%%DATADIR%%/default/networks/admin
21
%%DATADIR%%/motd
27
%%DATADIR%%/motd
28
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
29
%%PORTDOCS%%%%DOCSDIR%%/BUGS
30
%%PORTDOCS%%%%DOCSDIR%%/HACKING
31
%%PORTDOCS%%%%DOCSDIR%%/NEWS
32
%%PORTDOCS%%%%DOCSDIR%%/README
33
%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
34
%%PORTDOCS%%%%DOCSDIR%%/user-guide.html
35
%%PORTDOCS%%@dirrm %%DOCSDIR%%
36
@dirrm %%DATADIR%%/default/networks
37
@dirrm %%DATADIR%%/default
22
@dirrm %%DATADIR%%
38
@dirrm %%DATADIR%%
23
@dirrm lib/ctrlproxy
39
@dirrm lib/ctrlproxy
40
@dirrm include/ctrlproxy-3.0

Return to bug 107630