Index: head/news/noffle/Makefile
===================================================================
--- head/news/noffle/Makefile	(revision 443416)
+++ head/news/noffle/Makefile	(revision 443417)
@@ -1,55 +1,58 @@
 # Created by: Kirill Ponomarew <ponomarew@oberon.net>
 # $FreeBSD$
 
 PORTNAME=	noffle
 PORTVERSION=	1.1.5
 PORTREVISION=	2
 CATEGORIES=	news
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28devel%29/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	News server for low speed dial-up connections
 
 LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
-GNU_CONFIGURE=	yes
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFIGURE_ARGS+=--with-configfile=${LOCALBASE}/etc/noffle.conf \
+USES=		localbase
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-configfile=${LOCALBASE}/etc/noffle.conf \
 		--with-usersfile=${LOCALBASE}/etc/noffle.users
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 
-SPOOL_DIR=	/var/spool/noffle
-PLIST_SUB+=	SPOOL_DIR=${SPOOL_DIR}
+PLIST_SUB=	SPOOL_DIR=${SPOOL_DIR}
 SUB_FILES=	pkg-message
 
-DOCS=		ChangeLog docs/FAQ INSTALL docs/INTERNALS README \
+SPOOL_DIR=	/var/spool/noffle
+
+DOCS=		ChangeLog docs/FAQ docs/INTERNALS README \
 		docs/testing.txt docs/noffle.lsm
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-	's|/etc/noffle.conf|${PREFIX}/etc/noffle.conf|g' \
+		's|/etc/noffle.conf|${PREFIX}/etc/noffle.conf|g' \
 		${WRKSRC}/docs/${PORTNAME}.1 \
 		${WRKSRC}/docs/${PORTNAME}.conf.5
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/docs/noffle.1 \
-		${STAGEDIR}${PREFIX}/man/man1
+		${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/docs/noffle.conf.5 \
-		${STAGEDIR}${PREFIX}/man/man5
+		${STAGEDIR}${MANPREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/noffle.conf.example \
 		${STAGEDIR}${PREFIX}/etc/noffle.conf.sample
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${SPOOL_DIR}/data \
 		${STAGEDIR}${SPOOL_DIR}/lock \
 		${STAGEDIR}${SPOOL_DIR}/outgoing \
 		${STAGEDIR}${SPOOL_DIR}/overview \
 		${STAGEDIR}${SPOOL_DIR}/requested
 
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/news/noffle/files/patch-src__client.c
===================================================================
--- head/news/noffle/files/patch-src__client.c	(revision 443416)
+++ head/news/noffle/files/patch-src__client.c	(revision 443417)
@@ -1,10 +1,10 @@
---- src/client.c.orig	Sun Oct 26 22:31:18 2003
-+++ src/client.c	Sun Oct 26 22:31:34 2003
+--- src/client.c.orig	2003-06-20 10:39:31 UTC
++++ src/client.c
 @@ -8,6 +8,7 @@
  #include <config.h>
  #endif
  
 +#include <sys/types.h>
  #include <stdio.h>
  #include <arpa/inet.h>
  #include <ctype.h>
Index: head/news/noffle/pkg-descr
===================================================================
--- head/news/noffle/pkg-descr	(revision 443416)
+++ head/news/noffle/pkg-descr	(revision 443417)
@@ -1,8 +1,8 @@
 Noffle is a Usenet news server optimized for few users and low
 speed dial-up connections to the Internet. It acts as a server
 to news clients running on the local host, but gets its news
 feed by acting as a client to a remote server. Allows reading
 news offline with many news clients, even if they do not
 support offline reading by themselves.
 
-WWW: http://noffle.sourceforge.net
+WWW: http://noffle.sourceforge.net/
Index: head/news/noffle/pkg-plist
===================================================================
--- head/news/noffle/pkg-plist	(revision 443416)
+++ head/news/noffle/pkg-plist	(revision 443417)
@@ -1,17 +1,16 @@
 bin/noffle
 man/man1/noffle.1.gz
 man/man5/noffle.conf.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INTERNALS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/noffle.lsm
 %%PORTDOCS%%%%DOCSDIR%%/testing.txt
 etc/noffle.conf.sample
 @dir %%SPOOL_DIR%%/data
 @dir %%SPOOL_DIR%%/lock
 @dir %%SPOOL_DIR%%/outgoing
 @dir %%SPOOL_DIR%%/overview
 @dir %%SPOOL_DIR%%/requested
 @dir %%SPOOL_DIR%%