Remove -frerun-cse-after-loop, a vestige from the days when our compiler

was slightly broken [1].

Allow alpha users to remove -O0 from CFLAGS if they so desire [2].  Replace
-O2 in config with whatever ${CFLAGS} happens to be, with a perl regex.

Submitted by:	[1] sf
		[2] naddy

5 files changed, 15 insertions, 15 deletions

diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 6784057df9be..cf6aeed7f474 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+=	SHARED="" STATIC="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha" && !defined(NO_ALPHA_UNOPTIMIZATION)
 CFLAGS+=	-O0
 .endif
 
@@ -97,8 +97,8 @@ post-patch:
 
 pre-configure: qt-pre-configure
 	${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \
-			s,/usr/X11R6,${X11BASE},g; \
-			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG}
+			s,/usr/X11R6,${X11BASE},g;s,-O2,${CFLAGS},g; \
+			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_,g" ${CONFIG}
 	${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \
 			s,TARGET	= qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in
 	${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 6784057df9be..cf6aeed7f474 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+=	SHARED="" STATIC="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha" && !defined(NO_ALPHA_UNOPTIMIZATION)
 CFLAGS+=	-O0
 .endif
 
@@ -97,8 +97,8 @@ post-patch:
 
 pre-configure: qt-pre-configure
 	${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \
-			s,/usr/X11R6,${X11BASE},g; \
-			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG}
+			s,/usr/X11R6,${X11BASE},g;s,-O2,${CFLAGS},g; \
+			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_,g" ${CONFIG}
 	${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \
 			s,TARGET	= qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in
 	${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 6784057df9be..cf6aeed7f474 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+=	SHARED="" STATIC="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha" && !defined(NO_ALPHA_UNOPTIMIZATION)
 CFLAGS+=	-O0
 .endif
 
@@ -97,8 +97,8 @@ post-patch:
 
 pre-configure: qt-pre-configure
 	${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \
-			s,/usr/X11R6,${X11BASE},g; \
-			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG}
+			s,/usr/X11R6,${X11BASE},g;s,-O2,${CFLAGS},g; \
+			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_,g" ${CONFIG}
 	${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \
 			s,TARGET	= qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in
 	${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 6784057df9be..cf6aeed7f474 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+=	SHARED="" STATIC="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha" && !defined(NO_ALPHA_UNOPTIMIZATION)
 CFLAGS+=	-O0
 .endif
 
@@ -97,8 +97,8 @@ post-patch:
 
 pre-configure: qt-pre-configure
 	${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \
-			s,/usr/X11R6,${X11BASE},g; \
-			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG}
+			s,/usr/X11R6,${X11BASE},g;s,-O2,${CFLAGS},g; \
+			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_,g" ${CONFIG}
 	${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \
 			s,TARGET	= qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in
 	${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 6784057df9be..cf6aeed7f474 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+=	SHARED="" STATIC="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha" && !defined(NO_ALPHA_UNOPTIMIZATION)
 CFLAGS+=	-O0
 .endif
 
@@ -97,8 +97,8 @@ post-patch:
 
 pre-configure: qt-pre-configure
 	${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \
-			s,/usr/X11R6,${X11BASE},g; \
-			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG}
+			s,/usr/X11R6,${X11BASE},g;s,-O2,${CFLAGS},g; \
+			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_,g" ${CONFIG}
 	${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \
 			s,TARGET	= qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in
 	${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in