67 files changed, 44 insertions, 63 deletions

diff --git a/palm/imgvtopgm/files/patch-aa b/palm/imgvtopgm/files/patch-configure
index 24d9d860783d..24d9d860783d 100644
--- a/palm/imgvtopgm/files/patch-aa
+++ b/palm/imgvtopgm/files/patch-configure
diff --git a/palm/pilot_makedoc/files/patch-aa b/palm/pilot_makedoc/files/patch-makedoc7.cpp
index f1cf39902187..f1cf39902187 100644
--- a/palm/pilot_makedoc/files/patch-aa
+++ b/palm/pilot_makedoc/files/patch-makedoc7.cpp
diff --git a/polish/libtlen/Makefile b/polish/libtlen/Makefile
index a71e43aa6a85..f305a6db2dd5 100644
--- a/polish/libtlen/Makefile
+++ b/polish/libtlen/Makefile
@@ -14,14 +14,10 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in libtlen.html libtlen.css AUTHORS TODO
 	@${INSTALL_DATA} ${WRKSRC}/docs/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/polish/libtlen/files/patch-aa b/polish/libtlen/files/patch-lib_Makefile.in
index 69a189e4285a..69a189e4285a 100644
--- a/polish/libtlen/files/patch-aa
+++ b/polish/libtlen/files/patch-lib_Makefile.in
diff --git a/print/asprint/files/patch-ab b/print/asprint/files/patch-asprint.c
index 517ec2a3adc1..517ec2a3adc1 100644
--- a/print/asprint/files/patch-ab
+++ b/print/asprint/files/patch-asprint.c
diff --git a/print/asprint/files/patch-aa b/print/asprint/files/patch-makefile
index 4f1ba5fba5f2..4f1ba5fba5f2 100644
--- a/print/asprint/files/patch-aa
+++ b/print/asprint/files/patch-makefile
diff --git a/print/bibview/files/patch-ah b/print/bibview/files/patch-ComboBo.h
index 21f1cbd53033..21f1cbd53033 100644
--- a/print/bibview/files/patch-ah
+++ b/print/bibview/files/patch-ComboBo.h
diff --git a/print/bibview/files/patch-ac b/print/bibview/files/patch-FileNom.c
index 45ec9e37942d..45ec9e37942d 100644
--- a/print/bibview/files/patch-ac
+++ b/print/bibview/files/patch-FileNom.c
diff --git a/print/bibview/files/patch-ag b/print/bibview/files/patch-FileNom.h
index 1c302aa34af7..1c302aa34af7 100644
--- a/print/bibview/files/patch-ag
+++ b/print/bibview/files/patch-FileNom.h
diff --git a/print/bibview/files/patch-aa b/print/bibview/files/patch-Imakefile
index 96dd8586e44c..96dd8586e44c 100644
--- a/print/bibview/files/patch-aa
+++ b/print/bibview/files/patch-Imakefile
diff --git a/print/bibview/files/patch-ab b/print/bibview/files/patch-bibview.c
index 3e47c2485e64..3e47c2485e64 100644
--- a/print/bibview/files/patch-ab
+++ b/print/bibview/files/patch-bibview.c
diff --git a/print/bibview/files/patch-af b/print/bibview/files/patch-ctl_card.c
index 786f077c04f9..786f077c04f9 100644
--- a/print/bibview/files/patch-af
+++ b/print/bibview/files/patch-ctl_card.c
diff --git a/print/bibview/files/patch-ae b/print/bibview/files/patch-gui_card.c
index 514c65f15929..514c65f15929 100644
--- a/print/bibview/files/patch-ae
+++ b/print/bibview/files/patch-gui_card.c
diff --git a/print/bibview/files/patch-ad b/print/bibview/files/patch-gui_widg.c
index 40ac9569de58..40ac9569de58 100644
--- a/print/bibview/files/patch-ad
+++ b/print/bibview/files/patch-gui_widg.c
diff --git a/print/dviselect/files/patch-aa b/print/dviselect/files/patch-dviselect.c
index 819b8a1ca201..819b8a1ca201 100644
--- a/print/dviselect/files/patch-aa
+++ b/print/dviselect/files/patch-dviselect.c
diff --git a/print/dviselect/files/patch-lib::Makefile b/print/dviselect/files/patch-lib_Makefile
index b07c457b6d7d..b07c457b6d7d 100644
--- a/print/dviselect/files/patch-lib::Makefile
+++ b/print/dviselect/files/patch-lib_Makefile
diff --git a/print/dviselect/files/patch-lib::error.c b/print/dviselect/files/patch-lib_error.c
index 6e9fb918a4c3..6e9fb918a4c3 100644
--- a/print/dviselect/files/patch-lib::error.c
+++ b/print/dviselect/files/patch-lib_error.c
diff --git a/print/dviselect/files/patch-ac b/print/dviselect/files/patch-lib_font.c
index 610e850e63ef..610e850e63ef 100644
--- a/print/dviselect/files/patch-ac
+++ b/print/dviselect/files/patch-lib_font.c
diff --git a/print/dviselect/files/patch-lib::pkfont.c b/print/dviselect/files/patch-lib_pkfont.c
index a3eeab64fca6..a3eeab64fca6 100644
--- a/print/dviselect/files/patch-lib::pkfont.c
+++ b/print/dviselect/files/patch-lib_pkfont.c
diff --git a/print/dviselect/files/patch-lib::pxlfont.c b/print/dviselect/files/patch-lib_pxlfont.c
index 2c9148755d63..2c9148755d63 100644
--- a/print/dviselect/files/patch-lib::pxlfont.c
+++ b/print/dviselect/files/patch-lib_pxlfont.c
diff --git a/print/dviselect/files/patch-lib::rotate.c b/print/dviselect/files/patch-lib_rotate.c
index 51af383d9d2e..51af383d9d2e 100644
--- a/print/dviselect/files/patch-lib::rotate.c
+++ b/print/dviselect/files/patch-lib_rotate.c
diff --git a/print/dviselect/files/patch-lib::search.c b/print/dviselect/files/patch-lib_search.c
index 43054c620521..43054c620521 100644
--- a/print/dviselect/files/patch-lib::search.c
+++ b/print/dviselect/files/patch-lib_search.c
diff --git a/print/dviselect/files/patch-ad b/print/dviselect/files/patch-lib_seek.c
index 05abce5e78fe..05abce5e78fe 100644
--- a/print/dviselect/files/patch-ad
+++ b/print/dviselect/files/patch-lib_seek.c
diff --git a/print/dviselect/files/patch-lib::tfm.c b/print/dviselect/files/patch-lib_tfm.c
index 72623335046a..72623335046a 100644
--- a/print/dviselect/files/patch-lib::tfm.c
+++ b/print/dviselect/files/patch-lib_tfm.c
diff --git a/print/dviselect/files/patch-lib::tfmfont.c b/print/dviselect/files/patch-lib_tfmfont.c
index 9de2cc7bce0f..9de2cc7bce0f 100644
--- a/print/dviselect/files/patch-lib::tfmfont.c
+++ b/print/dviselect/files/patch-lib_tfmfont.c
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 42033722fec7..6a6dcf2a69ce 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -29,17 +29,10 @@ OPTIONS_DEFINE=		LCD_FILTERING PNG
 LCD_FILTERING_DESC?=	Sub-pixel rendering (patented)
 PNG_DESC=		Png compressed OpenType embedded bitmaps support
 
-.include <bsd.port.options.mk>
+LCD_FILTERING_CFLAGS=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
 
-.if ${PORT_OPTIONS:MLCD_FILTERING}
-CFLAGS+=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
-.else
-CONFIGURE_ARGS+=--without-png
-.endif
+PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
+PNG_CONFIGURE_OFF=	--without-png
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
diff --git a/print/freetype2/files/patch-aa b/print/freetype2/files/patch-builds_unix_detect.mk
index cc3b2286a40d..cc3b2286a40d 100644
--- a/print/freetype2/files/patch-aa
+++ b/print/freetype2/files/patch-builds_unix_detect.mk
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index efacf521f671..aa4fc266b1bb 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 WRKSRC=		${WRKDIR}/${DISTNAME}/sources
 
 USES=		makeinfo
-MAKE_ENV=	DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}" \
-		PREVIEWER="${PREVIEWER}"
+MAKE_ENV=	DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}"
 
 PLIST_FILES=	bin/hp2xx man/man1/hp2xx.1.gz
 INFO=		hp2xx
@@ -32,14 +31,8 @@ OPTIONS_DEFAULT=X11
 X11_USE=	XORG=x11
 X11_CPPFLAGS=	-DHAS_UNIX_X11 -I${LOCALBASE}/include
 X11_LDFLAGS=	-L${LOCALBASE}/lib -lX11
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-PREVIEWER=	to_x11
-.else
-PREVIEWER=	no_prev
-.endif
+X11_MAKE_ENV=		PREVIEWER=to_x11
+X11_MAKE_ENV_OFF=	PREVIEWER=no_prev
 
 post-patch:
 	@${REINPLACE_CMD} -E 's,(bin|info|man1)dir),DESTDIR)$$(&,' \
diff --git a/print/hp2xx/files/patch-aa b/print/hp2xx/files/patch-Makefile
index f2d6427d90f7..f2d6427d90f7 100644
--- a/print/hp2xx/files/patch-aa
+++ b/print/hp2xx/files/patch-Makefile
diff --git a/print/hp2xx/files/patch-ab b/print/hp2xx/files/patch-doc_hp2xxinf.tex
index cb74921ef427..cb74921ef427 100644
--- a/print/hp2xx/files/patch-ab
+++ b/print/hp2xx/files/patch-doc_hp2xxinf.tex
diff --git a/print/html2latex/Makefile b/print/html2latex/Makefile
index 433161b6f5fe..d0daedc2648f 100644
--- a/print/html2latex/Makefile
+++ b/print/html2latex/Makefile
@@ -6,11 +6,11 @@ PORTVERSION=	0.9c
 CATEGORIES=	print
 # I can't seem to find the original dist site
 MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Convert HTML document into LaTeX
 
+USES=		tar:Z
 PLIST_FILES=	bin/html2latex man/man1/html2latex.1.gz
 
 .include <bsd.port.mk>
diff --git a/print/html2latex/files/patch-aa b/print/html2latex/files/patch-add-comment
index e415b2d269f3..e415b2d269f3 100644
--- a/print/html2latex/files/patch-aa
+++ b/print/html2latex/files/patch-add-comment
diff --git a/print/html2latex/files/patch-ac b/print/html2latex/files/patch-html2latex.1
index 19b9c1da95dc..19b9c1da95dc 100644
--- a/print/html2latex/files/patch-ac
+++ b/print/html2latex/files/patch-html2latex.1
diff --git a/print/libppd/files/patch-aa b/print/libppd/files/patch-src_Makefile.in
index 23e590a1bb41..23e590a1bb41 100644
--- a/print/libppd/files/patch-aa
+++ b/print/libppd/files/patch-src_Makefile.in
diff --git a/print/lprps/files/patch-ae b/print/lprps/files/patch-INSTALL
index 919ad1f5ced3..919ad1f5ced3 100644
--- a/print/lprps/files/patch-ae
+++ b/print/lprps/files/patch-INSTALL
diff --git a/print/mp-letter/files/patch-ad b/print/mp-letter/files/patch-mp.common.ps
index c902fc8c08e2..c902fc8c08e2 100644
--- a/print/mp-letter/files/patch-ad
+++ b/print/mp-letter/files/patch-mp.common.ps
diff --git a/print/mp-letter/files/patch-ac b/print/mp-letter/files/patch-mp.man
index 5c2122a61654..5c2122a61654 100644
--- a/print/mp-letter/files/patch-ac
+++ b/print/mp-letter/files/patch-mp.man
diff --git a/print/muttprint/files/patch-ad b/print/muttprint/files/patch-doc_manpages_Makefile
index 550890d80055..550890d80055 100644
--- a/print/muttprint/files/patch-ad
+++ b/print/muttprint/files/patch-doc_manpages_Makefile
diff --git a/print/muttprint/files/patch-ac b/print/muttprint/files/patch-doc_manual_Makefile
index b612ea50d21a..b612ea50d21a 100644
--- a/print/muttprint/files/patch-ac
+++ b/print/muttprint/files/patch-doc_manual_Makefile
diff --git a/print/muttprint/files/patch-langinfo::Makefile b/print/muttprint/files/patch-langinfo_Makefile
index 9f0469bdf5cc..9f0469bdf5cc 100644
--- a/print/muttprint/files/patch-langinfo::Makefile
+++ b/print/muttprint/files/patch-langinfo_Makefile
diff --git a/print/muttprint/files/patch-ab b/print/muttprint/files/patch-muttprint
index 8bab2eee4dd1..8bab2eee4dd1 100644
--- a/print/muttprint/files/patch-ab
+++ b/print/muttprint/files/patch-muttprint
diff --git a/print/muttprint/files/patch-ae b/print/muttprint/files/patch-pics_Beastie.eps
index 7febdd841c9d..7febdd841c9d 100644
--- a/print/muttprint/files/patch-ae
+++ b/print/muttprint/files/patch-pics_Beastie.eps
diff --git a/print/pcal/Makefile b/print/pcal/Makefile
index eb10d0fba3fe..0bcb571c5d3a 100644
--- a/print/pcal/Makefile
+++ b/print/pcal/Makefile
@@ -5,12 +5,11 @@ PORTNAME=	pcal
 PORTVERSION=	4.11.0
 CATEGORIES=	print
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PostScript calendar program
 
-USES=		shebangfix gmake
+USES=		shebangfix gmake tar:tgz
 
 MAKE_ENV=	HOST_CC="${CC}"
 ALL_TARGET=
diff --git a/print/pcal/files/patch-aa b/print/pcal/files/patch-Makefile
index 21de9f9a9f8b..21de9f9a9f8b 100644
--- a/print/pcal/files/patch-aa
+++ b/print/pcal/files/patch-Makefile
diff --git a/print/pcal/files/patch-ab b/print/pcal/files/patch-html_pcal.cgi
index 0b8e4293be25..0b8e4293be25 100644
--- a/print/pcal/files/patch-ab
+++ b/print/pcal/files/patch-html_pcal.cgi
diff --git a/print/pcal/files/patch-ac b/print/pcal/files/patch-html_pcal.html
index 3eb99805523d..3eb99805523d 100644
--- a/print/pcal/files/patch-ac
+++ b/print/pcal/files/patch-html_pcal.html
diff --git a/print/pcal/files/patch-ad b/print/pcal/files/patch-html_pcalw.html
index 0432f65d43c5..0432f65d43c5 100644
--- a/print/pcal/files/patch-ad
+++ b/print/pcal/files/patch-html_pcalw.html
diff --git a/print/pcal/pkg-plist b/print/pcal/pkg-plist
index 60082466abd2..2d34b4f5beb3 100644
--- a/print/pcal/pkg-plist
+++ b/print/pcal/pkg-plist
@@ -2,38 +2,38 @@ bin/pcal
 libexec/pcal.cgi
 libexec/pcal.pl
 man/man1/pcal.1.gz
-%%EXAMPLESDIR%%/calendar_au.txt
-%%EXAMPLESDIR%%/calendar_de.txt
-%%EXAMPLESDIR%%/calendar_ee.txt
-%%EXAMPLESDIR%%/calendar_es.txt
-%%EXAMPLESDIR%%/calendar_fi.txt
-%%EXAMPLESDIR%%/calendar_fr.txt
-%%EXAMPLESDIR%%/calendar_gr.txt
-%%EXAMPLESDIR%%/calendar_hu.txt
-%%EXAMPLESDIR%%/calendar_nl.txt
-%%EXAMPLESDIR%%/calendar_no.txt
-%%EXAMPLESDIR%%/calendar_nz.txt
-%%EXAMPLESDIR%%/calendar_pl.txt
-%%EXAMPLESDIR%%/calendar_sk.txt
-%%EXAMPLESDIR%%/calendar_uk.txt
-%%EXAMPLESDIR%%/calendar_us.txt
-%%EXAMPLESDIR%%/fonttest_arabic
-%%EXAMPLESDIR%%/fonttest_cyrillic
-%%EXAMPLESDIR%%/fonttest_greek
-%%EXAMPLESDIR%%/fonttest_hebrew
-%%EXAMPLESDIR%%/fonttest_koi8r
-%%EXAMPLESDIR%%/fonttest_koi8u
-%%EXAMPLESDIR%%/fonttest_latin1
-%%EXAMPLESDIR%%/fonttest_latin10
-%%EXAMPLESDIR%%/fonttest_latin2
-%%EXAMPLESDIR%%/fonttest_latin3
-%%EXAMPLESDIR%%/fonttest_latin4
-%%EXAMPLESDIR%%/fonttest_latin5
-%%EXAMPLESDIR%%/fonttest_latin6
-%%EXAMPLESDIR%%/fonttest_latin7
-%%EXAMPLESDIR%%/fonttest_latin8
-%%EXAMPLESDIR%%/fonttest_latin9
-%%EXAMPLESDIR%%/fonttest_roman8
-%%EXAMPLESDIR%%/fonttest_thai
-%%EXAMPLESDIR%%/pcal-cfg.txt
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_au.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_de.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_ee.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_es.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_fi.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_fr.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_gr.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_hu.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_nl.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_no.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_nz.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_pl.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_sk.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_uk.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar_us.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_arabic
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_cyrillic
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_greek
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_hebrew
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_koi8r
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_koi8u
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_latin1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_latin10
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_latin2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_latin3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_latin4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_latin5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_latin6
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_latin7
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_latin8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_latin9
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_roman8
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fonttest_thai
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcal-cfg.txt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/print/pic2fig/Makefile b/print/pic2fig/Makefile
index 4648030cccd5..cd44f959d6fc 100644
--- a/print/pic2fig/Makefile
+++ b/print/pic2fig/Makefile
@@ -7,11 +7,11 @@ PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pic format to fig format converter
 
+USES=		tar:Z
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CFLAGS+=	-Wno-return-type
 PLIST_FILES=	bin/pic2fig man/man1/pic2fig.1.gz
diff --git a/print/pic2fig/files/patch-aa b/print/pic2fig/files/patch-FORMAT3.2
index 183915b57501..183915b57501 100644
--- a/print/pic2fig/files/patch-aa
+++ b/print/pic2fig/files/patch-FORMAT3.2
diff --git a/print/pic2fig/files/patch-ab b/print/pic2fig/files/patch-Makefile
index 99546c2eed28..99546c2eed28 100644
--- a/print/pic2fig/files/patch-ab
+++ b/print/pic2fig/files/patch-Makefile
diff --git a/print/pic2fig/files/patch-ac b/print/pic2fig/files/patch-figd.c
index c28747f49aec..c28747f49aec 100644
--- a/print/pic2fig/files/patch-ac
+++ b/print/pic2fig/files/patch-figd.c
diff --git a/print/pic2fig/files/patch-ad b/print/pic2fig/files/patch-main.c
index 1a44c1438d07..1a44c1438d07 100644
--- a/print/pic2fig/files/patch-ad
+++ b/print/pic2fig/files/patch-main.c
diff --git a/print/pic2fig/files/patch-ae b/print/pic2fig/files/patch-pic.h
index ee66a6d9eb2c..ee66a6d9eb2c 100644
--- a/print/pic2fig/files/patch-ae
+++ b/print/pic2fig/files/patch-pic.h
diff --git a/print/pic2fig/files/patch-af b/print/pic2fig/files/patch-pic2fig.1
index 15ad2196bd35..15ad2196bd35 100644
--- a/print/pic2fig/files/patch-af
+++ b/print/pic2fig/files/patch-pic2fig.1
diff --git a/print/pic2fig/files/patch-ag b/print/pic2fig/files/patch-picl.c
index a5de3d183380..a5de3d183380 100644
--- a/print/pic2fig/files/patch-ag
+++ b/print/pic2fig/files/patch-picl.c
diff --git a/print/pic2fig/files/patch-ah b/print/pic2fig/files/patch-plfig.c
index 0f790a482365..0f790a482365 100644
--- a/print/pic2fig/files/patch-ah
+++ b/print/pic2fig/files/patch-plfig.c
diff --git a/print/poster/files/patch-aa b/print/poster/files/patch-poster.c
index 8c14e4a52760..8c14e4a52760 100644
--- a/print/poster/files/patch-aa
+++ b/print/poster/files/patch-poster.c
diff --git a/print/tex/files/patch-ab b/print/tex/files/patch-configure
index 4ec88a274d9a..4ec88a274d9a 100644
--- a/print/tex/files/patch-ab
+++ b/print/tex/files/patch-configure
diff --git a/print/tex/files/patch-af b/print/tex/files/patch-kpathsea_config.h
index 992c31e7b94d..992c31e7b94d 100644
--- a/print/tex/files/patch-af
+++ b/print/tex/files/patch-kpathsea_config.h
diff --git a/print/tex/files/patch-ac b/print/tex/files/patch-kpathsea_configure
index 838c6ac0d537..838c6ac0d537 100644
--- a/print/tex/files/patch-ac
+++ b/print/tex/files/patch-kpathsea_configure
diff --git a/print/tex/files/patch-aa b/print/tex/files/patch-make_common.make
index 1d6c5d2ec3dd..1d6c5d2ec3dd 100644
--- a/print/tex/files/patch-aa
+++ b/print/tex/files/patch-make_common.make
diff --git a/print/tex/files/patch-ad b/print/tex/files/patch-web2c_configure
index 63cd126e8a0f..63cd126e8a0f 100644
--- a/print/tex/files/patch-ad
+++ b/print/tex/files/patch-web2c_configure
diff --git a/print/tex/files/patch-ae b/print/tex/files/patch-web2c_web2c_web2c.y
index c551b8caf9d0..c551b8caf9d0 100644
--- a/print/tex/files/patch-ae
+++ b/print/tex/files/patch-web2c_web2c_web2c.y
diff --git a/print/transfig/files/patch-ac b/print/transfig/files/patch-fig2dev_Imakefile
index b9f1a4acbdc7..b9f1a4acbdc7 100644
--- a/print/transfig/files/patch-ac
+++ b/print/transfig/files/patch-fig2dev_Imakefile
diff --git a/print/transfig/files/patch-ba b/print/transfig/files/patch-fig2dev_dev_korean.ps
index c84166115ff2..c84166115ff2 100644
--- a/print/transfig/files/patch-ba
+++ b/print/transfig/files/patch-fig2dev_dev_korean.ps
diff --git a/print/xmbibtex/files/patch-aa b/print/xmbibtex/files/patch-Imakefile
index e0af00629464..e0af00629464 100644
--- a/print/xmbibtex/files/patch-aa
+++ b/print/xmbibtex/files/patch-Imakefile