- Update MASTER_SITES and WWW: line

- Utilize USA_RESIDENT
- Utilize NOPORTDOCS

PR:		56280
Submitted by:	Ports Fury

4 files changed, 16 insertions, 77 deletions

diff --git a/print/nenscript/Makefile b/print/nenscript/Makefile
index 1e1e0faa575f..450bcf8a0e67 100644
--- a/print/nenscript/Makefile
+++ b/print/nenscript/Makefile
@@ -8,25 +8,30 @@
 PORTNAME=	nenscript
 PORTVERSION=	1.13.3
 CATEGORIES=	print
-MASTER_SITES=	http://risacher.posixnap.net/nenscript/ \
+MASTER_SITES=	http://www.risacher.org/nenscript/ \
 		ftp://netsw.org/system/tools/print/
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A clone of the proprietary enscript program from Adobe Systems
 
 USE_BZIP2=	yes
 
 MAKEFILE=	makefile
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 MAN1=		nenscript.1
 
-pre-fetch:
-	@${ECHO_MSG} "To build the Non-US version type:"
-	@${ECHO_MSG} "    make NON_US=yes"
+.include <bsd.port.pre.mk>
+
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES"
+CFLAGS+=	-DUS_VERSION
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nenscript ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/nenscript.1 ${MANPREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/doc/nenscript
-	${INSTALL_MAN} ${WRKSRC}/readme ${PREFIX}/share/doc/nenscript
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/readme ${DOCSDIR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/nenscript/files/patch-aa b/print/nenscript/files/patch-aa
deleted file mode 100644
index dd885a086c13..000000000000
--- a/print/nenscript/files/patch-aa
+++ /dev/null
@@ -1,66 +0,0 @@
---- makefile.orig	Wed Aug 11 21:02:50 1993
-+++ makefile	Wed Nov 10 23:17:56 1999
-@@ -11,9 +11,9 @@
- SOURCES		=	main.c postscri.c print.c fontwidt.c font_lis.c paper.c
- OBJECTS		=	$(SOURCES:.c=.o)
- 
--INSTALLDIR	=	/usr/local
--BININSTALLDIR	=	$(INSTALLDIR)/bin
--MANINSTALLDIR	=	$(INSTALLDIR)/man/man1
-+#INSTALLDIR	=	/usr/local
-+BININSTALLDIR	=	${PREFIX}/bin
-+MANINSTALLDIR	=	${MANPREFIX}/man/man1
- 
- LOCALINSTALLDIR		=	$(HOME)/bin
- LOCALMANINSTALLDIR	=	$(HOME)/man/man1
-@@ -26,14 +26,20 @@
- #
- # US_VERSION selects default US paper format as well as selecting US format date
- #
--CFLAGS	=	-O $(DEBUG) -DUS_VERSION
-+.if !defined(NON_US)
-+CFLAGS += -DUS_VERSION
-+.endif
-+.if defined(DEBUG)
-+CFLAGS += -g
-+.endif
-+
- LFLAGS	=	
- 
--CHMOD	=	chmod
--CP	=	cp
--RM	=	rm
-+#CHMOD	=	chmod
-+#CP	=	cp
-+#RM	=	rm
- #INSTALL	=	/etc/install
--INSTALL	=	/usr/ucb/install -c
-+#INSTALL	=	/usr/ucb/install -c
- 
- all debug:	$(PROG)
- 
-@@ -43,18 +49,18 @@
- main.$(OBJ):	main.c
- 
- install: $(PROG)
--	$(INSTALL) -s -m 555 $(PROG) $(BININSTALLDIR)
--	$(INSTALL) -m 444 $(MAN) $(MANINSTALLDIR)
-+	${INSTALL_PROGRAM} $(PROG) $(BININSTALLDIR)
-+	${INSTALL_MAN} $(MAN) $(MANINSTALLDIR)
- 
- install.man: $(MAN)
--	$(INSTALL) -f $(MAININSTALLDIR) -m 444 $(MAN)
-+	${INSTALL_MAN} $(MAININSTALLDIR) $(MAN)
- 
- install.local:	$(PROG) $(MAN)
--	$(INSTALL) -s -m 555 $(PROG) $(LOCALINSTALLDIR)
--	$(INSTALL) -m 444 $(MAN) $(LOCALMANINSTALLDIR)
-+	${INSTALL_PROGRAM} $(PROG) $(LOCALINSTALLDIR)
-+	${INSTALL_MAN} $(MAN) $(LOCALMANINSTALLDIR)
- 
- clean:
--	rm -f *.o *.obj *.exe *.mdt $(PROG)
-+	${RM} -rf *.o *.obj *.exe *.mdt $(PROG)
- 
- font_lis.c: machdep.h defs.h font_lis.h main.h
- 
diff --git a/print/nenscript/pkg-descr b/print/nenscript/pkg-descr
index 560c67059c49..3d55bc4e2a8b 100644
--- a/print/nenscript/pkg-descr
+++ b/print/nenscript/pkg-descr
@@ -15,7 +15,7 @@ Features additional to nenscript are:
         . availability under MSDOS 
         . executable is self contained - no additional files required
 
-WWW: http://risacher.posixnap.net/nenscript/
+WWW: http://www.risacher.org/nenscript/
 
 -Chris
 cjm2@altavista.net
diff --git a/print/nenscript/pkg-plist b/print/nenscript/pkg-plist
index 87d6db89409e..f1fd291b0ad2 100644
--- a/print/nenscript/pkg-plist
+++ b/print/nenscript/pkg-plist
@@ -1,3 +1,3 @@
 bin/nenscript
-share/doc/nenscript/readme
-@dirrm share/doc/nenscript
+%%NOPORTDOCS%%%%DOCSDIR%%/readme
+%%NOPORTDOCS%%@dirrm %%DOCSDIR%%