diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-26 14:06:36 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-26 14:06:36 +0800 |
| commit | 9f742143c7e240ed100d624fb816ebd0e22cc1a0 (patch) | |
| tree | 13096027fcab430bb1471e4a5324a89bca059ada /graphics | |
| parent | 4c066bd2765fc7d65405542f33587e84e629ffe4 (diff) | |
| download | marcuscom-ports-9f742143c7e240ed100d624fb816ebd0e22cc1a0.tar.gz marcuscom-ports-9f742143c7e240ed100d624fb816ebd0e22cc1a0.tar.zst marcuscom-ports-9f742143c7e240ed100d624fb816ebd0e22cc1a0.zip | |
Fix the Mozilla plug-in build with Firefox when WITH_MOZILLA is not explicitly
defined. Also, respect CFLAGS a little more.
Reported by: Caelian on #freebsd-gnome
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4642 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/librsvg2/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 758aa01ca..3314b02e8 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/librsvg2/Makefile,v 1.58 2005/08/26 04:03:54 marcus Exp $ +# $MCom: ports/graphics/librsvg2/Makefile,v 1.59 2005/08/26 05:59:43 mezz Exp $ # PORTNAME= librsvg2 @@ -59,18 +59,22 @@ RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/fir .endif HEADERS_SUFX= +MOZILLA= firefox CONFIGURE_ENV+= MOZILLA_CONFIG=no .if !defined(WITH_MOZILLA) HEADERS_SUFX= .else .if ${WITH_MOZILLA}=="mozilla" +MOZILLA= mozilla HEADERS_SUFX= .else .if ${WITH_MOZILLA}=="mozilla-devel" +MOZILLA= mozilla HEADERS_SUFX= -devel .else .if ${WITH_MOZILLA}=="firefox" +MOZILLA= firefox HEADERS_SUFX= .endif .endif @@ -94,16 +98,12 @@ post-patch: @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/librsvg-2.0.pc.in .if defined(WITH_MOZILLA_PLUGIN) -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" - @${REINPLACE_CMD} -e 's|mozilla-|firefox-|g' ${WRKSRC}/configure -.else - @${REINPLACE_CMD} -e 's|mozilla-plugin|mozilla-plugin${HEADERS_SUFX}|g' \ + @${REINPLACE_CMD} -e 's|mozilla-plugin|${MOZILLA}-plugin${HEADERS_SUFX}|g' \ ${WRKSRC}/configure .endif -.endif pre-build: - @${REINPLACE_CMD} -E -e 's|O2|O|g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E -e 's|-O2||g' ${WRKSRC}/Makefile .if defined(WITH_MOZILLA_PLUGIN) post-install: |