From 394b9c9035f7d2a71fa64fb38634049fd0ff18c4 Mon Sep 17 00:00:00 2001 From: miwi Date: Mon, 2 Jul 2007 18:45:55 +0000 Subject: - Unbreak - Fix build after objformat removal - Remove FreeBSD 4.X gruft --- print/scribus-devel/Makefile | 11 ++--------- print/scribus/Makefile | 11 ++--------- 2 files changed, 4 insertions(+), 18 deletions(-) (limited to 'print') diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 47d16db02d3f..1f4ba5ce3700 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -26,7 +26,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte USE_BZIP2= yes USE_QT_VER= 3 -USE_GCC= 3.3+ USE_GNOME= gnometarget libartlgpl2 libxml2 USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes @@ -41,18 +40,10 @@ MANLANG= "" pl .include -.if ${OSVERSION} >= 700029 -BROKEN= Broken objformat handling -.endif - .if ${OSVERSION} < 500035 CXXFLAGS+= -fpermissive .endif -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \ s|-O2 ||g ; \ @@ -62,5 +53,7 @@ post-patch: s|python2_3|${PYTHON_VERSION:S/./_/}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/\/share\/pixmaps\//s|^|#|g' \ ${WRKSRC}/scribus/icons/Makefile.in + @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ + ${WRKSRC}/configure .include diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 47d16db02d3f..1f4ba5ce3700 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -26,7 +26,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinte USE_BZIP2= yes USE_QT_VER= 3 -USE_GCC= 3.3+ USE_GNOME= gnometarget libartlgpl2 libxml2 USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes @@ -41,18 +40,10 @@ MANLANG= "" pl .include -.if ${OSVERSION} >= 700029 -BROKEN= Broken objformat handling -.endif - .if ${OSVERSION} < 500035 CXXFLAGS+= -fpermissive .endif -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \ s|-O2 ||g ; \ @@ -62,5 +53,7 @@ post-patch: s|python2_3|${PYTHON_VERSION:S/./_/}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/\/share\/pixmaps\//s|^|#|g' \ ${WRKSRC}/scribus/icons/Makefile.in + @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ + ${WRKSRC}/configure .include -- cgit