Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Sep 2002 12:39:16 +0800 (CST)
From:      Li-lun Wang (Leland Wang) <llwang@infor.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        yoichi@ekens.phys.nagoya-u.ac.jp, ijliao@FreeBSD.org, daichi@jp.FreeBSD.org
Subject:   ports/43463: update port: www/flashplugin-mozilla (by maintainer)
Message-ID:  <20020929043916.D72DF9262@infor.ck.tp.edu.tw>

next in thread | raw e-mail | index | archive | help

>Number:         43463
>Category:       ports
>Synopsis:       update port: www/flashplugin-mozilla (by maintainer)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 28 21:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Li-lun Wang (Leland Wang)
>Release:        FreeBSD 4.6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD Athena.infor.org 4.6.2-RELEASE FreeBSD 4.6.2-RELEASE #0: Fri Sep 6 13:03:45 CST 2002 root@Athena.infor.org:/usr/obj/usr/src/sys/Athena i386


	
>Description:
Yoichi NAKAYAMA pointed out that the patch in ports/43135 cannot solve
the problem properly. I admit his suggestion in the patch supplied.
flashplugin-mozilla-devel should also be created.
ports/43172 is obsoleted and should be closed.

	
>How-To-Repeat:
	
>Fix:

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


# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#       flashplugin-mozilla-devel/Makefile
#
echo x - flashplugin-mozilla-devel/Makefile
sed 's/^X//' >flashplugin-mozilla-devel/Makefile << 'END-of-flashplugin-mozilla-devel/Makefile'
X# New ports collection makefile for:	flashplugin-mozilla-devel
X# Date created:				29 September 2002
X# Whom:					Leland Wang <llwang@infor.org>
X#
X# $FreeBSD$
X#
X
XPKGNAMESUFFIX=	devel
X
XRUN_DEPENDS=	mozilla:${PORTSDIR}/www/mozilla-devel
X
XPLUGIN_DIR=	lib/mozilla-devel/plugins
XMASTERDIR=	${.CURDIR}/../flashplugin-mozilla
X
X.include "${MASTERDIR}/Makefile"
END-of-flashplugin-mozilla-devel/Makefile
exit


	


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020929043916.D72DF9262>