aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlioux <lioux@FreeBSD.org>2003-03-06 05:27:17 +0800
committerlioux <lioux@FreeBSD.org>2003-03-06 05:27:17 +0800
commit3bdb95f80166eb749f9dc3875d8ebad1411013e2 (patch)
treece6c9a3e3f7abe09fb9386dfa5e0474ccca36ea6
parentb23054a3cd906ab809ed7c46f1536acf84165699 (diff)
downloadfreebsd-ports-gnome-3bdb95f80166eb749f9dc3875d8ebad1411013e2.tar.gz
freebsd-ports-gnome-3bdb95f80166eb749f9dc3875d8ebad1411013e2.tar.zst
freebsd-ports-gnome-3bdb95f80166eb749f9dc3875d8ebad1411013e2.zip
o Unbreak WITH_QT for 4-STABLE branch
o Fix so that USE_GCC is no longer required for 4-STABLE branch o CFLAGS safeness PR: 48862 Submitted by: David Yeske <dyeske@yahoo.com> Approved by: maintainer
Diffstat
-rw-r--r--print/lyx-devel/Makefile14
-rw-r--r--print/lyx/Makefile14
-rw-r--r--print/lyx14/Makefile14
-rw-r--r--print/lyx15/Makefile14
-rw-r--r--print/lyx16/Makefile14
5 files changed, 55 insertions, 15 deletions
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index af7d30da3290..232a13d8de43 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
USE_PERL5= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
@@ -53,14 +54,16 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-USE_GCC= 3.1
+CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.if defined(WITH_QT)
-BROKEN= Does not build
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.endif
.endif
pre-everything::
-.if ( ${OSVERSION} >= 500035 ) && !defined(WITH_QT)
+.if !defined(WITH_QT)
@${ECHO_MSG}
@${ECHO_MSG} "If you want to build with the Qt3 frontend,"
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_QT=yes\""
@@ -81,4 +84,9 @@ pre-everything::
@${ECHO_MSG}
.endif
+post-patch:
+ @${REINPLACE_CMD} -E -e \
+ 's|CFLAGS=$$|#CFLAGS=|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.include <bsd.port.post.mk>
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index af7d30da3290..232a13d8de43 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
USE_PERL5= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
@@ -53,14 +54,16 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-USE_GCC= 3.1
+CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.if defined(WITH_QT)
-BROKEN= Does not build
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.endif
.endif
pre-everything::
-.if ( ${OSVERSION} >= 500035 ) && !defined(WITH_QT)
+.if !defined(WITH_QT)
@${ECHO_MSG}
@${ECHO_MSG} "If you want to build with the Qt3 frontend,"
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_QT=yes\""
@@ -81,4 +84,9 @@ pre-everything::
@${ECHO_MSG}
.endif
+post-patch:
+ @${REINPLACE_CMD} -E -e \
+ 's|CFLAGS=$$|#CFLAGS=|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.include <bsd.port.post.mk>
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index af7d30da3290..232a13d8de43 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
USE_PERL5= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
@@ -53,14 +54,16 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-USE_GCC= 3.1
+CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.if defined(WITH_QT)
-BROKEN= Does not build
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.endif
.endif
pre-everything::
-.if ( ${OSVERSION} >= 500035 ) && !defined(WITH_QT)
+.if !defined(WITH_QT)
@${ECHO_MSG}
@${ECHO_MSG} "If you want to build with the Qt3 frontend,"
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_QT=yes\""
@@ -81,4 +84,9 @@ pre-everything::
@${ECHO_MSG}
.endif
+post-patch:
+ @${REINPLACE_CMD} -E -e \
+ 's|CFLAGS=$$|#CFLAGS=|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.include <bsd.port.post.mk>
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index af7d30da3290..232a13d8de43 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
USE_PERL5= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
@@ -53,14 +54,16 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-USE_GCC= 3.1
+CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.if defined(WITH_QT)
-BROKEN= Does not build
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.endif
.endif
pre-everything::
-.if ( ${OSVERSION} >= 500035 ) && !defined(WITH_QT)
+.if !defined(WITH_QT)
@${ECHO_MSG}
@${ECHO_MSG} "If you want to build with the Qt3 frontend,"
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_QT=yes\""
@@ -81,4 +84,9 @@ pre-everything::
@${ECHO_MSG}
.endif
+post-patch:
+ @${REINPLACE_CMD} -E -e \
+ 's|CFLAGS=$$|#CFLAGS=|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.include <bsd.port.post.mk>
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index af7d30da3290..232a13d8de43 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
USE_PERL5= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_REINPLACE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
@@ -53,14 +54,16 @@ RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-USE_GCC= 3.1
+CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.if defined(WITH_QT)
-BROKEN= Does not build
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" \
+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -Wno-non-template-friend -ftemplate-depth-30"
.endif
.endif
pre-everything::
-.if ( ${OSVERSION} >= 500035 ) && !defined(WITH_QT)
+.if !defined(WITH_QT)
@${ECHO_MSG}
@${ECHO_MSG} "If you want to build with the Qt3 frontend,"
@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_QT=yes\""
@@ -81,4 +84,9 @@ pre-everything::
@${ECHO_MSG}
.endif
+post-patch:
+ @${REINPLACE_CMD} -E -e \
+ 's|CFLAGS=$$|#CFLAGS=|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.include <bsd.port.post.mk>
generated by cgit (git 2.34.1) at 2024-12-27 00:18:42 +0800