diff options
-rw-r--r-- | graphics/librsvg2/Makefile | 57 | ||||
-rw-r--r-- | graphics/librsvg2/files/extra-patch-Makefile.in | 11 | ||||
-rw-r--r-- | graphics/librsvg2/files/patch-librsvg-2.0.pc.in | 9 | ||||
-rw-r--r-- | graphics/librsvg2/files/patch-moz-plugin_Makefile.in | 36 |
4 files changed, 28 insertions, 85 deletions
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index a439d3306..ea9990453 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.63 2005/09/03 18:44:22 kwm Exp $ +# $MCom: ports/graphics/librsvg2/Makefile,v 1.64 2005/09/09 03:42:55 bland Exp $ # PORTNAME= librsvg2 @@ -46,68 +46,47 @@ PLIST_SUB= GTK_VERSION=${GTK_VERSION} MAN1= rsvg.1 -OPTIONS= MOZILLA_PLUGIN "Enable the RSVG browser plug-in" no +OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" no .include <bsd.port.pre.mk> .if defined(WITH_MOZILLA_PLUGIN) -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}!="firefox" -BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} -RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX} -.else -BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox -RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox -.endif +WITH_MOZILLA?= firefox -HEADERS_SUFX= +.if ${WITH_MOZILLA}=="firefox" MOZILLA= firefox -CONFIGURE_ENV+= MOZILLA_CONFIG=no - -.if !defined(WITH_MOZILLA) HEADERS_SUFX= -.else -.if ${WITH_MOZILLA}=="mozilla" +.elif ${WITH_MOZILLA}=="mozilla" MOZILLA= mozilla HEADERS_SUFX= -.else -.if ${WITH_MOZILLA}=="mozilla-devel" +.elif ${WITH_MOZILLA}=="mozilla-devel" MOZILLA= mozilla HEADERS_SUFX= -devel .else -.if ${WITH_MOZILLA}=="firefox" -MOZILLA= firefox -HEADERS_SUFX= -.endif -.endif +BROKEN= "Unknown Gecko source specified (${WITH_MOZILLA})" .endif + +BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX} +RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/${MOZILLA}-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/${MOZILLA}${HEADERS_SUFX} + +.if ${WITH_MOZILLA}=="mozilla-devel" && ${OSVERSION} < 500000 +USE_GCC= 3.4 .endif +CONFIGURE_ENV+= MOZILLA_CONFIG=no +CONFIGURE_ARGS+=--enable-mozilla-plugin=yes + PLIST_SUB+= PLUGIN="" .else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in +CONFIGURE_ARGS+=--enable-mozilla-plugin=no + PLIST_SUB+= PLUGIN="@comment " .endif -.if ${OSVERSION} < 500000 -.if defined(WITH_MOZILLA) -.if ${WITH_MOZILLA}=="mozilla-devel" -USE_GCC= 3.4 -.endif -.endif -.endif post-patch: - @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ - ${WRKSRC}/librsvg-2.0.pc.in .if defined(WITH_MOZILLA_PLUGIN) @${REINPLACE_CMD} -e 's|mozilla-plugin|${MOZILLA}-plugin${HEADERS_SUFX}|g' \ ${WRKSRC}/configure .endif -.if defined(WITH_MOZILLA_PLUGIN) -post-install: - ${MKDIR} ${PREFIX}/lib/browser_plugins - ${INSTALL_PROGRAM} ${WRKSRC}/moz-plugin/.libs/libmozsvgdec.so \ - ${PREFIX}/lib/browser_plugins -.endif - .include <bsd.port.post.mk> diff --git a/graphics/librsvg2/files/extra-patch-Makefile.in b/graphics/librsvg2/files/extra-patch-Makefile.in deleted file mode 100644 index 083095a54..000000000 --- a/graphics/librsvg2/files/extra-patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Mon Aug 29 12:07:45 2005 -+++ Makefile.in Mon Aug 29 12:08:15 2005 -@@ -204,7 +204,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data -+SUBDIRS = . gtk-engine gdk-pixbuf-loader doc data - - @HAVE_GTK_TRUE@target_rsvg_view = rsvg-view - @HAVE_GTK_FALSE@target_rsvg_view = diff --git a/graphics/librsvg2/files/patch-librsvg-2.0.pc.in b/graphics/librsvg2/files/patch-librsvg-2.0.pc.in deleted file mode 100644 index 8210a432b..000000000 --- a/graphics/librsvg2/files/patch-librsvg-2.0.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- librsvg-2.0.pc.in.orig Fri Jun 4 20:23:35 2004 -+++ librsvg-2.0.pc.in Wed Jun 9 01:58:50 2004 -@@ -7,5 +7,5 @@ - Description: library that renders svg files - Version: @VERSION@ - Requires: glib-2.0 gdk-pixbuf-2.0 --Libs: -L${libdir} -lrsvg-2 -+Libs: -L${libdir} -lrsvg-2 %%PTHREAD_LIBS%% - Cflags: -I${includedir}/librsvg-2 diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in index bd552e7f1..6466b5a19 100644 --- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in +++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in @@ -1,27 +1,11 @@ ---- moz-plugin/Makefile.in.orig Mon Aug 29 12:08:38 2005 -+++ moz-plugin/Makefile.in Mon Aug 29 12:09:20 2005 -@@ -252,15 +252,15 @@ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) - pluginLTLIBRARIES_INSTALL = $(INSTALL) - install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(plugindir) -- @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ -- else :; fi; \ -- done -+# @$(NORMAL_INSTALL) -+# $(mkinstalldirs) $(DESTDIR)$(plugindir) -+# @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ -+# if test -f $$p; then \ -+# f="`echo $$p | sed -e 's|^.*/||'`"; \ -+# echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ -+# $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ -+# else :; fi; \ -+# done +--- moz-plugin/Makefile.in.orig Fri Sep 9 14:08:57 2005 ++++ moz-plugin/Makefile.in Fri Sep 9 14:11:30 2005 +@@ -204,7 +204,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-plugindir = $(libdir)/mozilla/plugins/ ++plugindir = $(libdir)/browser_plugins/ + @WITH_MOZILLA_FALSE@plugin_LTLIBRARIES = - uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) + @WITH_MOZILLA_TRUE@plugin_LTLIBRARIES = libmozsvgdec.la |