- Add LICENSE

- Switch to USES=localbase
- Use MANPREFIX
- Switch to options helpers
- Fix WWW:
- Don't install unneeded docfile

4 files changed, 18 insertions, 16 deletions

diff --git a/news/noffle/Makefile b/news/noffle/Makefile
index 6564d53fee7a..a0ce669cb352 100644
--- a/news/noffle/Makefile
+++ b/news/noffle/Makefile
@@ -12,25 +12,27 @@ 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
 
@@ -38,18 +40,19 @@ 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>
diff --git a/news/noffle/files/patch-src__client.c b/news/noffle/files/patch-src__client.c
index eb40947712b4..7997fa3e48e3 100644
--- a/news/noffle/files/patch-src__client.c
+++ b/news/noffle/files/patch-src__client.c
@@ -1,5 +1,5 @@
---- 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
diff --git a/news/noffle/pkg-descr b/news/noffle/pkg-descr
index f4b6d73d3a69..016d348fb2c1 100644
--- a/news/noffle/pkg-descr
+++ b/news/noffle/pkg-descr
@@ -5,4 +5,4 @@ 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/
diff --git a/news/noffle/pkg-plist b/news/noffle/pkg-plist
index 88baea3a1932..63cc77ab5598 100644
--- a/news/noffle/pkg-plist
+++ b/news/noffle/pkg-plist
@@ -3,7 +3,6 @@ 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