diff -ruN --exclude=CVS /usr/ports/irc/ctrlproxy/Makefile /disk/3/home/nivo/ports/ctrlproxy/Makefile --- /usr/ports/irc/ctrlproxy/Makefile Tue Jan 9 23:54:57 2007 +++ /disk/3/home/nivo/ports/ctrlproxy/Makefile Sat Jun 16 12:03:07 2007 @@ -7,7 +7,7 @@ # PORTNAME= ctrlproxy -PORTVERSION= 3.0.1 +PORTVERSION= 3.0.2 CATEGORIES= irc MASTER_SITES= http://ctrlproxy.vernstok.nl/releases/ @@ -21,6 +21,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +USE_LDCONFIG= ${PREFIX}/lib/ctrlproxy MAN1= ctrlproxy.1 MAN5= ctrlproxy_config.5 diff -ruN --exclude=CVS /usr/ports/irc/ctrlproxy/distinfo /disk/3/home/nivo/ports/ctrlproxy/distinfo --- /usr/ports/irc/ctrlproxy/distinfo Tue Jan 9 23:54:57 2007 +++ /disk/3/home/nivo/ports/ctrlproxy/distinfo Sat Jun 16 11:40:09 2007 @@ -1,3 +1,3 @@ -MD5 (ctrlproxy-3.0.1.tar.gz) = 060a264fd698a83afa13ca1a2c932a11 -SHA256 (ctrlproxy-3.0.1.tar.gz) = 0ae5e06f2ca459550013b4bdfb4297dc7788e923a60660fc12b86726485856e2 -SIZE (ctrlproxy-3.0.1.tar.gz) = 203873 +MD5 (ctrlproxy-3.0.2.tar.gz) = d0f24cc2234f1cf7897a32a4425382a7 +SHA256 (ctrlproxy-3.0.2.tar.gz) = fd1bad34bd5ceb2db78e5e380ae5a7a227541b7be5f56a061c7f188ded553273 +SIZE (ctrlproxy-3.0.2.tar.gz) = 225263 diff -ruN --exclude=CVS /usr/ports/irc/ctrlproxy/files/patch-Makefile /disk/3/home/nivo/ports/ctrlproxy/files/patch-Makefile --- /usr/ports/irc/ctrlproxy/files/patch-Makefile Tue Jan 9 23:54:57 2007 +++ /disk/3/home/nivo/ports/ctrlproxy/files/patch-Makefile Sat Jun 16 12:00:49 2007 @@ -1,21 +1,31 @@ ---- 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) +--- Makefile.orig Sun Apr 15 14:17:58 2007 ++++ Makefile Sat Jun 16 12:00:33 2007 +@@ -90,7 +90,7 @@ + ctrlproxy.pc Makefile.settings: configure Makefile.settings.in ctrlproxy.pc.in + ./$< + +-install: all install-dirs install-bin install-header install-mods install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS) ++install: all install-dirs install-bin install-mods install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS) + install-dirs: $(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) +@@ -113,8 +113,6 @@ - install-doc: doc - $(INSTALL) -m 0644 $(headers) $(DESTDIR)$(destincludedir) + install-doc:: doc + $(INSTALL) -d $(DESTDIR)$(docdir) - $(INSTALL) -m 0644 UPGRADING $(DESTDIR)$(docdir) - $(MAKE) -C doc install PACKAGE_VERSION=$(PACKAGE_VERSION) - install-data: - $(INSTALL) -m 0644 motd $(DESTDIR)$(cdatadir) + uninstall-doc: + $(MAKE) -C doc uninstall +@@ -146,8 +144,8 @@ + -rmdir $(DESTDIR)$(modulesdir) + + install-pkgconfig: +- $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig +- $(INSTALL) -m 0644 ctrlproxy.pc $(DESTDIR)$(libdir)/pkgconfig ++ $(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig ++ $(INSTALL) -m 0644 ctrlproxy.pc $(DESTDIR)$(prefix)/libdata/pkgconfig + + uninstall-pkgconfig: + -rm -f $(DESTDIR)$(libdir)/pkgconfig/ctrlproxy.pc diff -ruN --exclude=CVS /usr/ports/irc/ctrlproxy/files/patch-src__network.h /disk/3/home/nivo/ports/ctrlproxy/files/patch-src__network.h --- /usr/ports/irc/ctrlproxy/files/patch-src__network.h Tue Jan 9 23:54:57 2007 +++ /disk/3/home/nivo/ports/ctrlproxy/files/patch-src__network.h Sat Jun 16 11:47:24 2007 @@ -1,13 +1,14 @@ ---- 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 @@ +--- src/network.h.orig Sun Apr 15 14:17:58 2007 ++++ src/network.h Sat Jun 16 11:46:55 2007 +@@ -30,8 +30,11 @@ #endif #include "state.h" +#include + #include "isupport.h" #include +#include +#include - struct global; - struct network; + #define DEFAULT_NETWORK_CHARSET NULL + diff -ruN --exclude=CVS /usr/ports/irc/ctrlproxy/pkg-plist /disk/3/home/nivo/ports/ctrlproxy/pkg-plist --- /usr/ports/irc/ctrlproxy/pkg-plist Tue Jan 9 23:54:57 2007 +++ /disk/3/home/nivo/ports/ctrlproxy/pkg-plist Sat Jun 16 12:02:29 2007 @@ -18,9 +18,8 @@ %%PORTDOCS%%%%DOCSDIR%%/UPGRADING %%PORTDOCS%%%%DOCSDIR%%/user-guide.html %%PORTDOCS%%@dirrm %%DOCSDIR%% -lib/pkgconfig +libdata/pkgconfig/ctrlproxy.pc @dirrm %%DATADIR%%/default/networks @dirrm %%DATADIR%%/default @dirrm %%DATADIR%% @dirrm lib/ctrlproxy -@dirrm include/ctrlproxy-3.0