3 files changed, 54 insertions, 9 deletions

diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile
index ad2c1812a1e1..e58f6b635df0 100644
--- a/x11-fonts/proggy_fonts/Makefile
+++ b/x11-fonts/proggy_fonts/Makefile
@@ -7,14 +7,24 @@
 
 PORTNAME=	proggy_fonts
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.proggyfonts.com/download/
-DISTFILES=	ProggyClean.pcf.zip ProggySquare.pcf.zip	\
+DISTFILES=	ProggyClean.pcf.zip ProggySquare.pcf.zip \
 		ProggySmall.pcf.zip ProggyTiny.pcf.zip	\
-		ProggyCleanSZ.pcf.zip ProggySquareSZ.pcf.zip	\
-		ProggyTinySZ.pcf.zip ProggyCleanSZBP.pcf.zip	\
-		ProggyCleanCP.pcf.zip
+		ProggyCleanSZ.pcf.zip ProggySquareSZ.pcf.zip \
+		ProggyTinySZ.pcf.zip ProggyCleanSZBP.pcf.zip \
+		ProggyCleanCP.pcf.zip CodingFontTobi.pcf.zip \
+		Opti.pcf.gz OptiSmall.pcf.gz SpeedyPCF.zip \
+		PixelCarnageMono.pcf.gz WebbySmall.pcf.zip \
+		WebbyCaps.pcf.zip
+EXTRACT_ONLY=	ProggyClean.pcf.zip ProggySquare.pcf.zip \
+		ProggySmall.pcf.zip ProggyTiny.pcf.zip	\
+		ProggyCleanSZ.pcf.zip ProggySquareSZ.pcf.zip \
+		ProggyTinySZ.pcf.zip ProggyCleanSZBP.pcf.zip \
+		ProggyCleanCP.pcf.zip CodingFontTobi.pcf.zip \
+		SpeedyPCF.zip WebbySmall.pcf.zip \
+		WebbyCaps.pcf.zip
 
 MAINTAINER=	llwang@infor.org
 COMMENT=	The perfect monospaced bitmap programming fonts
@@ -22,6 +32,9 @@ COMMENT=	The perfect monospaced bitmap programming fonts
 RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
+ALREADY_UNZIP=	${DISTDIR}/Opti.pcf.gz ${DISTDIR}/OptiSmall.pcf.gz \
+	        ${DISTDIR}/PixelCarnageMono.pcf.gz
+
 USE_XORG=	x11
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
@@ -30,7 +43,8 @@ XFONTDIR=	${PREFIX}/lib/X11/fonts/local
 
 do-install:
 	@${MKDIR} ${XFONTDIR}
-	@${INSTALL_DATA} ${WRKDIR}/*.pcf.gz ${XFONTDIR}
+	@${CP} ${ALREADY_UNZIP} ${WRKDIR}
+	@${INSTALL_DATA} ${WRKDIR}/*.pcf* ${XFONTDIR}
 	@(cd ${XFONTDIR}; mkfontdir)
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/proggy_fonts/distinfo b/x11-fonts/proggy_fonts/distinfo
index 0409afee9975..3b6f5ba91d54 100644
--- a/x11-fonts/proggy_fonts/distinfo
+++ b/x11-fonts/proggy_fonts/distinfo
@@ -16,12 +16,33 @@ SIZE (ProggyCleanSZ.pcf.zip) = 5455
 MD5 (ProggySquareSZ.pcf.zip) = d2135660b1efa63d9a8682573cff087a
 SHA256 (ProggySquareSZ.pcf.zip) = f852931a9eb264371e36928cdfd826a68355dcea370c6a199f27922f1fc59f61
 SIZE (ProggySquareSZ.pcf.zip) = 5101
-MD5 (ProggyTinySZ.pcf.zip) = d1cf1beb185896e8aa43d34d9500f356
-SHA256 (ProggyTinySZ.pcf.zip) = 74335295acdff77a2e0bb7e9fb371e514edb057b5092a5540d5f7095f4390788
-SIZE (ProggyTinySZ.pcf.zip) = 5165
+MD5 (ProggyTinySZ.pcf.zip) = 7e8d69e94aa2500d697900ce4b9f16be
+SHA256 (ProggyTinySZ.pcf.zip) = 5bfe1293ba01c17ce64fe51a3458d75e65320d7ebde86da33aa372454c37a33c
+SIZE (ProggyTinySZ.pcf.zip) = 10793
 MD5 (ProggyCleanSZBP.pcf.zip) = a0d3b796cffda06adfb9eefb2ea46bc3
 SHA256 (ProggyCleanSZBP.pcf.zip) = 1662429f72fb90b1171b5c16a15b81a028de9d2014a6922e172016a734e95a5d
 SIZE (ProggyCleanSZBP.pcf.zip) = 5084
 MD5 (ProggyCleanCP.pcf.zip) = 41889659c56d29318838ed1beeac7a62
 SHA256 (ProggyCleanCP.pcf.zip) = 2ada907b8422a98c75ecaf1678ba73b31922434f32fab9b1996607e3abaf1d1c
 SIZE (ProggyCleanCP.pcf.zip) = 9374
+MD5 (CodingFontTobi.pcf.zip) = a707e57b923a0b00a63aa19e35f83954
+SHA256 (CodingFontTobi.pcf.zip) = 7312b5d7c9e0de667a52bd7913488258e7e8f01e6aa7e0256356a4f3e2c18672
+SIZE (CodingFontTobi.pcf.zip) = 4899
+MD5 (Opti.pcf.gz) = 0afaa67da205adc4bc1494bd5cb0be82
+SHA256 (Opti.pcf.gz) = 3ff812820cf61253a75e5fd990ef66f6069cce1b92ec536c51d40d8bc057108f
+SIZE (Opti.pcf.gz) = 4412
+MD5 (OptiSmall.pcf.gz) = e678320a84e72b9dfc3e56d0189259be
+SHA256 (OptiSmall.pcf.gz) = 88926010ab36cbc52ab66af56843b69cebb1ba475ffc2372d6e4d03559a130ee
+SIZE (OptiSmall.pcf.gz) = 4343
+MD5 (SpeedyPCF.zip) = 7f19ad09aaa65853fbabec7619b61002
+SHA256 (SpeedyPCF.zip) = c76f4febe5bce846d3eabd0bc2932edf10b677078960148a4eb35cf5d9f98c57
+SIZE (SpeedyPCF.zip) = 12353
+MD5 (PixelCarnageMono.pcf.gz) = 60e6ecdc31af4dffb4eb7c14ffc50f75
+SHA256 (PixelCarnageMono.pcf.gz) = a6ae0dc7c8102fd28160eb05c947b0f28f0aad8008455df7e1ccd998a250752c
+SIZE (PixelCarnageMono.pcf.gz) = 4727
+MD5 (WebbySmall.pcf.zip) = ac196e0e89ca47cd284cf2516aefe624
+SHA256 (WebbySmall.pcf.zip) = e06a85c2100f40c47cf58e4d82dfaffe5917baaace3962e3495fa8de021002d0
+SIZE (WebbySmall.pcf.zip) = 4367
+MD5 (WebbyCaps.pcf.zip) = b645cff755222d70e2e9f055cf18b707
+SHA256 (WebbyCaps.pcf.zip) = c0dc6c6785d71beac53b87fe8ff4f620d990bd3316943756bca988587a7c003a
+SIZE (WebbyCaps.pcf.zip) = 3604
diff --git a/x11-fonts/proggy_fonts/pkg-plist b/x11-fonts/proggy_fonts/pkg-plist
index 718e40fd12c0..2d9ef23768ba 100644
--- a/x11-fonts/proggy_fonts/pkg-plist
+++ b/x11-fonts/proggy_fonts/pkg-plist
@@ -8,5 +8,15 @@ lib/X11/fonts/local/ProggyTinySZ.pcf.gz
 lib/X11/fonts/local/ProggyCleanSZBP.pcf.gz
 lib/X11/fonts/local/ProggyCleanCP.pcf.gz
 lib/X11/fonts/local/ProggyCleanSZCP.pcf.gz
+lib/X11/fonts/local/cft.pcf
+lib/X11/fonts/local/Opti.pcf.gz
+lib/X11/fonts/local/OptiSmall.pcf.gz
+lib/X11/fonts/local/Speedy11.pcf.gz
+lib/X11/fonts/local/Speedy12.pcf.gz
+lib/X11/fonts/local/Speedy.pcf.gz
+lib/X11/fonts/local/PixelCarnageMono.pcf.gz
+lib/X11/fonts/local/ProggyTinyBold.pcf.gz
+lib/X11/fonts/local/WebbySmall.pcf.gz
+lib/X11/fonts/local/WebbyCaps.pcf.gz
 @exec (cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir)
 @unexec (cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir)