diff --git a/math/abs/files/patch-aa b/math/abs/files/patch-Makefile
similarity index 100%
rename from math/abs/files/patch-aa
rename to math/abs/files/patch-Makefile
diff --git a/math/abs/files/patch-ad b/math/abs/files/patch-X11_button.h
similarity index 100%
rename from math/abs/files/patch-ad
rename to math/abs/files/patch-X11_button.h
diff --git a/math/abs/files/patch-ae b/math/abs/files/patch-X11_popnindex.h
similarity index 100%
rename from math/abs/files/patch-ae
rename to math/abs/files/patch-X11_popnindex.h
diff --git a/math/apc/Makefile b/math/apc/Makefile
index 4689c8fb6c89..1e845f5a1be9 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -19,7 +19,7 @@ USE_XORG=	x11 xpm
 PLIST_FILES=	bin/apc man/man1/apc.1.gz
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/apc ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/apc.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/apc ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/apc.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/math/apc/files/patch-aa b/math/apc/files/patch-Makefile
similarity index 100%
rename from math/apc/files/patch-aa
rename to math/apc/files/patch-Makefile
diff --git a/math/asir2000/files/patch-ba b/math/asir2000/files/patch-Makefile.am
similarity index 100%
rename from math/asir2000/files/patch-ba
rename to math/asir2000/files/patch-Makefile.am
diff --git a/math/asir2000/files/patch-bb b/math/asir2000/files/patch-asm_Makefile.am
similarity index 100%
rename from math/asir2000/files/patch-bb
rename to math/asir2000/files/patch-asm_Makefile.am
diff --git a/math/asir2000/files/patch-bc b/math/asir2000/files/patch-builtin_Makefile.am
similarity index 100%
rename from math/asir2000/files/patch-bc
rename to math/asir2000/files/patch-builtin_Makefile.am
diff --git a/math/asir2000/files/patch-bd b/math/asir2000/files/patch-engine_Makefile.am
similarity index 100%
rename from math/asir2000/files/patch-bd
rename to math/asir2000/files/patch-engine_Makefile.am
diff --git a/math/asir2000/files/patch-be b/math/asir2000/files/patch-fft_Makefile.am
similarity index 100%
rename from math/asir2000/files/patch-be
rename to math/asir2000/files/patch-fft_Makefile.am
diff --git a/math/asir2000/files/patch-ac b/math/asir2000/files/patch-include_version.h
similarity index 100%
rename from math/asir2000/files/patch-ac
rename to math/asir2000/files/patch-include_version.h
diff --git a/math/asir2000/files/patch-bf b/math/asir2000/files/patch-io_Makefile.am
similarity index 100%
rename from math/asir2000/files/patch-bf
rename to math/asir2000/files/patch-io_Makefile.am
diff --git a/math/asir2000/files/patch-bk b/math/asir2000/files/patch-lib_Makefile.am
similarity index 100%
rename from math/asir2000/files/patch-bk
rename to math/asir2000/files/patch-lib_Makefile.am
diff --git a/math/asir2000/files/patch-bh b/math/asir2000/files/patch-plot_Makefile.am
similarity index 100%
rename from math/asir2000/files/patch-bh
rename to math/asir2000/files/patch-plot_Makefile.am
diff --git a/math/calctool/files/patch-ab b/math/calctool/files/patch-Makefile
similarity index 100%
rename from math/calctool/files/patch-ab
rename to math/calctool/files/patch-Makefile
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index f4ea31adc11c..d251bf0fd246 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -32,10 +32,10 @@ OPTIONS_DEFINE=	PROFILE
 
 .if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
-IGNORE =	you have defined WITH_PROFILE, but have also defined\
+IGNORE=		you have defined WITH_PROFILE, but have also defined\
 WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
 .elif !exists(/usr/lib/libc_p.a)
-IGNORE  =	you have chosen WITH_PROFILE, but have not installed the\
+IGNORE =	you have chosen WITH_PROFILE, but have not installed the\
 base system profiling libraries
 .endif
 PLIST_FILES+=	lib/libeispack_p.a
@@ -43,7 +43,7 @@ PLIST_FILES+=	lib/libeispack_p.a
 MAKE_ENV+=	NO_PROFILE=yes
 .endif
 
-SRCS =	csroot.f epslon.f pythag.f bakvec.f balanc.f balbak.f bandr.f \
+SRCS=	csroot.f epslon.f pythag.f bakvec.f balanc.f balbak.f bandr.f \
 	bandv.f bisect.f bqr.f cbabk2.f cbal.f cg.f ch.f cinvit.f combak.f \
 	comhes.f comlr.f comlr2.f comqr.f comqr2.f cortb.f corth.f elmbak.f \
 	elmhes.f eltran.f figi.f figi2.f hqr.f hqr2.f htrib3.f htribk.f \
diff --git a/math/eispack/files/patch-aa b/math/eispack/files/patch-radix_fix
similarity index 100%
rename from math/eispack/files/patch-aa
rename to math/eispack/files/patch-radix_fix
diff --git a/math/eval/files/patch-aa b/math/eval/files/patch-Makefile
similarity index 100%
rename from math/eval/files/patch-aa
rename to math/eval/files/patch-Makefile
diff --git a/math/eval/files/patch-ac b/math/eval/files/patch-eval.c
similarity index 100%
rename from math/eval/files/patch-ac
rename to math/eval/files/patch-eval.c
diff --git a/math/eval/files/patch-ab b/math/eval/files/patch-eval.h
similarity index 100%
rename from math/eval/files/patch-ab
rename to math/eval/files/patch-eval.h
diff --git a/math/eval/files/patch-ad b/math/eval/files/patch-funcs.c
similarity index 100%
rename from math/eval/files/patch-ad
rename to math/eval/files/patch-funcs.c
diff --git a/math/geg/Makefile b/math/geg/Makefile
index f7e8fb32705c..f21d68efa0f8 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -22,6 +22,6 @@ PLIST_FILES=	bin/geg \
 		man/man1/geg.1.gz
 
 pre-configure:
-	@cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/aclocal
+	@(cd ${WRKSRC}; ${ACLOCAL} -I ${LOCALBASE}/share/aclocal)
 
 .include <bsd.port.mk>
diff --git a/math/geg/files/patch-ac b/math/geg/files/patch-configure.in
similarity index 100%
rename from math/geg/files/patch-ac
rename to math/geg/files/patch-configure.in
diff --git a/math/geg/files/patch-ab b/math/geg/files/patch-src_main.c
similarity index 100%
rename from math/geg/files/patch-ab
rename to math/geg/files/patch-src_main.c
diff --git a/math/ngraph/files/patch-aa b/math/ngraph/files/patch-Makefile
similarity index 100%
rename from math/ngraph/files/patch-aa
rename to math/ngraph/files/patch-Makefile
diff --git a/math/oleo/files/patch-ad b/math/oleo/files/patch-Makefile.in
similarity index 100%
rename from math/oleo/files/patch-ad
rename to math/oleo/files/patch-Makefile.in
diff --git a/math/oleo/files/patch-ag b/math/oleo/files/patch-aclocal.m4
similarity index 100%
rename from math/oleo/files/patch-ag
rename to math/oleo/files/patch-aclocal.m4
diff --git a/math/oleo/files/patch-ah b/math/oleo/files/patch-configure.in
similarity index 100%
rename from math/oleo/files/patch-ah
rename to math/oleo/files/patch-configure.in
diff --git a/math/oleo/files/patch-ai b/math/oleo/files/patch-doc_Makefile.in
similarity index 100%
rename from math/oleo/files/patch-ai
rename to math/oleo/files/patch-doc_Makefile.in
diff --git a/math/oleo/files/patch-af b/math/oleo/files/patch-doc_oleo.texi
similarity index 100%
rename from math/oleo/files/patch-af
rename to math/oleo/files/patch-doc_oleo.texi
diff --git a/math/oleo/files/patch-ak b/math/oleo/files/patch-src_Makefile.in
similarity index 100%
rename from math/oleo/files/patch-ak
rename to math/oleo/files/patch-src_Makefile.in
diff --git a/math/oleo/files/patch-src::eval.c b/math/oleo/files/patch-src_eval.c
similarity index 100%
rename from math/oleo/files/patch-src::eval.c
rename to math/oleo/files/patch-src_eval.c
diff --git a/math/oleo/files/patch-src::global.h b/math/oleo/files/patch-src_global.h
similarity index 100%
rename from math/oleo/files/patch-src::global.h
rename to math/oleo/files/patch-src_global.h
diff --git a/math/oleo/files/patch-al b/math/oleo/files/patch-src_io-motif.c
similarity index 100%
rename from math/oleo/files/patch-al
rename to math/oleo/files/patch-src_io-motif.c
diff --git a/math/oleo/files/patch-src::io-utils.c b/math/oleo/files/patch-src_io-utils.c
similarity index 100%
rename from math/oleo/files/patch-src::io-utils.c
rename to math/oleo/files/patch-src_io-utils.c
diff --git a/math/oleo/files/patch-src::io-x11.c b/math/oleo/files/patch-src_io-x11.c
similarity index 100%
rename from math/oleo/files/patch-src::io-x11.c
rename to math/oleo/files/patch-src_io-x11.c
diff --git a/math/oleo/files/patch-src::plotter.c b/math/oleo/files/patch-src_plotter.c
similarity index 100%
rename from math/oleo/files/patch-src::plotter.c
rename to math/oleo/files/patch-src_plotter.c
diff --git a/math/oleo/files/patch-src::posixtm.y b/math/oleo/files/patch-src_posixtm.y
similarity index 100%
rename from math/oleo/files/patch-src::posixtm.y
rename to math/oleo/files/patch-src_posixtm.y
diff --git a/math/oleo/files/patch-src::ref.c b/math/oleo/files/patch-src_ref.c
similarity index 100%
rename from math/oleo/files/patch-src::ref.c
rename to math/oleo/files/patch-src_ref.c
diff --git a/math/oleo/files/patch-src::sysdef.h b/math/oleo/files/patch-src_sysdef.h
similarity index 100%
rename from math/oleo/files/patch-src::sysdef.h
rename to math/oleo/files/patch-src_sysdef.h
diff --git a/math/oleo/files/patch-src::utils.c b/math/oleo/files/patch-src_utils.c
similarity index 100%
rename from math/oleo/files/patch-src::utils.c
rename to math/oleo/files/patch-src_utils.c
diff --git a/math/oleo/files/patch-src::xrdb.c b/math/oleo/files/patch-src_xrdb.c
similarity index 100%
rename from math/oleo/files/patch-src::xrdb.c
rename to math/oleo/files/patch-src_xrdb.c
diff --git a/math/pari/files/patch-af b/math/pari/files/patch-config_Makefile.SH
similarity index 100%
rename from math/pari/files/patch-af
rename to math/pari/files/patch-config_Makefile.SH
diff --git a/math/physcalc/files/patch-aa b/math/physcalc/files/patch-physcalc.h
similarity index 100%
rename from math/physcalc/files/patch-aa
rename to math/physcalc/files/patch-physcalc.h
diff --git a/math/physcalc/files/patch-ab b/math/physcalc/files/patch-physconv.c
similarity index 100%
rename from math/physcalc/files/patch-ab
rename to math/physcalc/files/patch-physconv.c
diff --git a/math/physcalc/files/patch-ac b/math/physcalc/files/patch-physmain.c
similarity index 100%
rename from math/physcalc/files/patch-ac
rename to math/physcalc/files/patch-physmain.c
diff --git a/math/topaz/files/patch-ab b/math/topaz/files/patch-Makefile.freebsd
similarity index 100%
rename from math/topaz/files/patch-ab
rename to math/topaz/files/patch-Makefile.freebsd
diff --git a/math/topaz/files/patch-aa b/math/topaz/files/patch-topaz_Makefile.freebsd
similarity index 100%
rename from math/topaz/files/patch-aa
rename to math/topaz/files/patch-topaz_Makefile.freebsd
diff --git a/math/topaz/files/patch-topaz::topaz.cc b/math/topaz/files/patch-topaz_topaz.cc
similarity index 100%
rename from math/topaz/files/patch-topaz::topaz.cc
rename to math/topaz/files/patch-topaz_topaz.cc
diff --git a/math/topaz/files/patch-topaz::tpv2ps.cc b/math/topaz/files/patch-topaz_tpv2ps.cc
similarity index 100%
rename from math/topaz/files/patch-topaz::tpv2ps.cc
rename to math/topaz/files/patch-topaz_tpv2ps.cc
diff --git a/math/xgraph/Makefile b/math/xgraph/Makefile
index 13482a445e82..65a7836bdd9c 100644
--- a/math/xgraph/Makefile
+++ b/math/xgraph/Makefile
@@ -7,12 +7,11 @@ PORTREVISION=	2
 CATEGORIES=	math print
 MASTER_SITES=	ftp://ftp.cs.utoronto.ca/pub/radford/
 DISTNAME=	xgraph-11
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	Program that helps you plot graphs
 
-USES=		imake
+USES=		imake tar:Z
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/math/xgraph/files/patch-ad b/math/xgraph/files/patch-hpgl.c
similarity index 100%
rename from math/xgraph/files/patch-ad
rename to math/xgraph/files/patch-hpgl.c
diff --git a/math/xgraph/files/patch-ag b/math/xgraph/files/patch-ps.c
similarity index 100%
rename from math/xgraph/files/patch-ag
rename to math/xgraph/files/patch-ps.c
diff --git a/math/xgraph/files/patch-ab b/math/xgraph/files/patch-xgraph.c
similarity index 100%
rename from math/xgraph/files/patch-ab
rename to math/xgraph/files/patch-xgraph.c
diff --git a/math/xgraph/files/patch-ae b/math/xgraph/files/patch-xgraph.h
similarity index 100%
rename from math/xgraph/files/patch-ae
rename to math/xgraph/files/patch-xgraph.h
diff --git a/math/xgraph/files/patch-ac b/math/xgraph/files/patch-xtb.c
similarity index 100%
rename from math/xgraph/files/patch-ac
rename to math/xgraph/files/patch-xtb.c
diff --git a/math/xldlas/files/patch-aa b/math/xldlas/files/patch-Makefile
similarity index 100%
rename from math/xldlas/files/patch-aa
rename to math/xldlas/files/patch-Makefile
diff --git a/math/xldlas/files/patch-ab b/math/xldlas/files/patch-setstate.c
similarity index 100%
rename from math/xldlas/files/patch-ab
rename to math/xldlas/files/patch-setstate.c
diff --git a/math/xldlas/files/patch-ac b/math/xldlas/files/patch-xldlas.h
similarity index 100%
rename from math/xldlas/files/patch-ac
rename to math/xldlas/files/patch-xldlas.h
diff --git a/math/xspread/files/patch-ab b/math/xspread/files/patch-Makefile.in
similarity index 100%
rename from math/xspread/files/patch-ab
rename to math/xspread/files/patch-Makefile.in
diff --git a/math/xspread/files/patch-ac b/math/xspread/files/patch-config_h.in
similarity index 100%
rename from math/xspread/files/patch-ac
rename to math/xspread/files/patch-config_h.in
diff --git a/math/xspread/files/patch-ad b/math/xspread/files/patch-interp.c
similarity index 100%
rename from math/xspread/files/patch-ad
rename to math/xspread/files/patch-interp.c