Index: head/news/nn/pkg-install
===================================================================
--- head/news/nn/pkg-install	(revision 548595)
+++ head/news/nn/pkg-install	(nonexistent)
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-if [ "x$2" != "xPOST-INSTALL" ]; then
-	exit
-fi
-
-cat << xxENDxx
-
-*******************************************************************
-You have just installed the $1 package
-
-Please set your NNTP server address or hostname in the file:
-
-xxENDxx
-
-echo "${PKG_PREFIX}/etc/nntp_server"
-echo ""
-
-cat << xxENDxx
-If desired, please set your domain name for From: addresses when
-posting in the file (default is to use your hostname):
-
-xxENDxx
-
-echo "${PKG_PREFIX}/etc/nntp_domain"
-echo ""
-
-cat << xxENDxx
-*******************************************************************
-xxENDxx
-
-cat << xxENDxx > ${PKG_PREFIX}/etc/nntp_server.dist
-# nntp_server: Configuration file for NN newsreader
-# 
-# Set your NNTP server address or hostname in this file.
-#
-# If this file is left blank, NN will use the server set in the
-# NNTP_SERVER environment variable.
-#
-# news.myisp.com
-xxENDxx
-
-if [ ! -e ${PKG_PREFIX}/etc/nntp_server ]; then
-	cp ${PKG_PREFIX}/etc/nntp_server.dist ${PKG_PREFIX}/etc/nntp_server
-fi
-
-cat << xxENDxx > ${PKG_PREFIX}/etc/nntp_domain.dist
-# nntp_domain: Configuration file for NN newsreader
-# 
-# Set the default domain name portion of user e-mail addresses as you
-# would like them to appear in the From: line of articles posted
-# with NN.
-#
-# For example, setting the name to foobar.com in this file will cause
-# the From: line for joeuser to look like something like this:
-#
-# From: joeuser@foobar.com (Joe User)
-#
-# If this file is left blank, NN will use the hostname of this
-# computer as the From: domain name.
-xxENDxx
-
-if [ ! -e ${PKG_PREFIX}/etc/nntp_domain ]; then
-	cp ${PKG_PREFIX}/etc/nntp_domain.dist ${PKG_PREFIX}/etc/nntp_domain
-fi

Property changes on: head/news/nn/pkg-install
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/news/nn/Makefile
===================================================================
--- head/news/nn/Makefile	(revision 548595)
+++ head/news/nn/Makefile	(revision 548596)
@@ -1,28 +1,35 @@
 # Created by: adam
 # $FreeBSD$
 
 PORTNAME=	nn
 PORTVERSION=	6.7.3
 PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.nndev.org/pub/nn-${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Menu based USENET newsreader
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 
+SUB_FILES=	pkg-message
+
 USES=		tar:Z
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -Iconf" LDFLAGS="${LDFLAGS} -s"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -Iconf -fcommon" LDFLAGS="${LDFLAGS} -s"
 
 pre-patch:
 	@${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h.unparsed
 
 pre-build:
 	@${SED} 's#SUB_PREFIX#${PREFIX}#; s#SUB_MANPREFIX#${MANPREFIX}#' \
 		${WRKSRC}/config.h.unparsed > ${WRKSRC}/config.h
 
 post-build:
 	@${REINPLACE_CMD} 's#${PREFIX}#$${DESTDIR}&#' ${WRKSRC}/inst
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/nntp_domain.dist \
+			${FILESDIR}/nntp_server.dist \
+			${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>
Index: head/news/nn/files/nntp_domain.dist
===================================================================
--- head/news/nn/files/nntp_domain.dist	(nonexistent)
+++ head/news/nn/files/nntp_domain.dist	(revision 548596)
@@ -0,0 +1,13 @@
+# nntp_domain: Configuration file for NN newsreader
+#
+# Set the default domain name portion of user e-mail addresses as you
+# would like them to appear in the From: line of articles posted
+# with NN.
+#
+# For example, setting the name to foobar.com in this file will cause
+# the From: line for joeuser to look like something like this:
+#
+# From: joeuser@foobar.com (Joe User)
+#
+# If this file is left blank, NN will use the hostname of this
+# computer as the From: domain name.

Property changes on: head/news/nn/files/nntp_domain.dist
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/news/nn/files/nntp_server.dist
===================================================================
--- head/news/nn/files/nntp_server.dist	(nonexistent)
+++ head/news/nn/files/nntp_server.dist	(revision 548596)
@@ -0,0 +1,8 @@
+# nntp_server: Configuration file for NN newsreader
+#
+# Set your NNTP server address or hostname in this file.
+#
+# If this file is left blank, NN will use the server set in the
+# NNTP_SERVER environment variable.
+#
+# news.myisp.com

Property changes on: head/news/nn/files/nntp_server.dist
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/news/nn/files/pkg-message.in
===================================================================
--- head/news/nn/files/pkg-message.in	(nonexistent)
+++ head/news/nn/files/pkg-message.in	(revision 548596)
@@ -0,0 +1,13 @@
+[
+{
+type: install
+message: <<EOM
+Please set your NNTP server address or hostname in the file:
+%%PREFIX%%/etc/nntp_server
+
+If desired, please set your domain name for From: addresses when
+posting in the file (default is to use your hostname):
+%%PREFIX%%/etc/nntp_domain
+EOM
+}
+]

Property changes on: head/news/nn/files/pkg-message.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/news/nn/pkg-plist
===================================================================
--- head/news/nn/pkg-plist	(revision 548595)
+++ head/news/nn/pkg-plist	(revision 548596)
@@ -1,50 +1,49 @@
 bin/nn
 bin/nnusage
 bin/nngrab
 bin/nnstats
 bin/nncheck
 bin/nnadmin
 bin/nntidy
 bin/nngoback
 bin/nngrep
 bin/nnpost
 bin/nnbatch
 bin/nnview
-@unexec if cmp -s %D/etc/nntp_domain %D/etc/nntp_domain.dist; then rm -f %D/etc/nntp_domain; fi
-@unexec if cmp -s %D/etc/nntp_server %D/etc/nntp_server.dist; then rm -f %D/etc/nntp_server; fi
-@unexec rm -f %D/etc/nntp_domain.dist %D/etc/nntp_server.dist
+@sample etc/nntp_domain.dist etc/nntp_domain
+@sample etc/nntp_server.dist etc/nntp_server
 lib/nn/aux
 lib/nn/upgrade_rc
 lib/nn/conf
 lib/nn/help/adm.upgrade1
 lib/nn/help/adm.upgrade2
 lib/nn/help/adm.upgrade3
 lib/nn/help/adm.upgrade4
 lib/nn/help/adm.welcome
 lib/nn/help/help.attr
 lib/nn/help/help.commands
 lib/nn/help/help.extended
 lib/nn/help/help.help
 lib/nn/help/help.map
 lib/nn/help/help.menu
 lib/nn/help/help.more
 lib/nn/help/help.read
 lib/nn/help/help.set
 lib/nn/help/help.show
 lib/nn/help/help.sort
 lib/nn/help/help.variables
 lib/nn/help/Manual
 man/man1/nn.1.gz
 man/man1/nnacct.1m.gz
 man/man1/nnadmin.1m.gz
 man/man1/nncheck.1.gz
 man/man1/nngoback.1.gz
 man/man1/nngrab.1.gz
 man/man1/nngrep.1.gz
 man/man1/nnpost.1.gz
 man/man1/nnstats.1m.gz
 man/man1/nntidy.1.gz
 man/man1/nnusage.1m.gz
 man/man1/nnview.1.gz
 man/man8/nnmaster.8.gz
 man/man8/nnspew.8.gz