Attachment #40572 for bug #63751

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




#

PORTNAME=	ctrlproxy
PORTVERSION=	2.6.1
PORTREVISION=	2
CATEGORIES=	irc
MASTER_SITES=	http://jelmer.vernstok.nl/ctrlproxy/


		pcre.0:${PORTSDIR}/devel/pcre \
		tdb.1:${PORTSDIR}/databases/tdb

USE_REINPLACE=	yes
USE_OPENSSL=	yes
USE_GNOME=	glib20 libxml2
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
		LIBS="-L${LOCALBASE}/lib"
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

MAN1=	ctrlproxy.1
MAN5=	ctrlproxyrc.5

	repl_highlight.7ctrlproxy repl_none.7ctrlproxy repl_simple.7ctrlproxy \
	socket.7ctrlproxy stats.7ctrlproxy strip.7ctrlproxy

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>

Lines 1-2 Link Here

(-)irc/ctrlproxy/distinfo (-2 / +2 lines)
1	MD5 (ctrlproxy-2.6.tar.gz) = f4d242cad2175f1626bb1d5558a8326a	1	MD5 (ctrlproxy-2.6.1.tar.gz) = 07e802ab99309ecce7ad3b87b16399fb
2	SIZE (ctrlproxy-2.6.tar.gz) = 409600	2	SIZE (ctrlproxy-2.6.1.tar.gz) = 409600




--- 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) -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)




--- 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 "---------------------------------------------------------------"

Lines 5-11 Link Here

(-)irc/ctrlproxy/files/patch-mods:Makefile.in (-1 / +1 lines)
5		5
6	libstats.so: stats.o	6	libstats.so: stats.o
7	- $(CC) $(CFLAGS) -shared -o $@ $< -ltdb @LIB_PCRE@	7	- $(CC) $(CFLAGS) -shared -o $@ $< -ltdb @LIB_PCRE@
8	+ $(CC) $(CFLAGS) -shared -o $@ $< @LIBS@ -ltdb @LIB_PCRE@	8	+ $(CC) $(CFLAGS) -shared -o $@ $< -ltdb @LIB_PCRE@ @LDFLAGS@
9		9
10	libsocket.so: @SOCKET_OBJS@	10	libsocket.so: @SOCKET_OBJS@
11	$(CC) $(CFLAGS) -shared -o $@ @SOCKET_OBJS@ @SSL_LIB@	11	$(CC) $(CFLAGS) -shared -o $@ @SOCKET_OBJS@ @SSL_LIB@




--- 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 <malloc.h>
 #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>




lib/ctrlproxy/libsocket.so
lib/ctrlproxy/libstats.so
lib/ctrlproxy/libstrip.so
%%DATADIR%%/motd
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/ctrlproxy.html
%%PORTDOCS%%%%DOCSDIR%%/ctrlproxy.pdf
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%
@dirrm lib/ctrlproxy

Return to bug 63751

Lines 7-14 Link Here

(-)irc/ctrlproxy/Makefile (-11 / +14 lines)
7	#	7	#
8		8
9	PORTNAME= ctrlproxy	9	PORTNAME= ctrlproxy
10	PORTVERSION= 2.6	10	PORTVERSION= 2.6.1
11	PORTREVISION= 2
12	CATEGORIES= irc	11	CATEGORIES= irc
13	MASTER_SITES= http://jelmer.vernstok.nl/ctrlproxy/	12	MASTER_SITES= http://jelmer.vernstok.nl/ctrlproxy/
14		13
Lines 19-32 Link Here
19	pcre.0:${PORTSDIR}/devel/pcre \	18	pcre.0:${PORTSDIR}/devel/pcre \
20	tdb.1:${PORTSDIR}/databases/tdb	19	tdb.1:${PORTSDIR}/databases/tdb
21		20
22	USE_REINPLACE= yes
23	USE_OPENSSL= yes	21	USE_OPENSSL= yes
24	USE_GNOME= libxml2 glib20	22	USE_GNOME= glib20 libxml2
25	GNU_CONFIGURE= yes
26	CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
27	LIBS="-L${LOCALBASE}/lib"
28	USE_GMAKE= yes	23	USE_GMAKE= yes
29	MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib"	24	GNU_CONFIGURE= yes
		25	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
30		26
31	MAN1= ctrlproxy.1	27	MAN1= ctrlproxy.1
32	MAN5= ctrlproxyrc.5	28	MAN5= ctrlproxyrc.5
Lines 37-44 Link Here
37	repl_highlight.7ctrlproxy repl_none.7ctrlproxy repl_simple.7ctrlproxy \	33	repl_highlight.7ctrlproxy repl_none.7ctrlproxy repl_simple.7ctrlproxy \
38	socket.7ctrlproxy stats.7ctrlproxy strip.7ctrlproxy	34	socket.7ctrlproxy stats.7ctrlproxy strip.7ctrlproxy
39		35
40	post-patch:	36	CPPFLAGS= -I${LOCALBASE}/include
41	@${FIND} ${WRKSRC} -name "*.c" \| ${XARGS} ${GREP} -lR "malloc\.h" \| \	37	LDFLAGS= -L${LOCALBASE}/lib
42	${XARGS} ${REINPLACE_CMD} -e "s@malloc.h@stdlib.h@g"	38
		39	post-install:
		40	.if !defined(NOPORTDOC)
		41	@${MKDIR} ${DOCSDIR}
		42	.for file in AUTHORS TODO doc/ctrlproxy.html doc/ctrlproxy.pdf
		43	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
		44	.endfor
		45	.endif
43		46
44	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Lines 1-11 Link Here

(-)irc/ctrlproxy/files/patch-Makefile.in (-4 / +22 lines)
1	--- Makefile.in.orig Tue Oct 14 02:15:45 2003	1	--- Makefile.in.orig Mon Jan 12 09:26:24 2004
2	+++ Makefile.in Wed Oct 22 22:47:20 2003	2	+++ Makefile.in Thu Mar 4 19:02:20 2004
3	@@ -23,7 +23,7 @@	3	@@ -24,7 +24,7 @@
4	$(CC) $(LIBS) -rdynamic -o $@ $(OBJS)	4	$(CC) $(LIBS) -rdynamic -o $@ $(OBJS)
5		5
6	printstats: printstats.o	6	printstats: printstats.o
7	- $(CC) -ltdb -o $@ $<	7	- $(CC) -ltdb -o $@ $<
8	+ $(CC) ${LIBS} -ltdb -o $@ $<	8	+ $(CC) -ltdb -o $@ $< @LDFLAGS@
9		9
10	%.o: %.c	10	%.o: %.c
11	$(CC) $(CFLAGS) -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)$(datadir)
		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)$(datadir)

Line 0 Link Here

(-)irc/ctrlproxy/files/patch-doc:Makefile.in (+15 lines)
	1	--- doc/Makefile.in.orig Tue Jan 20 04:29:52 2004
	2	+++ doc/Makefile.in Thu Mar 4 19:01:46 2004
	3	@@ -51,12 +51,9 @@
	4	$(INSTALL) -d $(DESTDIR)$(man1dir)
	5	$(INSTALL) -d $(DESTDIR)$(man5dir)
	6	$(INSTALL) -d $(DESTDIR)$(man7dir)
	7	- $(INSTALL) -d $(DESTDIR)$(docdir)
	8	$(INSTALL) ctrlproxy.1 $(DESTDIR)$(man1dir)
	9	$(INSTALL) ctrlproxyrc.5 $(DESTDIR)$(man5dir)
	10	$(INSTALL) $(MOD_MANPAGES) $(DESTDIR)$(man7dir)
	11	- $(INSTALL) ctrlproxy.pdf $(DESTDIR)$(docdir)
	12	- $(INSTALL) ctrlproxy.html $(DESTDIR)$(docdir)
	13	else
	14	@echo
	15	@echo "---------------------------------------------------------------"

Lines 1-8 Link Here

(-)irc/ctrlproxy/files/patch-mods:stats.c (-4 / +7 lines)
1	--- mods/stats.c.orig Wed Jan 7 09:20:11 2004	1	--- mods/stats.c.orig Wed Dec 10 05:46:40 2003
2	+++ mods/stats.c Wed Jan 7 09:20:19 2004	2	+++ mods/stats.c Thu Mar 4 19:08:20 2004
3	@@ -28,9 +28,9 @@	3	@@ -25,12 +25,10 @@
4	#include <malloc.h>
5	#include <stdio.h>	4	#include <stdio.h>
		5	#include <stdarg.h>
		6	#include <string.h>
		7	-#include <malloc.h>
		8	-#include <stdio.h>
6	#include <time.h>	9	#include <time.h>
7	-#include <tdb.h>	10	-#include <tdb.h>
8	#include <sys/types.h>	11	#include <sys/types.h>

Lines 18-29 Link Here

(-)irc/ctrlproxy/pkg-plist (-3 / +2 lines)
18	lib/ctrlproxy/libsocket.so	18	lib/ctrlproxy/libsocket.so
19	lib/ctrlproxy/libstats.so	19	lib/ctrlproxy/libstats.so
20	lib/ctrlproxy/libstrip.so	20	lib/ctrlproxy/libstrip.so
21	share/ctrlproxy/motd	21	%%DATADIR%%/motd
22	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	22	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
23	%%PORTDOCS%%%%DOCSDIR%%/COPYING
24	%%PORTDOCS%%%%DOCSDIR%%/TODO	23	%%PORTDOCS%%%%DOCSDIR%%/TODO
25	%%PORTDOCS%%%%DOCSDIR%%/ctrlproxy.html	24	%%PORTDOCS%%%%DOCSDIR%%/ctrlproxy.html
26	%%PORTDOCS%%%%DOCSDIR%%/ctrlproxy.pdf	25	%%PORTDOCS%%%%DOCSDIR%%/ctrlproxy.pdf
27	%%PORTDOCS%%@dirrm %%DOCSDIR%%	26	%%PORTDOCS%%@dirrm %%DOCSDIR%%
28	@dirrm share/ctrlproxy	27	@dirrm %%DATADIR%%
29	@dirrm lib/ctrlproxy	28	@dirrm lib/ctrlproxy