Date: Thu, 20 Feb 2003 01:31:25 +0900 (JST) From: Yoichi ASAI <yatt@luna2.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: yatt@msc.biglobe.ne.jp, yatt@luna2.org Subject: ports/48462: Update port: Correction to port/48460 (japanese/mozilla-jlp-devel) Message-ID: <200302191631.h1JGVPcW001080@nayuki.home>
next in thread | raw e-mail | index | archive | help
>Number: 48462 >Category: ports >Synopsis: Update port: Correction to port/48460 (japanese/mozilla-jlp-devel) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 19 08:40:11 PST 2003 >Closed-Date: >Last-Modified: >Originator: Yoichi ASAI >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD nayuki.home 4.7-STABLE FreeBSD 4.7-STABLE #0: Mon Feb 10 03:26:56 JST 2003 root@nayuki.home:/usr/obj/usr/src/sys/NAYUKI i386 >Description: Sorry, I made a mistake to create diff. please close ports/48460, and use this patch. >How-To-Repeat: >Fix: diff -urN mozilla-jlp-devel.orig/Makefile mozilla-jlp-devel/Makefile --- mozilla-jlp-devel.orig/Makefile Mon Jan 27 02:38:08 2003 +++ mozilla-jlp-devel/Makefile Sun Feb 16 01:46:03 2003 @@ -6,20 +6,20 @@ # PORTNAME= mozilla -PORTVERSION= 1.3a +PORTVERSION= 1.3b PORTREVISION?= 0 #PORTEPOCH= 1 CATEGORIES= japanese www MASTER_SITES= http://plaza25.mbn.or.jp/~snip/jlp/ #MASTER_SITE_SUBDIR= jlpmoz PKGNAMESUFFIX= -jlp -DISTNAME= ${PORTNAME}${PORTVERSION}-jajppack-tm0.1.3 +DISTNAME= ${PORTNAME}${PORTVERSION}-jajppack-tm0.2 EXTRACT_SUFX= .xpi MAINTAINER= yatt@luna2.org -BUILD_DEPENDS= ${X11BASE}/lib/mozilla-devel/regxpcom:${PORTSDIR}/www/mozilla-devel -RUN_DEPENDS= mozilla-devel:${PORTSDIR}/www/mozilla-devel \ +BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/regxpcom:${PORTSDIR}/www/${MOZILLA} +RUN_DEPENDS= ${MOZILLA}:${PORTSDIR}/www/${MOZILLA} \ ${PKG_DBDIR}/ja-alias-fonts-1.0:${PORTSDIR}/japanese/alias-fonts WRKSRC= ${WRKDIR}/bin @@ -29,6 +29,9 @@ USE_ZIP= yes EXTRACT_BEFORE_ARGS= -qo +MOZILLA= mozilla-devel +PLIST_SUB= MOZILLA=${MOZILLA} + .include <bsd.port.pre.mk> .if ${OSVERSION} >= 450002 @@ -45,31 +48,32 @@ ${CP} ${FILESDIR}/unix.js ${WRKSRC}/defaults/pref do-build: - ${SED} -e "s^@PREFIX@^${PREFIX}^g" \ - -e "s^@LOCALENAME@^${LOCALENAME}^g" \ - -e "s^@LIBXPG4@^${LIBXPG4}^g" \ - ${FILESDIR}/mozilla.sh > ${WRKDIR}/mozilla-devel + ${SED} -e "s^%%PREFIX%%^${PREFIX}^g" \ + -e "s^%%LOCALENAME%%^${LOCALENAME}^g" \ + -e "s^%%LIBXPG4%%^${LIBXPG4}^g" \ + -e "s^%%MOZILLA%%^${MOZILLA}^g" \ + ${FILESDIR}/mozilla.sh > ${WRKDIR}/${MOZILLA} do-install: - (cd ${PREFIX}/lib/mozilla-devel/chrome; \ + (cd ${PREFIX}/lib/${MOZILLA}/chrome; \ ${MV} -f chrome.rdf chrome.rdf.orig; \ ${MV} -f installed-chrome.txt installed-chrome.txt.orig) - (cd ${PREFIX}/lib/mozilla-devel/defaults/pref; \ + (cd ${PREFIX}/lib/${MOZILLA}/defaults/pref; \ ${MV} -f unix.js unix.js.orig) - (cd ${PREFIX}/lib/mozilla-devel/components; \ + (cd ${PREFIX}/lib/${MOZILLA}/components; \ ${MV} -f xpti.dat ../xpti.dat.orig) - ${MV} -f ${PREFIX}/bin/mozilla-devel ${PREFIX}/bin/mozilla-devel.orig - ${INSTALL_SCRIPT} ${WRKDIR}/mozilla-devel ${PREFIX}/bin + ${MV} -f ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/${MOZILLA}.orig + ${INSTALL_SCRIPT} ${WRKDIR}/${MOZILLA} ${PREFIX}/bin (cd ${WRKDIR}/sp; ${TAR} -cf - *) | \ - ${TAR} -xf - -C ${PREFIX}/lib/mozilla-devel/searchplugins + ${TAR} -xf - -C ${PREFIX}/lib/${MOZILLA}/searchplugins (cd ${WRKDIR}/sp_nomac; ${TAR} -cf - *) | \ - ${TAR} -xf - -C ${PREFIX}/lib/mozilla-devel/searchplugins + ${TAR} -xf - -C ${PREFIX}/lib/${MOZILLA}/searchplugins (cd ${WRKSRC}; ${TAR} -cf - chrome defaults) | \ - ${TAR} -xf - -C ${PREFIX}/lib/mozilla-devel - (cd ${PREFIX}/lib/mozilla-devel/chrome; \ + ${TAR} -xf - -C ${PREFIX}/lib/${MOZILLA} + (cd ${PREFIX}/lib/${MOZILLA}/chrome; \ ${CP} installed-chrome.txt.orig installed-chrome.txt; \ ${CAT} ${FILESDIR}/installed-chrome.txt >> installed-chrome.txt) - (cd ${PREFIX}/lib/mozilla-devel; \ + (cd ${PREFIX}/lib/${MOZILLA}; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome) @${CAT} ${PKGMESSAGE} diff -urN mozilla-jlp-devel.orig/distinfo mozilla-jlp-devel/distinfo --- mozilla-jlp-devel.orig/distinfo Sun Jan 26 22:49:33 2003 +++ mozilla-jlp-devel/distinfo Sun Feb 16 01:29:57 2003 @@ -1 +1 @@ -MD5 (mozilla1.3a-jajppack-tm0.1.3.xpi) = 7b6371d93944ee80323f4329b86b48b0 +MD5 (mozilla1.3b-jajppack-tm0.2.xpi) = 8b27178c96e48a20eb92ad6a94421aa9 diff -urN mozilla-jlp-devel.orig/files/mozilla.sh mozilla-jlp-devel/files/mozilla.sh --- mozilla-jlp-devel.orig/files/mozilla.sh Tue Nov 19 19:28:26 2002 +++ mozilla-jlp-devel/files/mozilla.sh Sun Feb 16 01:45:10 2003 @@ -1,7 +1,30 @@ #!/bin/sh -LANG=@LOCALENAME@; export LANG -@LIBXPG4@ +LANG=%%LOCALENAME%%; export LANG +%%LIBXPG4%% + +MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%" +MOZILLA_EXEC="mozilla" +LOCATION='new-tab' + +cd $MOZILLA_DIR || exit 1 + +case $1 in + -mail) + REMOTE_COMMAND="xfeDoCommand (openInbox)" + ;; + -*) + exec ./$MOZILLA_EXEC "$@" + ;; + *) + REMOTE_COMMAND="openURL($@, $LOCATION)" + ;; +esac + +# process found +./$MOZILLA_EXEC -remote "ping()" && +./$MOZILLA_EXEC -remote "$REMOTE_COMMAND" && exit 0 + +# no existing process +exec ./$MOZILLA_EXEC "$@" -cd @PREFIX@/lib/mozilla-devel -exec ./mozilla "$@" diff -urN mozilla-jlp-devel.orig/pkg-plist mozilla-jlp-devel/pkg-plist --- mozilla-jlp-devel.orig/pkg-plist Sun Jan 26 22:49:33 2003 +++ mozilla-jlp-devel/pkg-plist Sun Feb 16 01:39:33 2003 @@ -1,85 +1,85 @@ -@exec mv %D/bin/mozilla-devel %D/bin/mozilla-devel.orig -@exec mv %D/lib/mozilla-devel/chrome/chrome.rdf %D/lib/mozilla-devel/chrome/chrome.rdf.orig -@exec mv %D/lib/mozilla-devel/chrome/installed-chrome.txt %D/lib/mozilla-devel/chrome/installed-chrome.txt.orig -@exec mv %D/lib/mozilla-devel/defaults/pref/unix.js %D/lib/mozilla-devel/defaults/pref/unix.js.orig -@exec mv %D/lib/mozilla-devel/components/xpti.dat %D/lib/mozilla-devel/xpti.dat.orig -bin/mozilla-devel -lib/mozilla-devel/chrome/JP.jar -lib/mozilla-devel/chrome/chrome.rdf -lib/mozilla-devel/chrome/installed-chrome.txt -lib/mozilla-devel/chrome/ja-JP.jar -lib/mozilla-devel/chrome/ja-mac.jar -lib/mozilla-devel/chrome/ja-unix.jar -lib/mozilla-devel/chrome/ja-win.jar -lib/mozilla-devel/components/xpti.dat -lib/mozilla-devel/defaults/pref/unix.js -lib/mozilla-devel/defaults/profile/JP/chrome/userChrome-example.css -lib/mozilla-devel/defaults/profile/JP/chrome/userContent-example.css -lib/mozilla-devel/defaults/profile/JP/bookmarks.html -lib/mozilla-devel/defaults/profile/JP/localstore.rdf -lib/mozilla-devel/defaults/profile/JP/mimeTypes.rdf -lib/mozilla-devel/defaults/profile/JP/panels.rdf -lib/mozilla-devel/defaults/profile/JP/search.rdf -lib/mozilla-devel/searchplugins/AllAboutJapan.png -lib/mozilla-devel/searchplugins/AllAboutJapan.src -lib/mozilla-devel/searchplugins/BiglobeSearch.png -lib/mozilla-devel/searchplugins/BiglobeSearch.src -lib/mozilla-devel/searchplugins/Bugzilla-Summary.png -lib/mozilla-devel/searchplugins/Bugzilla-Summary.src -lib/mozilla-devel/searchplugins/Bugzilla-jp-Summary.png -lib/mozilla-devel/searchplugins/Bugzilla-jp-Summary.src -lib/mozilla-devel/searchplugins/CNETJapan.png -lib/mozilla-devel/searchplugins/CNETJapan.src -lib/mozilla-devel/searchplugins/ExciteJapan.png -lib/mozilla-devel/searchplugins/ExciteJapan.src -lib/mozilla-devel/searchplugins/Fresheye_Japan.gif -lib/mozilla-devel/searchplugins/Fresheye_Japan.src -lib/mozilla-devel/searchplugins/GooNeJp.png -lib/mozilla-devel/searchplugins/GooNeJp.src -lib/mozilla-devel/searchplugins/GoogleJapan.png -lib/mozilla-devel/searchplugins/GoogleJapan.src -lib/mozilla-devel/searchplugins/ImpressWatchJp.png -lib/mozilla-devel/searchplugins/ImpressWatchJp.src -lib/mozilla-devel/searchplugins/InfoseekJapan.png -lib/mozilla-devel/searchplugins/InfoseekJapan.src -lib/mozilla-devel/searchplugins/JavaHouse.png -lib/mozilla-devel/searchplugins/JavaHouse.src -lib/mozilla-devel/searchplugins/LYCOSJapan.png -lib/mozilla-devel/searchplugins/LYCOSJapan.src -lib/mozilla-devel/searchplugins/LYCOSJapan_auction.png -lib/mozilla-devel/searchplugins/LYCOSJapan_auction.src -lib/mozilla-devel/searchplugins/MozillaGrJp.png -lib/mozilla-devel/searchplugins/MozillaGrJp.src -lib/mozilla-devel/searchplugins/MycomPcWeb.png -lib/mozilla-devel/searchplugins/MycomPcWeb.src -lib/mozilla-devel/searchplugins/NikkeiJava.png -lib/mozilla-devel/searchplugins/NikkeiJava.src -lib/mozilla-devel/searchplugins/NikkeiLinux.png -lib/mozilla-devel/searchplugins/NikkeiLinux.src -lib/mozilla-devel/searchplugins/YahooJapan.png -lib/mozilla-devel/searchplugins/YahooJapan.src -lib/mozilla-devel/searchplugins/YahooJapan_auction.png -lib/mozilla-devel/searchplugins/YahooJapan_auction.src -lib/mozilla-devel/searchplugins/ascii_24.png -lib/mozilla-devel/searchplugins/ascii_24.src -lib/mozilla-devel/searchplugins/ascii_ghelp.png -lib/mozilla-devel/searchplugins/ascii_ghelp.src -lib/mozilla-devel/searchplugins/atmarkIT.png -lib/mozilla-devel/searchplugins/atmarkIT.src -lib/mozilla-devel/searchplugins/jpnic_rfc.png -lib/mozilla-devel/searchplugins/jpnic_rfc.src -lib/mozilla-devel/searchplugins/linux_24.png -lib/mozilla-devel/searchplugins/linux_24.src -lib/mozilla-devel/searchplugins/linux_JFJM.png -lib/mozilla-devel/searchplugins/linux_JFJM.src -lib/mozilla-devel/searchplugins/rakuten_auction.png -lib/mozilla-devel/searchplugins/rakuten_auction.src -lib/mozilla-devel/searchplugins/w3c.png -lib/mozilla-devel/searchplugins/w3c.src -@unexec mv %D/bin/mozilla-devel.orig %D/bin/mozilla-devel -@unexec mv %D/lib/mozilla-devel/chrome/chrome.rdf.orig %D/lib/mozilla-devel/chrome/chrome.rdf -@unexec mv %D/lib/mozilla-devel/chrome/installed-chrome.txt.orig %D/lib/mozilla-devel/chrome/installed-chrome.txt -@unexec mv %D/lib/mozilla-devel/defaults/pref/unix.js.orig %D/lib/mozilla-devel/defaults/pref/unix.js -@unexec mv %D/lib/mozilla-devel/xpti.dat.orig %D/lib/mozilla-devel/components/xpti.dat -@dirrm lib/mozilla-devel/defaults/profile/JP/chrome -@dirrm lib/mozilla-devel/defaults/profile/JP +@exec mv %D/bin/%%MOZILLA%% %D/bin/%%MOZILLA%%.orig +@exec mv %D/lib/%%MOZILLA%%/chrome/chrome.rdf %D/lib/%%MOZILLA%%/chrome/chrome.rdf.orig +@exec mv %D/lib/%%MOZILLA%%/chrome/installed-chrome.txt %D/lib/%%MOZILLA%%/chrome/installed-chrome.txt.orig +@exec mv %D/lib/%%MOZILLA%%/defaults/pref/unix.js %D/lib/%%MOZILLA%%/defaults/pref/unix.js.orig +@exec mv %D/lib/%%MOZILLA%%/components/xpti.dat %D/lib/%%MOZILLA%%/xpti.dat.orig +bin/%%MOZILLA%% +lib/%%MOZILLA%%/chrome/JP.jar +lib/%%MOZILLA%%/chrome/chrome.rdf +lib/%%MOZILLA%%/chrome/installed-chrome.txt +lib/%%MOZILLA%%/chrome/ja-JP.jar +lib/%%MOZILLA%%/chrome/ja-mac.jar +lib/%%MOZILLA%%/chrome/ja-unix.jar +lib/%%MOZILLA%%/chrome/ja-win.jar +lib/%%MOZILLA%%/components/xpti.dat +lib/%%MOZILLA%%/defaults/pref/unix.js +lib/%%MOZILLA%%/defaults/profile/JP/chrome/userChrome-example.css +lib/%%MOZILLA%%/defaults/profile/JP/chrome/userContent-example.css +lib/%%MOZILLA%%/defaults/profile/JP/bookmarks.html +lib/%%MOZILLA%%/defaults/profile/JP/localstore.rdf +lib/%%MOZILLA%%/defaults/profile/JP/mimeTypes.rdf +lib/%%MOZILLA%%/defaults/profile/JP/panels.rdf +lib/%%MOZILLA%%/defaults/profile/JP/search.rdf +lib/%%MOZILLA%%/searchplugins/AllAboutJapan.png +lib/%%MOZILLA%%/searchplugins/AllAboutJapan.src +lib/%%MOZILLA%%/searchplugins/BiglobeSearch.png +lib/%%MOZILLA%%/searchplugins/BiglobeSearch.src +lib/%%MOZILLA%%/searchplugins/Bugzilla-Summary.png +lib/%%MOZILLA%%/searchplugins/Bugzilla-Summary.src +lib/%%MOZILLA%%/searchplugins/Bugzilla-jp-Summary.png +lib/%%MOZILLA%%/searchplugins/Bugzilla-jp-Summary.src +lib/%%MOZILLA%%/searchplugins/CNETJapan.png +lib/%%MOZILLA%%/searchplugins/CNETJapan.src +lib/%%MOZILLA%%/searchplugins/ExciteJapan.png +lib/%%MOZILLA%%/searchplugins/ExciteJapan.src +lib/%%MOZILLA%%/searchplugins/Fresheye_Japan.gif +lib/%%MOZILLA%%/searchplugins/Fresheye_Japan.src +lib/%%MOZILLA%%/searchplugins/GooNeJp.png +lib/%%MOZILLA%%/searchplugins/GooNeJp.src +lib/%%MOZILLA%%/searchplugins/GoogleJapan.png +lib/%%MOZILLA%%/searchplugins/GoogleJapan.src +lib/%%MOZILLA%%/searchplugins/ImpressWatchJp.png +lib/%%MOZILLA%%/searchplugins/ImpressWatchJp.src +lib/%%MOZILLA%%/searchplugins/InfoseekJapan.png +lib/%%MOZILLA%%/searchplugins/InfoseekJapan.src +lib/%%MOZILLA%%/searchplugins/JavaHouse.png +lib/%%MOZILLA%%/searchplugins/JavaHouse.src +lib/%%MOZILLA%%/searchplugins/LYCOSJapan.png +lib/%%MOZILLA%%/searchplugins/LYCOSJapan.src +lib/%%MOZILLA%%/searchplugins/LYCOSJapan_auction.png +lib/%%MOZILLA%%/searchplugins/LYCOSJapan_auction.src +lib/%%MOZILLA%%/searchplugins/MozillaGrJp.png +lib/%%MOZILLA%%/searchplugins/MozillaGrJp.src +lib/%%MOZILLA%%/searchplugins/MycomPcWeb.png +lib/%%MOZILLA%%/searchplugins/MycomPcWeb.src +lib/%%MOZILLA%%/searchplugins/NikkeiJava.png +lib/%%MOZILLA%%/searchplugins/NikkeiJava.src +lib/%%MOZILLA%%/searchplugins/NikkeiLinux.png +lib/%%MOZILLA%%/searchplugins/NikkeiLinux.src +lib/%%MOZILLA%%/searchplugins/YahooJapan.png +lib/%%MOZILLA%%/searchplugins/YahooJapan.src +lib/%%MOZILLA%%/searchplugins/YahooJapan_auction.png +lib/%%MOZILLA%%/searchplugins/YahooJapan_auction.src +lib/%%MOZILLA%%/searchplugins/ascii_24.png +lib/%%MOZILLA%%/searchplugins/ascii_24.src +lib/%%MOZILLA%%/searchplugins/ascii_ghelp.png +lib/%%MOZILLA%%/searchplugins/ascii_ghelp.src +lib/%%MOZILLA%%/searchplugins/atmarkIT.png +lib/%%MOZILLA%%/searchplugins/atmarkIT.src +lib/%%MOZILLA%%/searchplugins/jpnic_rfc.png +lib/%%MOZILLA%%/searchplugins/jpnic_rfc.src +lib/%%MOZILLA%%/searchplugins/linux_24.png +lib/%%MOZILLA%%/searchplugins/linux_24.src +lib/%%MOZILLA%%/searchplugins/linux_JFJM.png +lib/%%MOZILLA%%/searchplugins/linux_JFJM.src +lib/%%MOZILLA%%/searchplugins/rakuten_auction.png +lib/%%MOZILLA%%/searchplugins/rakuten_auction.src +lib/%%MOZILLA%%/searchplugins/w3c.png +lib/%%MOZILLA%%/searchplugins/w3c.src +@unexec mv %D/bin/%%MOZILLA%%.orig %D/bin/%%MOZILLA%% +@unexec mv %D/lib/%%MOZILLA%%/chrome/chrome.rdf.orig %D/lib/%%MOZILLA%%/chrome/chrome.rdf +@unexec mv %D/lib/%%MOZILLA%%/chrome/installed-chrome.txt.orig %D/lib/%%MOZILLA%%/chrome/installed-chrome.txt +@unexec mv %D/lib/%%MOZILLA%%/defaults/pref/unix.js.orig %D/lib/%%MOZILLA%%/defaults/pref/unix.js +@unexec mv %D/lib/%%MOZILLA%%/xpti.dat.orig %D/lib/%%MOZILLA%%/components/xpti.dat +@dirrm lib/%%MOZILLA%%/defaults/profile/JP/chrome +@dirrm lib/%%MOZILLA%%/defaults/profile/JP >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302191631.h1JGVPcW001080>