Date: Thu, 22 Apr 2004 09:53:13 +0200 (CEST) From: Stijn Hoop <stijn@win.tue.nl> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Norikatsu Shigemura <nork@FreeBSD.org> Subject: ports/65873: Make www/linuxpluginwrapper optionally depend on Acrobat Message-ID: <200404220753.i3M7rD9a030821@pcwin002.win.tue.nl> Resent-Message-ID: <200404220800.i3M80edK007201@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65873
>Category: ports
>Synopsis: Make www/linuxpluginwrapper optionally depend on Acrobat
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 22 01:00:39 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Stijn Hoop
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 5.2-CURRENT #23: Tue Apr 20 11:24:20 CEST 2004
>Description:
- www/linuxpluginwrapper always depends on Adobe Acrobat 5; while this is
probably useful for people, I'd like to be able to remove this software
in favor of something like the GNOME pdf viewer. The attached patch
adds a knob WITHOUT_ACROBAT to allow this. The knob defaults to no,
so standard behaviour is unchanged.
>How-To-Repeat:
n/a
>Fix:
diff -urN --exclude=CVS /usr/ports/www/linuxpluginwrapper/Makefile linuxpluginwrapper/Makefile
--- /usr/ports/www/linuxpluginwrapper/Makefile Tue Mar 16 09:38:51 2004
+++ linuxpluginwrapper/Makefile Thu Apr 22 09:44:56 2004
@@ -18,8 +18,14 @@
.include <bsd.port.pre.mk>
-RUN_DEPENDS= ${LOCALBASE}/Acrobat5/Browsers/intellinux/nppdf.so:${PORTSDIR}/print/acroread5 \
- ${LOCALBASE}/lib/linux-flashplugin6/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin6
+RUN_DEPENDS= ${LOCALBASE}/lib/linux-flashplugin6/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin6
+
+.if !defined(WITHOUT_ACROBAT)
+RUN_DEPENDS+= ${LOCALBASE}/Acrobat5/Browsers/intellinux/nppdf.so:${PORTSDIR}/print/acroread5
+PLIST_SUB+= ACROBAT=
+.else
+PLIST_SUB+= ACROBAT="@comment "
+.endif
ONLY_FOR_ARCHS= i386
@@ -74,8 +80,10 @@
pre-install:
@${MKDIR} ${X11BASE}/lib/browser_plugins
+.if !defined(WITHOUT_ACROBAT)
@${LN} -sf ${LOCALBASE}/Acrobat5/Browsers/intellinux/nppdf.so \
${X11BASE}/lib/browser_plugins/
+.endif
@${LN} -sf ${LOCALBASE}/lib/linux-flashplugin6/flashplayer.xpt \
${X11BASE}/lib/browser_plugins/
@${LN} -sf ${LOCALBASE}/lib/linux-flashplugin6/libflashplayer.so \
diff -urN --exclude=CVS /usr/ports/www/linuxpluginwrapper/pkg-plist linuxpluginwrapper/pkg-plist
--- /usr/ports/www/linuxpluginwrapper/pkg-plist Tue Mar 16 09:38:51 2004
+++ linuxpluginwrapper/pkg-plist Thu Apr 22 09:42:40 2004
@@ -8,7 +8,7 @@
@unexec /bin/rm -f %%X11BASE%%/lib/browser_plugins/libflashplayer.so
@unexec /bin/rmdir %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
@unexec /bin/mkdir -p %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
-@exec /bin/ln -sf %%LOCALBASE%%/Acrobat5/Browsers/intellinux/nppdf.so %%X11BASE%%/lib/browser_plugins/
+%%ACROBAT%%@exec /bin/ln -sf %%LOCALBASE%%/Acrobat5/Browsers/intellinux/nppdf.so %%X11BASE%%/lib/browser_plugins/
@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-flashplugin6/flashplayer.xpt %%X11BASE%%/lib/browser_plugins/
@exec /bin/ln -sf %%LOCALBASE%%/lib/linux-flashplugin6/libflashplayer.so %%X11BASE%%/lib/browser_plugins/
@dirrm lib/pluginwrapper
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404220753.i3M7rD9a030821>