3 files changed, 148 insertions, 147 deletions

diff --git a/print/enscript-letter/Makefile b/print/enscript-letter/Makefile
index f81abd21d6da..7b13ee092ea3 100644
--- a/print/enscript-letter/Makefile
+++ b/print/enscript-letter/Makefile
@@ -5,19 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	enscript-${PAPERSIZE}
+PORTNAME=	enscript
 PORTVERSION=	1.6.4
 PORTREVISION=	1
 CATEGORIES+=	print
-MASTER_SITES=	http://people.ssh.com/mtr/genscript/
+MASTER_SITES=	http://www.codento.com/people/mtr/genscript/
+PKGNAMESUFFIX=	-${PAPERSIZE}
 DISTNAME=	enscript-${PORTVERSION}
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	rafan@infor.org
 COMMENT=	ASCII to PostScript filter
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --with-media=${PS}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 INFO=		enscript
 MAN1=		diffpp.1 enscript.1 sliceprint.1 states.1
diff --git a/print/enscript-letter/pkg-descr b/print/enscript-letter/pkg-descr
index 84beec47ed6f..878e71ac19a7 100644
--- a/print/enscript-letter/pkg-descr
+++ b/print/enscript-letter/pkg-descr
@@ -4,4 +4,4 @@ Input files in a number of programming languages, including C, Perl,
 Tcl, and more, can optionally be pretty-printed instead of printed as
 plain-text.  Many printing options are available.
 
-WWW: http://people.ssh.fi/mtr/genscript/
+WWW: http://www.codento.com/people/mtr/genscript/
diff --git a/print/enscript-letter/pkg-plist b/print/enscript-letter/pkg-plist
index cb98cc1eccac..ca66ea55ce1d 100644
--- a/print/enscript-letter/pkg-plist
+++ b/print/enscript-letter/pkg-plist
@@ -5,145 +5,145 @@ bin/over
 bin/sliceprint
 bin/states
 etc/enscript.cfg
-share/enscript/88591.enc
-share/enscript/885910.enc
-share/enscript/88592.enc
-share/enscript/88593.enc
-share/enscript/88594.enc
-share/enscript/88595.enc
-share/enscript/88597.enc
-share/enscript/88599.enc
-share/enscript/a2ps.hdr
-share/enscript/afm/agd.afm
-share/enscript/afm/agdo.afm
-share/enscript/afm/agw.afm
-share/enscript/afm/agwo.afm
-share/enscript/afm/bkd.afm
-share/enscript/afm/bkdi.afm
-share/enscript/afm/bkl.afm
-share/enscript/afm/bkli.afm
-share/enscript/afm/cob.afm
-share/enscript/afm/cobo.afm
-share/enscript/afm/com.afm
-share/enscript/afm/coo.afm
-share/enscript/afm/font.map
-share/enscript/afm/hv.afm
-share/enscript/afm/hvb.afm
-share/enscript/afm/hvbo.afm
-share/enscript/afm/hvc.afm
-share/enscript/afm/hvcb.afm
-share/enscript/afm/hvcbo.afm
-share/enscript/afm/hvcdo.afm
-share/enscript/afm/hvn.afm
-share/enscript/afm/hvnb.afm
-share/enscript/afm/hvnbo.afm
-share/enscript/afm/hvno.afm
-share/enscript/afm/hvo.afm
-share/enscript/afm/matrix.afm
-share/enscript/afm/matrix.pfa
-share/enscript/afm/ncb.afm
-share/enscript/afm/ncbi.afm
-share/enscript/afm/nci.afm
-share/enscript/afm/ncr.afm
-share/enscript/afm/pob.afm
-share/enscript/afm/pobi.afm
-share/enscript/afm/poi.afm
-share/enscript/afm/por.afm
-share/enscript/afm/sy.afm
-share/enscript/afm/tib.afm
-share/enscript/afm/tibi.afm
-share/enscript/afm/tii.afm
-share/enscript/afm/tir.afm
-share/enscript/afm/zcmi.afm
-share/enscript/afm/zd.afm
-share/enscript/ascii.enc
-share/enscript/asciidkno.enc
-share/enscript/asciifise.enc
-share/enscript/edd.hdr
-share/enscript/emacs.hdr
-share/enscript/enscript-color.hdr
-share/enscript/enscript.hdr
-share/enscript/enscript.pro
-share/enscript/frame.hdr
-share/enscript/hl/ada.st
-share/enscript/hl/asm.st
-share/enscript/hl/awk.st
-share/enscript/hl/bash.st
-share/enscript/hl/c.st
-share/enscript/hl/c_comment.st
-share/enscript/hl/c_ppline.st
-share/enscript/hl/c_string.st
-share/enscript/hl/changelog.st
-share/enscript/hl/cpp.st
-share/enscript/hl/csh.st
-share/enscript/hl/default_faces.st
-share/enscript/hl/delphi.st
-share/enscript/hl/describe_languages.st
-share/enscript/hl/diff.st
-share/enscript/hl/diffs.st
-share/enscript/hl/diffu.st
-share/enscript/hl/elisp.st
-share/enscript/hl/enscript.st
-share/enscript/hl/fortran.st
-share/enscript/hl/fortran_pp.st
-share/enscript/hl/haskell.st
-share/enscript/hl/html.st
-share/enscript/hl/idl.st
-share/enscript/hl/inf.st
-share/enscript/hl/java.st
-share/enscript/hl/javascript.st
-share/enscript/hl/ksh.st
-share/enscript/hl/lang_ansi.st
-share/enscript/hl/lang_enscript.st
-share/enscript/hl/lang_html.st
-share/enscript/hl/lang_overstrike.st
-share/enscript/hl/lang_rtf.st
-share/enscript/hl/lang_texinfo.st
-share/enscript/hl/m4.st
-share/enscript/hl/mail.st
-share/enscript/hl/makefile.st
-share/enscript/hl/matlab.st
-share/enscript/hl/nroff.st
-share/enscript/hl/objc.st
-share/enscript/hl/outline.st
-share/enscript/hl/pascal.st
-share/enscript/hl/passthrough.st
-share/enscript/hl/perl.st
-share/enscript/hl/postscript.st
-share/enscript/hl/pyrex.st
-share/enscript/hl/python.st
-share/enscript/hl/rfc.st
-share/enscript/hl/ruby.st
-share/enscript/hl/scheme.st
-share/enscript/hl/sh.st
-share/enscript/hl/skill.st
-share/enscript/hl/sql.st
-share/enscript/hl/states.st
-share/enscript/hl/style_a2ps.st
-share/enscript/hl/style_emacs.st
-share/enscript/hl/style_emacs_verbose.st
-share/enscript/hl/style_ifh.st
-share/enscript/hl/style_msvc.st
-share/enscript/hl/synopsys.st
-share/enscript/hl/tcl.st
-share/enscript/hl/tcsh.st
-share/enscript/hl/tex.st
-share/enscript/hl/vba.st
-share/enscript/hl/verilog.st
-share/enscript/hl/vhdl.st
-share/enscript/hl/vrml.st
-share/enscript/hl/wmlscript.st
-share/enscript/hl/zsh.st
-share/enscript/hp8.enc
-share/enscript/ibmpc.enc
-share/enscript/koi8.enc
-share/enscript/mac.enc
-share/enscript/mp.hdr
-share/enscript/ps.enc
-share/enscript/pslatin1.enc
-share/enscript/simple.hdr
-share/enscript/squeeze.hdr
-share/enscript/vms.enc
-@dirrm share/enscript/afm
-@dirrm share/enscript/hl
-@dirrm share/enscript
+%%DATADIR%%/88591.enc
+%%DATADIR%%/885910.enc
+%%DATADIR%%/88592.enc
+%%DATADIR%%/88593.enc
+%%DATADIR%%/88594.enc
+%%DATADIR%%/88595.enc
+%%DATADIR%%/88597.enc
+%%DATADIR%%/88599.enc
+%%DATADIR%%/a2ps.hdr
+%%DATADIR%%/afm/agd.afm
+%%DATADIR%%/afm/agdo.afm
+%%DATADIR%%/afm/agw.afm
+%%DATADIR%%/afm/agwo.afm
+%%DATADIR%%/afm/bkd.afm
+%%DATADIR%%/afm/bkdi.afm
+%%DATADIR%%/afm/bkl.afm
+%%DATADIR%%/afm/bkli.afm
+%%DATADIR%%/afm/cob.afm
+%%DATADIR%%/afm/cobo.afm
+%%DATADIR%%/afm/com.afm
+%%DATADIR%%/afm/coo.afm
+%%DATADIR%%/afm/font.map
+%%DATADIR%%/afm/hv.afm
+%%DATADIR%%/afm/hvb.afm
+%%DATADIR%%/afm/hvbo.afm
+%%DATADIR%%/afm/hvc.afm
+%%DATADIR%%/afm/hvcb.afm
+%%DATADIR%%/afm/hvcbo.afm
+%%DATADIR%%/afm/hvcdo.afm
+%%DATADIR%%/afm/hvn.afm
+%%DATADIR%%/afm/hvnb.afm
+%%DATADIR%%/afm/hvnbo.afm
+%%DATADIR%%/afm/hvno.afm
+%%DATADIR%%/afm/hvo.afm
+%%DATADIR%%/afm/matrix.afm
+%%DATADIR%%/afm/matrix.pfa
+%%DATADIR%%/afm/ncb.afm
+%%DATADIR%%/afm/ncbi.afm
+%%DATADIR%%/afm/nci.afm
+%%DATADIR%%/afm/ncr.afm
+%%DATADIR%%/afm/pob.afm
+%%DATADIR%%/afm/pobi.afm
+%%DATADIR%%/afm/poi.afm
+%%DATADIR%%/afm/por.afm
+%%DATADIR%%/afm/sy.afm
+%%DATADIR%%/afm/tib.afm
+%%DATADIR%%/afm/tibi.afm
+%%DATADIR%%/afm/tii.afm
+%%DATADIR%%/afm/tir.afm
+%%DATADIR%%/afm/zcmi.afm
+%%DATADIR%%/afm/zd.afm
+%%DATADIR%%/ascii.enc
+%%DATADIR%%/asciidkno.enc
+%%DATADIR%%/asciifise.enc
+%%DATADIR%%/edd.hdr
+%%DATADIR%%/emacs.hdr
+%%DATADIR%%/enscript-color.hdr
+%%DATADIR%%/enscript.hdr
+%%DATADIR%%/enscript.pro
+%%DATADIR%%/frame.hdr
+%%DATADIR%%/hl/ada.st
+%%DATADIR%%/hl/asm.st
+%%DATADIR%%/hl/awk.st
+%%DATADIR%%/hl/bash.st
+%%DATADIR%%/hl/c.st
+%%DATADIR%%/hl/c_comment.st
+%%DATADIR%%/hl/c_ppline.st
+%%DATADIR%%/hl/c_string.st
+%%DATADIR%%/hl/changelog.st
+%%DATADIR%%/hl/cpp.st
+%%DATADIR%%/hl/csh.st
+%%DATADIR%%/hl/default_faces.st
+%%DATADIR%%/hl/delphi.st
+%%DATADIR%%/hl/describe_languages.st
+%%DATADIR%%/hl/diff.st
+%%DATADIR%%/hl/diffs.st
+%%DATADIR%%/hl/diffu.st
+%%DATADIR%%/hl/elisp.st
+%%DATADIR%%/hl/enscript.st
+%%DATADIR%%/hl/fortran.st
+%%DATADIR%%/hl/fortran_pp.st
+%%DATADIR%%/hl/haskell.st
+%%DATADIR%%/hl/html.st
+%%DATADIR%%/hl/idl.st
+%%DATADIR%%/hl/inf.st
+%%DATADIR%%/hl/java.st
+%%DATADIR%%/hl/javascript.st
+%%DATADIR%%/hl/ksh.st
+%%DATADIR%%/hl/lang_ansi.st
+%%DATADIR%%/hl/lang_enscript.st
+%%DATADIR%%/hl/lang_html.st
+%%DATADIR%%/hl/lang_overstrike.st
+%%DATADIR%%/hl/lang_rtf.st
+%%DATADIR%%/hl/lang_texinfo.st
+%%DATADIR%%/hl/m4.st
+%%DATADIR%%/hl/mail.st
+%%DATADIR%%/hl/makefile.st
+%%DATADIR%%/hl/matlab.st
+%%DATADIR%%/hl/nroff.st
+%%DATADIR%%/hl/objc.st
+%%DATADIR%%/hl/outline.st
+%%DATADIR%%/hl/pascal.st
+%%DATADIR%%/hl/passthrough.st
+%%DATADIR%%/hl/perl.st
+%%DATADIR%%/hl/postscript.st
+%%DATADIR%%/hl/pyrex.st
+%%DATADIR%%/hl/python.st
+%%DATADIR%%/hl/rfc.st
+%%DATADIR%%/hl/ruby.st
+%%DATADIR%%/hl/scheme.st
+%%DATADIR%%/hl/sh.st
+%%DATADIR%%/hl/skill.st
+%%DATADIR%%/hl/sql.st
+%%DATADIR%%/hl/states.st
+%%DATADIR%%/hl/style_a2ps.st
+%%DATADIR%%/hl/style_emacs.st
+%%DATADIR%%/hl/style_emacs_verbose.st
+%%DATADIR%%/hl/style_ifh.st
+%%DATADIR%%/hl/style_msvc.st
+%%DATADIR%%/hl/synopsys.st
+%%DATADIR%%/hl/tcl.st
+%%DATADIR%%/hl/tcsh.st
+%%DATADIR%%/hl/tex.st
+%%DATADIR%%/hl/vba.st
+%%DATADIR%%/hl/verilog.st
+%%DATADIR%%/hl/vhdl.st
+%%DATADIR%%/hl/vrml.st
+%%DATADIR%%/hl/wmlscript.st
+%%DATADIR%%/hl/zsh.st
+%%DATADIR%%/hp8.enc
+%%DATADIR%%/ibmpc.enc
+%%DATADIR%%/koi8.enc
+%%DATADIR%%/mac.enc
+%%DATADIR%%/mp.hdr
+%%DATADIR%%/ps.enc
+%%DATADIR%%/pslatin1.enc
+%%DATADIR%%/simple.hdr
+%%DATADIR%%/squeeze.hdr
+%%DATADIR%%/vms.enc
+@dirrm %%DATADIR%%/afm
+@dirrm %%DATADIR%%/hl
+@dirrm %%DATADIR%%