- update to 0.81

- be more package friendly: use pkg-message intead of echo'ing things in
Makefile
- adjust pkg-message and pkg-descr
- pass maintainership to submitter

Left for maintainer to do: autodetect and OPTIONify for proper print/enscript*
RUN_DEPEND

PR:		ports/107981
Submitted by:	Marcelo Araujo and reworked by him and me (itetcu)

5 files changed, 74 insertions, 176 deletions

diff --git a/print/enscriptfonts/Makefile b/print/enscriptfonts/Makefile
index 4d5d5c15374b..1fa2770e9f53 100644
--- a/print/enscriptfonts/Makefile
+++ b/print/enscriptfonts/Makefile
@@ -6,41 +6,28 @@
 #
 
 PORTNAME=	enscriptfonts
-PORTVERSION=	0.75
+PORTVERSION=	0.81
 CATEGORIES=	print
 MASTER_SITES=	http://muuz.deadbbs.com/FreeBSD/xenscript/
-DISTNAME=	enscript_fonts-0.75
-EXTRACT_SUFX=	.tgz
+DISTNAME=	enscript_fonts-0.81
+EXTRACT_SUFX=	.tbz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	araujo@bsdmail.org
 COMMENT=	More than 120 free- and share-ware fonts to extend enscript-1.5
 
-# user should choose their own version
-#RUN_DEPENDS=	enscript:${PORTSDIR}/print/enscript-letter
-
 NO_WRKSUBDIR=	YES
 NOMANCOMPRESS=	YES
 NO_BUILD=	YES
+SUB_FILES+=	pkg-message
+
+# user should choose their own version
+#RUN_DEPENDS=	enscript:${PORTSDIR}/print/enscript-letter
 
 do-install:
 	@${MKDIR} ${PREFIX}/share/enscript/xenscript
 	@${CP} -p ${WRKDIR}/* ${PREFIX}/share/enscript/xenscript
 
 post-install:
-	@${CAT} ${DESCR}
-	@sleep 2;
-	@${ECHO_MSG} "";
-	@${ECHO_MSG} "";
-	@${ECHO_MSG} "";
-	@${ECHO_MSG} "Now you *must* add the path "
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "${PREFIX}/share/enscript/xenscript"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "to your ${PREFIX}/etc/enscript.cfg path"
-	@${ECHO_MSG} "AFMPATH configuration.  This line is somewhere"
-	@${ECHO_MSG} "around line +32 in the enscript.cfg file."
-	@${ECHO_MSG} "";
-	@${ECHO_MSG} "";
-	@${ECHO_MSG} "";
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/print/enscriptfonts/distinfo b/print/enscriptfonts/distinfo
index 693e6bdc36a8..54980ee40b9f 100644
--- a/print/enscriptfonts/distinfo
+++ b/print/enscriptfonts/distinfo
@@ -1,3 +1,3 @@
-MD5 (enscript_fonts-0.75.tgz) = 541a7be0b48b0d9e2220c5bcab4961d3
-SHA256 (enscript_fonts-0.75.tgz) = c9a54d8161273c8408bdf9d70df3bbe8c1342c0d115fee6fcd8d09d3611cd120
-SIZE (enscript_fonts-0.75.tgz) = 7045437
+MD5 (enscript_fonts-0.81.tbz) = 9061d324a12f844aa5730e1f400b422d
+SHA256 (enscript_fonts-0.81.tbz) = 98b2dd5033302b2fabebdd25da71519a52b54b54c80b7de26200ee308ab05a04
+SIZE (enscript_fonts-0.81.tbz) = 1276774
diff --git a/print/enscriptfonts/files/pkg-message.in b/print/enscriptfonts/files/pkg-message.in
new file mode 100644
index 000000000000..cd627320fa73
--- /dev/null
+++ b/print/enscriptfonts/files/pkg-message.in
@@ -0,0 +1,5 @@
+******************************************************************************
+	Now you *must* add the path %%PREFIX%%/etc/enscript.cfg path 
+	AFMPATH configuration.
+	This line is somewhere around line +32 in the enscript.cfg file. 
+******************************************************************************
diff --git a/print/enscriptfonts/pkg-descr b/print/enscriptfonts/pkg-descr
index 010c77a58c02..6044062dcd68 100644
--- a/print/enscriptfonts/pkg-descr
+++ b/print/enscriptfonts/pkg-descr
@@ -1,22 +1,6 @@
+The enscriptfonts More than 120 free- and share-ware fonts to extend enscript.
 
-	To the best of my knowledge, every fontfile in this package
-	is either freeware or shareware.  Most are free and unencumbered;
-	the best of the hundreds that I've found.
-
-	If you know that a font in this list is stolen or for any
-	other reason should  not be included in this distribution,
-	please write me, Gary Kline,
-
-			kline@thought.org
-
-	with supporting documentation.  Inappropriate fonts will be
-	stricken in the next Xenscript distribution.
-
-	In the README file in the ${DESTDIR} which defaults to 
-	/usr/local/share/enscript/xenscript  is a list of the font
-	names for the 120+ fonts in v 0.75.  Also in this directory
-	are many *.readme files from the shareware distributions.
-
-
-	Gary Kline
-	31 May, 1998
+In the README file in the ${DESTDIR} which defaults to
+/usr/local/share/enscript/xenscript  is a list of the font names for the 120+
+fonts. Also in this directory are many *.readme files from the shareware
+distributions. Please consult this files for licensing conditions.
diff --git a/print/enscriptfonts/pkg-plist b/print/enscriptfonts/pkg-plist
index 23c22bdcea82..7ecfe77b5793 100644
--- a/print/enscriptfonts/pkg-plist
+++ b/print/enscriptfonts/pkg-plist
@@ -1,254 +1,124 @@
 share/enscript/xenscript/font.map
 share/enscript/xenscript/Amelia.afm
-share/enscript/xenscript/Amelia.pfa
 share/enscript/xenscript/Arabian_Regular.afm
-share/enscript/xenscript/Arabian_Regular.pfa
 share/enscript/xenscript/Aristocrat.afm
-share/enscript/xenscript/Aristocrat.pfa
 share/enscript/xenscript/AristocratLetPlain.afm
-share/enscript/xenscript/AristocratLetPlain.pfa
 share/enscript/xenscript/ArnoldBoecklin.afm
-share/enscript/xenscript/ArnoldBoecklin.pfa
 share/enscript/xenscript/AvenidaLetPlain.afm
-share/enscript/xenscript/AvenidaLetPlain.pfa
 share/enscript/xenscript/Balmoral.afm
-share/enscript/xenscript/Balmoral.pfa
 share/enscript/xenscript/BaskertonRegular.afm
-share/enscript/xenscript/BaskertonRegular.pfa
 share/enscript/xenscript/BergellLetPlain.afm
-share/enscript/xenscript/BergellLetPlain.pfa
 share/enscript/xenscript/BlackChancery.afm
-share/enscript/xenscript/BlackChancery.pfa
 share/enscript/xenscript/BlackForest.afm
-share/enscript/xenscript/BlackForest.pfa
 share/enscript/xenscript/Bountiful.afm
-share/enscript/xenscript/Bountiful.pfa
 share/enscript/xenscript/Bridgnorth.afm
-share/enscript/xenscript/Bridgnorth.pfa
 share/enscript/xenscript/Broadway.afm
-share/enscript/xenscript/Broadway.pfa
 share/enscript/xenscript/BuckinghamBold.afm
-share/enscript/xenscript/BuckinghamBold.pfa
 share/enscript/xenscript/BuckinghamRegular.afm
-share/enscript/xenscript/BuckinghamRegular.pfa
 share/enscript/xenscript/Burton_sNightmare.afm
-share/enscript/xenscript/Burton_sNightmare.pfa
 share/enscript/xenscript/CandyBitsBT-Regular.afm
-share/enscript/xenscript/CandyBitsBT-Regular.pfa
 share/enscript/xenscript/CapelliBold.afm
-share/enscript/xenscript/CapelliBold.pfa
 share/enscript/xenscript/CapelliRegular.afm
-share/enscript/xenscript/CapelliRegular.pfa
 share/enscript/xenscript/Carver.afm
-share/enscript/xenscript/Carver.pfa
 share/enscript/xenscript/CasablancaAntiquePlain.afm
-share/enscript/xenscript/CasablancaAntiquePlain.pfa
 share/enscript/xenscript/Century_Bold.afm
-share/enscript/xenscript/Century_Bold.pfa
 share/enscript/xenscript/Century_Bold_Italic.afm
-share/enscript/xenscript/Century_Bold_Italic.pfa
 share/enscript/xenscript/Century_Italic.afm
-share/enscript/xenscript/Century_Italic.pfa
 share/enscript/xenscript/Century_Regular.afm
-share/enscript/xenscript/Century_Regular.pfa
 share/enscript/xenscript/CloverITCTT.afm
-share/enscript/xenscript/CloverITCTT.pfa
 share/enscript/xenscript/DauphinPlain.afm
-share/enscript/xenscript/DauphinPlain.pfa
 share/enscript/xenscript/Distress.afm
-share/enscript/xenscript/Distress.pfa
 share/enscript/xenscript/Dubiel_Regular.afm
-share/enscript/xenscript/Dubiel_Regular.pfa
 share/enscript/xenscript/DubielItalic.afm
-share/enscript/xenscript/DubielItalic.pfa
 share/enscript/xenscript/EaglefeatherFormalBold.afm
-share/enscript/xenscript/EaglefeatherFormalBold.pfa
 share/enscript/xenscript/EaglefeatherFormalBoldItalic.afm
-share/enscript/xenscript/EaglefeatherFormalBoldItalic.pfa
 share/enscript/xenscript/EaglefeatherFormalLight.afm
-share/enscript/xenscript/EaglefeatherFormalLight.pfa
 share/enscript/xenscript/EaglefeatherFormalLightIt.afm
-share/enscript/xenscript/EaglefeatherFormalLightIt.pfa
 share/enscript/xenscript/EaglefeatherFormalRegular.afm
-share/enscript/xenscript/EaglefeatherFormalRegular.pfa
 share/enscript/xenscript/EaglefeatherFormalRegularIt.afm
-share/enscript/xenscript/EaglefeatherFormalRegularIt.pfa
 share/enscript/xenscript/EnglishTowne_Normal.afm
-share/enscript/xenscript/EnglishTowne_Normal.pfa
 share/enscript/xenscript/Farrier.afm
-share/enscript/xenscript/Farrier.pfa
 share/enscript/xenscript/FishermanRegular.afm
-share/enscript/xenscript/FishermanRegular.pfa
 share/enscript/xenscript/Gaeilge.afm
-share/enscript/xenscript/Gaeilge.pfa
 share/enscript/xenscript/Gaeilge1Normal.afm
-share/enscript/xenscript/Gaeilge1Normal.pfa
 share/enscript/xenscript/Georgia.afm
-share/enscript/xenscript/Georgia.pfa
 share/enscript/xenscript/Georgia_Bold.afm
-share/enscript/xenscript/Georgia_Bold.pfa
 share/enscript/xenscript/Georgia_BoldItalic.afm
-share/enscript/xenscript/Georgia_BoldItalic.pfa
 share/enscript/xenscript/Georgia_Italic.afm
-share/enscript/xenscript/Georgia_Italic.pfa
 share/enscript/xenscript/GettysburgBold.afm
-share/enscript/xenscript/GettysburgBold.pfa
 share/enscript/xenscript/GoodCityModern.afm
-share/enscript/xenscript/GoodCityModern.pfa
 share/enscript/xenscript/Graph.afm
-share/enscript/xenscript/Graph.pfa
 share/enscript/xenscript/GraphicLight.afm
-share/enscript/xenscript/GraphicLight.pfa
 share/enscript/xenscript/HeliotypeLetPlain.afm
-share/enscript/xenscript/HeliotypeLetPlain.pfa
 share/enscript/xenscript/ImprovRegular.afm
-share/enscript/xenscript/ImprovRegular.pfa
 share/enscript/xenscript/Ironwood_Medium.afm
-share/enscript/xenscript/Ironwood_Medium.pfa
 share/enscript/xenscript/JadeRegular.afm
-share/enscript/xenscript/JadeRegular.pfa
 share/enscript/xenscript/JazzLetPlain.afm
-share/enscript/xenscript/JazzLetPlain.pfa
 share/enscript/xenscript/KlingonBlade.afm
-share/enscript/xenscript/KlingonBlade.pfa
 share/enscript/xenscript/KlingonScript.afm
-share/enscript/xenscript/KlingonScript.pfa
 share/enscript/xenscript/Koch_Plain.afm
-share/enscript/xenscript/Koch_Plain.pfa
 share/enscript/xenscript/LaBambaLetPlain.afm
-share/enscript/xenscript/LaBambaLetPlain.pfa
 share/enscript/xenscript/LiquidCrystal_Normal.afm
-share/enscript/xenscript/LiquidCrystal_Normal.pfa
 share/enscript/xenscript/Lombardic_Narrow.afm
-share/enscript/xenscript/Lombardic_Narrow.pfa
 share/enscript/xenscript/Marlboro.afm
-share/enscript/xenscript/Marlboro.pfa
 share/enscript/xenscript/MarlboroCondensed.afm
-share/enscript/xenscript/MarlboroCondensed.pfa
 share/enscript/xenscript/MarlboroWide.afm
-share/enscript/xenscript/MarlboroWide.pfa
 share/enscript/xenscript/MatisseITC_Regular.afm
-share/enscript/xenscript/MatisseITC_Regular.pfa
 share/enscript/xenscript/Medusa.afm
-share/enscript/xenscript/Medusa.pfa
 share/enscript/xenscript/Mephisto.afm
-share/enscript/xenscript/Mephisto.pfa
 share/enscript/xenscript/Mitzvah.afm
-share/enscript/xenscript/Mitzvah.pfa
 share/enscript/xenscript/Mordred.afm
-share/enscript/xenscript/Mordred.pfa
 share/enscript/xenscript/NewBaskerville_BoldEx.afm
-share/enscript/xenscript/NewBaskerville_BoldEx.pfa
 share/enscript/xenscript/NewCenturyThin-Bold-Oblique.afm
-share/enscript/xenscript/NewCenturyThin-Bold-Oblique.pfa
 share/enscript/xenscript/NewCenturyThin-Bold.afm
-share/enscript/xenscript/NewCenturyThin-Bold.pfa
 share/enscript/xenscript/NewCenturyThin-Oblique.afm
-share/enscript/xenscript/NewCenturyThin-Oblique.pfa
 share/enscript/xenscript/NewCenturyThin.afm
-share/enscript/xenscript/NewCenturyThin.pfa
 share/enscript/xenscript/NewYorker.afm
-share/enscript/xenscript/NewYorker.pfa
 share/enscript/xenscript/Nixon_Regular.afm
-share/enscript/xenscript/Nixon_Regular.pfa
 share/enscript/xenscript/Nosferatu.afm
-share/enscript/xenscript/Nosferatu.pfa
 share/enscript/xenscript/OberonLetPlain.afm
-share/enscript/xenscript/OberonLetPlain.pfa
 share/enscript/xenscript/OfficinaSerif-Bold.afm
-share/enscript/xenscript/OfficinaSerif-Bold.pfa
 share/enscript/xenscript/OfficinaSerif-BoldItalic.afm
-share/enscript/xenscript/OfficinaSerif-BoldItalic.pfa
 share/enscript/xenscript/OfficinaSerif-Book.afm
-share/enscript/xenscript/OfficinaSerif-Book.pfa
 share/enscript/xenscript/Onyx.afm
-share/enscript/xenscript/Onyx.pfa
 share/enscript/xenscript/OrchidBlackSSiBlackItalic.afm
-share/enscript/xenscript/OrchidBlackSSiBlackItalic.pfa
 share/enscript/xenscript/OrchidBlackSSiBold.afm
-share/enscript/xenscript/OrchidBlackSSiBold.pfa
 share/enscript/xenscript/OrchidBlackSSiBoldItalic.afm
-share/enscript/xenscript/OrchidBlackSSiBoldItalic.pfa
 share/enscript/xenscript/OrchidSSiItalic.afm
-share/enscript/xenscript/OrchidSSiItalic.pfa
 share/enscript/xenscript/PallMallBold.afm
-share/enscript/xenscript/PallMallBold.pfa
 share/enscript/xenscript/PalmSpringsBold.afm
-share/enscript/xenscript/PalmSpringsBold.pfa
 share/enscript/xenscript/PalmSpringsPlain.afm
-share/enscript/xenscript/PalmSpringsPlain.pfa
 share/enscript/xenscript/Paramount_Regular.afm
-share/enscript/xenscript/Paramount_Regular.pfa
 share/enscript/xenscript/Parson-Oblique.afm
-share/enscript/xenscript/Parson-Oblique.pfa
 share/enscript/xenscript/Parson.afm
-share/enscript/xenscript/Parson.pfa
 share/enscript/xenscript/Passeul-Oblique.afm
-share/enscript/xenscript/Passeul-Oblique.pfa
 share/enscript/xenscript/Playbill.afm
-share/enscript/xenscript/Playbill.pfa
 share/enscript/xenscript/RotisSemiSerif-Bold.afm
-share/enscript/xenscript/RotisSemiSerif-Bold.pfa
 share/enscript/xenscript/RotisSemiSerif.afm
-share/enscript/xenscript/RotisSemiSerif.pfa
 share/enscript/xenscript/RotisSerif-Bold.afm
-share/enscript/xenscript/RotisSerif-Bold.pfa
 share/enscript/xenscript/RotisSerif-Italic.afm
-share/enscript/xenscript/RotisSerif-Italic.pfa
 share/enscript/xenscript/RotisSerif.afm
-share/enscript/xenscript/RotisSerif.pfa
 share/enscript/xenscript/RoughBrush.afm
-share/enscript/xenscript/RoughBrush.pfa
 share/enscript/xenscript/RubinoSerif.afm
-share/enscript/xenscript/RubinoSerif.pfa
 share/enscript/xenscript/RubinoSerifSolid.afm
-share/enscript/xenscript/RubinoSerifSolid.pfa
 share/enscript/xenscript/Rudelsberg.afm
-share/enscript/xenscript/Rudelsberg.pfa
 share/enscript/xenscript/Sabot-Bold-Oblique.afm
-share/enscript/xenscript/Sabot-Bold-Oblique.pfa
 share/enscript/xenscript/Sabot-Bold.afm
-share/enscript/xenscript/Sabot-Bold.pfa
 share/enscript/xenscript/Sabot-Oblique.afm
-share/enscript/xenscript/Sabot-Oblique.pfa
 share/enscript/xenscript/Sabot.afm
-share/enscript/xenscript/Sabot.pfa
 share/enscript/xenscript/Sadhu-Oblique.afm
-share/enscript/xenscript/Sadhu-Oblique.pfa
 share/enscript/xenscript/Sadhu.afm
-share/enscript/xenscript/Sadhu.pfa
 share/enscript/xenscript/SaffronColdWar.afm
-share/enscript/xenscript/SaffronColdWar.pfa
 share/enscript/xenscript/Scythe.afm
-share/enscript/xenscript/Scythe.pfa
-share/enscript/xenscript/SquareSerif_Bold.afm
-share/enscript/xenscript/SquareSerif_Bold.pfa
-share/enscript/xenscript/SquareSerif_BoldItalic.afm
-share/enscript/xenscript/SquareSerif_BoldItalic.pfa
-share/enscript/xenscript/SquareSerif_Light.afm
-share/enscript/xenscript/SquareSerif_Light.pfa
-share/enscript/xenscript/SquareSerif_LightItalic.afm
-share/enscript/xenscript/SquareSerif_LightItalic.pfa
-share/enscript/xenscript/SquareSlabLite.afm
-share/enscript/xenscript/SquareSlabLite.pfa
 share/enscript/xenscript/Stonehenge.afm
-share/enscript/xenscript/Stonehenge.pfa
 share/enscript/xenscript/StuyvesantSolid.afm
-share/enscript/xenscript/StuyvesantSolid.pfa
 share/enscript/xenscript/Toontime.afm
-share/enscript/xenscript/Toontime.pfa
 share/enscript/xenscript/UrsaSerifBold.afm
-share/enscript/xenscript/UrsaSerifBold.pfa
 share/enscript/xenscript/UrsaSerifEngraved.afm
-share/enscript/xenscript/UrsaSerifEngraved.pfa
 share/enscript/xenscript/Victorian.afm
-share/enscript/xenscript/Victorian.pfa
 share/enscript/xenscript/VikingPlain.afm
-share/enscript/xenscript/VikingPlain.pfa
 share/enscript/xenscript/Vivaldii.afm
-share/enscript/xenscript/Vivaldii.pfa
 share/enscript/xenscript/Willow.afm
-share/enscript/xenscript/Willow.pfa
 share/enscript/xenscript/Arabian_Regular.readme
 share/enscript/xenscript/Burton_sNightmare.readme
 share/enscript/xenscript/Distress.readme
@@ -263,5 +133,57 @@ share/enscript/xenscript/PallMallBold.readme
 share/enscript/xenscript/UrsaSerifBold.readme
 share/enscript/xenscript/roughbrush.readme
 share/enscript/xenscript/README
+share/enscript/xenscript/Abscissa.afm
+share/enscript/xenscript/Zrnic.afm
+share/enscript/xenscript/Western.afm
+share/enscript/xenscript/VlaanderenChiseled.afm
+share/enscript/xenscript/Viking_Normal.afm
+share/enscript/xenscript/Videophreak.afm
+share/enscript/xenscript/UniversityRoman.afm
+share/enscript/xenscript/Tombstone.afm
+share/enscript/xenscript/Stylus_Regular.afm
+share/enscript/xenscript/StageCoach_Regular.afm
+share/enscript/xenscript/RationalInteger.afm
+share/enscript/xenscript/QuigleyWiggly.afm
+share/enscript/xenscript/Pepsi.afm
+share/enscript/xenscript/Opossum.afm
+share/enscript/xenscript/OliviaBrush_.afm
+share/enscript/xenscript/OldgateLaneOutline.afm
+share/enscript/xenscript/Notepad.afm
+share/enscript/xenscript/MonoglycerideExtraBold.afm
+share/enscript/xenscript/MonoglycerideDemiBold.afm
+share/enscript/xenscript/MonoglycerideBold.afm
+share/enscript/xenscript/Monoglyceride.afm
+share/enscript/xenscript/MSLineDrawPSMT.afm
+share/enscript/xenscript/LesserConcern.afm
+share/enscript/xenscript/Isadora.afm
+share/enscript/xenscript/Initial.afm
+share/enscript/xenscript/Gunplay3D.afm
+share/enscript/xenscript/FairfaxStation.afm
+share/enscript/xenscript/FZ_UNIQUE29EX.afm
+share/enscript/xenscript/DosEquis.afm
+share/enscript/xenscript/Desdemona.afm
+share/enscript/xenscript/DaelCalligraphy.afm
+share/enscript/xenscript/CryUncial.afm
+share/enscript/xenscript/Cretino.afm
+share/enscript/xenscript/Creampuff.afm
+share/enscript/xenscript/Cloister_Black_Light.afm
+share/enscript/xenscript/ClerestorySSK.afm
+share/enscript/xenscript/CelticGaramondthe2nd.afm
+share/enscript/xenscript/Callistroke.afm
+share/enscript/xenscript/CalistoMT.afm
+share/enscript/xenscript/Caligula.afm
+share/enscript/xenscript/Bluelines.afm
+share/enscript/xenscript/Beckett.afm
+share/enscript/xenscript/Azrael.afm
+share/enscript/xenscript/AntsyPants.afm
+share/enscript/xenscript/AngieTanLines.afm
+share/enscript/xenscript/AirCutLight.afm
+share/enscript/xenscript/AdventureSubtitlesNormal.afm
+share/enscript/xenscript/AbscissaItalic.afm
+share/enscript/xenscript/AbscissaBoldItalic.afm
+share/enscript/xenscript/AbscissaBold.afm
+share/enscript/xenscript/saloon.afm
+share/enscript/xenscript/pkg-message
 @dirrm share/enscript/xenscript
 @dirrm share/enscript