diff -urN /usr/ports/irc/ctrlproxy/Makefile irc/ctrlproxy/Makefile
--- /usr/ports/irc/ctrlproxy/Makefile	Sat Mar 12 20:25:12 2005
+++ irc/ctrlproxy/Makefile	Thu Apr 21 02:19:01 2005
@@ -7,17 +7,16 @@
 #
 
 PORTNAME=	ctrlproxy
-PORTVERSION=	2.6.1
-PORTREVISION=	2
+PORTVERSION=	2.6.2
 CATEGORIES=	irc
 MASTER_SITES=	http://jelmer.vernstok.nl/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flexible IRC proxy
 
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+LIB_DEPENDS=	tdb.1:${PORTSDIR}/databases/tdb \
 		pcre.0:${PORTSDIR}/devel/pcre \
-		tdb.1:${PORTSDIR}/databases/tdb
+		popt.0:${PORTSDIR}/devel/popt
 
 USE_OPENSSL=	yes
 USE_GNOME=	glib20 libxml2
@@ -25,22 +24,13 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-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
-
 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
+.for file in AUTHORS ChangeLog README TODO
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff -urN /usr/ports/irc/ctrlproxy/distinfo irc/ctrlproxy/distinfo
--- /usr/ports/irc/ctrlproxy/distinfo	Fri Mar  5 10:43:13 2004
+++ irc/ctrlproxy/distinfo	Thu Apr 21 02:04:07 2005
@@ -1,2 +1,2 @@
-MD5 (ctrlproxy-2.6.1.tar.gz) = 07e802ab99309ecce7ad3b87b16399fb
-SIZE (ctrlproxy-2.6.1.tar.gz) = 409600
+MD5 (ctrlproxy-2.6.2.tar.gz) = 62fc258cb17902b38b39dc5c5a4e27f9
+SIZE (ctrlproxy-2.6.2.tar.gz) = 184320
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 Mar  5 10:43:13 2004
+++ irc/ctrlproxy/files/patch-Makefile.in	Thu Apr 21 02:07:07 2005
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Jan 12 09:26:24 2004
-+++ Makefile.in	Thu Mar  4 19:02:20 2004
+--- 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)
  
@@ -14,7 +14,7 @@
  	$(INSTALL) -d $(DESTDIR)$(includedir)
  	$(INSTALL) -d $(DESTDIR)$(modulesdir)
 -	$(INSTALL) -d $(DESTDIR)$(docdir)
- 	$(INSTALL) -d $(DESTDIR)$(datadir)
+ 	$(INSTALL) -d $(DESTDIR)$(cdatadir)
  	$(MAKE) -C doc install 
  	
 @@ -45,9 +44,6 @@
@@ -26,4 +26,4 @@
 -	$(INSTALL) TODO $(DESTDIR)$(docdir)
  
  install-data:
- 	$(INSTALL) motd $(DESTDIR)$(datadir)
+ 	$(INSTALL) motd $(DESTDIR)$(cdatadir)
diff -urN /usr/ports/irc/ctrlproxy/pkg-plist irc/ctrlproxy/pkg-plist
--- /usr/ports/irc/ctrlproxy/pkg-plist	Fri Mar  5 10:43:13 2004
+++ irc/ctrlproxy/pkg-plist	Thu Apr 21 02:19:17 2005
@@ -20,9 +20,9 @@
 lib/ctrlproxy/libstrip.so
 %%DATADIR%%/motd
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/ctrlproxy.html
-%%PORTDOCS%%%%DOCSDIR%%/ctrlproxy.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
 @dirrm lib/ctrlproxy