- Support staging

- Pet check-sanity

Approved by:	portmgr blanket

7 files changed, 55 insertions, 6 deletions

diff --git a/print/enscript-a4/Makefile b/print/enscript-a4/Makefile
index 3f7392a6ccc1..7d31e66df0a9 100644
--- a/print/enscript-a4/Makefile
+++ b/print/enscript-a4/Makefile
@@ -8,5 +8,4 @@ PS=		A4
 
 MASTERDIR=	${.CURDIR}/../enscript-letter
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile
index efebcdda2c82..06552e14ed83 100644
--- a/print/enscript-letter/Makefile
+++ b/print/enscript-letter/Makefile
@@ -12,14 +12,14 @@ DISTNAME=	enscript-${PORTVERSION}
 MAINTAINER?=	rafan@FreeBSD.org
 COMMENT=	ASCII to PostScript filter
 
+USES=		shebangfix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --with-media=${PS}
-NO_STAGE=	yes
+CONFIGURE_ENV=	PERL="${perl_CMD}"
 
 CONFLICTS?=	enscript-a4-* enscript-letterdj-*
 
 INFO=		enscript
-MAN1=		diffpp.1 enscript.1 sliceprint.1 states.1
 
 PAPERSIZE?=	letter
 PS?=		Letter
diff --git a/print/enscript-letter/files/patch-afm__Makefile.in b/print/enscript-letter/files/patch-afm__Makefile.in
new file mode 100644
index 000000000000..ec967a515726
--- /dev/null
+++ b/print/enscript-letter/files/patch-afm__Makefile.in
@@ -0,0 +1,16 @@
+--- afm/Makefile.in.orig	2003-03-05 10:40:06.000000000 +0300
++++ afm/Makefile.in	2014-05-11 17:56:09.000000000 +0400
+@@ -319,10 +319,10 @@
+ 
+ 
+ install-data-local:
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/afm
+ 	for f in $(EXTRA_DIST); do \
+-	  $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
++	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/afm/$$f; \
+ 	done
+ 
+ uninstall-local:
diff --git a/print/enscript-letter/files/patch-lib__Makefile.in b/print/enscript-letter/files/patch-lib__Makefile.in
new file mode 100644
index 000000000000..24c5418038fc
--- /dev/null
+++ b/print/enscript-letter/files/patch-lib__Makefile.in
@@ -0,0 +1,17 @@
+--- lib/Makefile.in.orig	2003-03-05 10:40:07.000000000 +0300
++++ lib/Makefile.in	2014-05-11 17:54:53.000000000 +0400
+@@ -345,12 +345,8 @@
+ all-local: enscript.cfg
+ 
+ install-data-local: enscript.cfg
+-	$(top_srcdir)/mkinstalldirs $(sysconfdir)
+-	if test -r $(sysconfdir)/enscript.cfg; then \
+-	  cp $(sysconfdir)/enscript.cfg $(sysconfdir)/enscript.cfg.old; \
+-	else :; \
+-	fi
+-	$(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
++	$(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg
+ 
+ uninstall-local:
+ 	rm -f $(sysconfdir)/enscript.cfg
diff --git a/print/enscript-letter/files/patch-Makefile.in b/print/enscript-letter/files/patch-states__hl__Makefile.in
index c2dcb562a18b..c8b5bb6891db 100644
--- a/print/enscript-letter/files/patch-Makefile.in
+++ b/print/enscript-letter/files/patch-states__hl__Makefile.in
@@ -1,5 +1,5 @@
---- states/hl/Makefile.in.orig	Wed Mar  5 01:40:07 2003
-+++ states/hl/Makefile.in	Tue Mar  2 06:33:27 2004
+--- states/hl/Makefile.in.orig	2003-03-05 10:40:07.000000000 +0300
++++ states/hl/Makefile.in	2014-05-11 17:58:23.000000000 +0400
 @@ -186,9 +186,9 @@
  diffs.st diffu.st elisp.st fortran.st fortran_pp.st haskell.st html.st	\
  idl.st inf.st java.st javascript.st ksh.st m4.st mail.st makefile.st	\
@@ -13,3 +13,17 @@
  
  
  states = $(misc) $(styles) $(languages) $(highlightings)
+@@ -330,10 +330,10 @@
+ 
+ 
+ install-data-local:
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
+-	$(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/hl
+ 	for f in $(states); do \
+-	  $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
++	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/hl/$$f; \
+ 	done
+ 
+ uninstall-local:
diff --git a/print/enscript-letter/pkg-plist b/print/enscript-letter/pkg-plist
index ca66ea55ce1d..b4e0848c6e98 100644
--- a/print/enscript-letter/pkg-plist
+++ b/print/enscript-letter/pkg-plist
@@ -5,6 +5,10 @@ bin/over
 bin/sliceprint
 bin/states
 etc/enscript.cfg
+man/man1/diffpp.1.gz
+man/man1/enscript.1.gz
+man/man1/sliceprint.1.gz
+man/man1/states.1.gz
 %%DATADIR%%/88591.enc
 %%DATADIR%%/885910.enc
 %%DATADIR%%/88592.enc
diff --git a/print/enscript-letterdj/Makefile b/print/enscript-letterdj/Makefile
index 94cc70fa362e..29f1c707fe99 100644
--- a/print/enscript-letterdj/Makefile
+++ b/print/enscript-letterdj/Makefile
@@ -8,5 +8,4 @@ PS=		Letterdj
 
 MASTERDIR=	${.CURDIR}/../enscript-letter
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"