Date: Tue, 24 Sep 2002 15:43:59 +0900 From: Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp> To: Ying-Chieh Liao <ijliao@FreeBSD.org>, llwang@infor.org Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, daichi@jp.FreeBSD.org Subject: Re: cvs commit: ports/www/flashplugin-mozilla Makefile Message-ID: <878z1rsx8w.wl@eken.phys.nagoya-u.ac.jp> In-Reply-To: <200209210054.g8L0sDEW059533@freefall.freebsd.org> <20020924145615.5ca29f1e.daichi@jp.freebsd.org> References: <200209210054.g8L0sDEW059533@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
At Fri, 20 Sep 2002 17:54:13 -0700 (PDT),Ying-Chieh Liao wrote:
>
> ijliao 2002/09/20 17:54:13 PDT
>
> Modified files:
> www/flashplugin-mozilla Makefile
> Log:
> install properly for mozilla-devel
>
> PR: 43135
> Submitted by: maintainer
>
> Revision Changes Path
> 1.3 +7 -0 ports/www/flashplugin-mozilla/Makefile
It seems not proper. It will register run-dependency to mozilla port
even if it installes plugin for mozilla-devel, besidess the PLIST
does not follow the change.
Apply following patch and create stub port flashplugin-mozilla-devel
overriding RUN_DEPENDES and PLUGIN_DIR seems better way.
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/flashplugin-mozilla/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 21 Sep 2002 00:54:13 -0000 1.3
+++ Makefile 24 Sep 2002 06:40:57 -0000
@@ -16,20 +16,15 @@
MAINTAINER= llwang@infor.org
LIB_DEPENDS= flash.0:${PORTSDIR}/graphics/libflash
-RUN_DEPENDS= mozilla:${PORTSDIR}/www/mozilla
+RUN_DEPENDS?= mozilla:${PORTSDIR}/www/mozilla
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/Plugin
+PLUGIN_DIR?= lib/mozilla/plugins
+PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR}
do-install:
-.if exists(${X11BASE}/lib/mozilla)
- @${ECHO_MSG} "Installing flashplugin for mozilla"
- @${INSTALL_PROGRAM} ${WRKSRC}/npflash.so ${X11BASE}/lib/mozilla/plugins
-.endif
-.if exists(${X11BASE}/lib/mozilla-devel)
- @${ECHO_MSG} "Installing flashplugin for mozilla-devel"
- @${INSTALL_PROGRAM} ${WRKSRC}/npflash.so ${X11BASE}/lib/mozilla-devel/plugins
-.endif
+ @${INSTALL_PROGRAM} ${WRKSRC}/npflash.so ${X11BASE}/${PLUGIN_DIR}
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/flashplugin-mozilla/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 2 Nov 2001 13:58:55 -0000 1.1
+++ pkg-plist 24 Sep 2002 06:35:36 -0000
@@ -1 +1 @@
-lib/mozilla/plugins/npflash.so
+%%PLUGIN_DIR%%/npflash.so
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?878z1rsx8w.wl>