upgrade to a "universal" version

PR:		46033, 46048
Submitted by:	maintainer

5 files changed, 74 insertions, 9 deletions

diff --git a/chinese/mozilla-tclp/Makefile b/chinese/mozilla-tclp/Makefile
index b6bc90b3d05d..afd2070b1430 100644
--- a/chinese/mozilla-tclp/Makefile
+++ b/chinese/mozilla-tclp/Makefile
@@ -4,24 +4,39 @@
 #
 # $FreeBSD$
 #
+# This is a rewritten 'universal' version port Makefile.
+# Port version 'x.Uy' stands for Mozilla version x.*, edition y
+# We will detect the Mozilla you installed and try to fetch correct
+# version of language pack.
+#
+# Just install your favorite Mozilla first ( ports/www/mozilla/ or
+# ports/www/mozilla-devel/ or ports/www/mozilla-vendor ) and then
+# install mozilla-tclp. The language pack installed will match your
+# Mozilla installation. But remember that if you upgrade your Mozilla,
+# you have to come and reinstall mozilla-tclp again.
+#
 # If this version is out-of-date, please visit 
-#    http://www.csie.ntu.edu.tw/~b7506051/mozilla/
+#    http://www.csie.ntu.edu.tw/~b7506051/mozilla/download.html
 # And just download and install there.
-# Or, change the PORTVERSION below to feasible version and make makesum all
+#
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0.1
+PORTVERSION=	1.U
+PORTEPOCH=	1
 CATEGORIES=	chinese www
 MASTER_SITES=	http://www.csie.ntu.edu.tw/~b7506051/mozilla/langpack/distfiles/
-PKGNAMESUFFIX=	-tclp
 # Same as ftp://ftp.mozilla.org/pub/mozilla/l10n/lang/$MOZVER/langzhtw.xpi.
 # Use this to avoid checksum problems.
-DISTNAME=	${PORTNAME}-langzhtw-${PORTVERSION}
+PKGNAMESUFFIX=	-tclp
+DISTNAME=	${PORTNAME}-langzhtw-${MOZRV}
 EXTRACT_SUFX=	.xpi
+#NO_CHECKSUM=	YES
+#IGNOREFILES=	${PORTNAME}-langzhtw-${MOZRV}${EXTRACT_SUFX}
 
 MAINTAINER=	piaip@csie.ntu.edu.tw
 
-BUILD_DEPENDS=	${X11BASE}/lib/mozilla/regxpcom:${PORTSDIR}/www/mozilla
+FETCH_DEPENDS=	${PREFIX}/lib/mozilla/mozilla:${PORTSDIR}/www/mozilla
+BUILD_DEPENDS=	${PREFIX}/lib/mozilla/regxpcom:${PORTSDIR}/www/mozilla
 RUN_DEPENDS=	mozilla:${PORTSDIR}/www/mozilla
 
 WRKSRC=		${WRKDIR}/bin
@@ -30,6 +45,8 @@ USE_X_PREFIX=	yes
 USE_ZIP=	yes
 EXTRACT_BEFORE_ARGS=	-qo
 
+MOZRV=		`${SH} ${FILESDIR}/mozver ${SED} ${PREFIX}/lib/mozilla/mozilla`
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 400020
@@ -38,12 +55,30 @@ MOZILLA_SH=	mozilla.noxpg4
 MOZILLA_SH=	mozilla.xpg4
 .endif
 
+pre-fetch:
+	@${ECHO_MSG} "=======================================================>"
+	@${ECHO_MSG} "Detecting your Mozilla revision... "
+	@${ECHO_MSG} "Revision=${MOZRV}"
+	@${ECHO_MSG} "We are going to fetch language pack for this revision."
+	@${ECHO_MSG} "* If you see incorrect revision in the Revision message,"
+	@${ECHO_MSG} "  please upgrade or update your Mozilla installation."
+	@${ECHO_MSG} "* If you see error messages of 'Error code 1' like "
+	@${ECHO_MSG} "  'distinfo is out of date' or 'spelled incorrectly',"
+	@${ECHO_MSG} "  you may try to 'make NO_CHECKSUM=yes'"
+	@${ECHO_MSG} "* If you then got 'file not found' on MASTERSITE, that"
+	@${ECHO_MSG} "  means you've installed a newer or unsupported revision"
+	@${ECHO_MSG} "  of Mozilla that doesn't have any language packs (yet)."
+	@${ECHO_MSG} "=======================================================<"
+
 post-extract:
 	${MKDIR} ${WRKSRC}/defaults/pref
 	${CP} ${FILESDIR}/unix.js ${WRKSRC}/defaults/pref/.
 	${CP} ${FILESDIR}/user.js ${WRKSRC}/defaults/profile/.
 	${CP} ${FILESDIR}/user.js ${WRKSRC}/defaults/profile/TW/.
-	${CHMOD} -R a+rX ${WRKSRC}
+	# fix up file permission if broken
+	${FIND} ${WRKSRC} -type f -exec ${CHMOD} a+r-x {} \;
+	${FIND} ${WRKSRC} -type d -exec ${CHMOD} a+r+x {} \;
+	#${CHMOD} -R a+rX ${WRKSRC}
 
 do-build:
 	${SED} -e "s;@PREFIX@;${PREFIX};g" \
@@ -55,6 +90,7 @@ do-install:
 	(cd ${PREFIX}/lib/mozilla; \
 	${SETENV} HOME=/tmp LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
 	${SETENV} HOME=/tmp LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
+	# backing up
 	(cd ${PREFIX}/lib/mozilla/chrome; \
 	${MV} -f chrome.rdf chrome.rdf.orig; \
 	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
@@ -64,12 +100,14 @@ do-install:
 	${MV} -f google.gif google.gif.orig; \
 	${MV} -f google.src google.src.orig)
 	${MV} -f ${PREFIX}/bin/mozilla ${PREFIX}/bin/mozilla.orig
+	# start installation
 	${INSTALL_SCRIPT} ${WRKDIR}/mozilla ${PREFIX}/bin
-	(cd ${WRKSRC}; ${TAR} -cf - chrome defaults searchplugins res) | \
+	(cd ${WRKSRC}; ${TAR} -cf - chrome defaults searchplugins) | \
 	${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)
+	# finalize chrome registeration
 	(cd ${PREFIX}/lib/mozilla; \
 	${SETENV} HOME=/tmp LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
 	${SETENV} HOME=/tmp LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
diff --git a/chinese/mozilla-tclp/distinfo b/chinese/mozilla-tclp/distinfo
index 27ae710764d7..3a14e775dbf2 100644
--- a/chinese/mozilla-tclp/distinfo
+++ b/chinese/mozilla-tclp/distinfo
@@ -1 +1,20 @@
-MD5 (mozilla-langzhtw-1.0.1.xpi) = bcfb9ff05208a032416ca3f99334f6ac
+MD5 (mozilla-langzhtw-0.7.0.xpi) = cbbaaec3e1978b180d1c71f4e175db30
+MD5 (mozilla-langzhtw-0.8.0.xpi) = 1233c57a4422358f287342e9da18b6da
+MD5 (mozilla-langzhtw-0.8.1.xpi) = 1205e72fae7af2954f8417e9dc6d8d62
+MD5 (mozilla-langzhtw-0.9.1.xpi) = ab68f2518c4ffcb5d45e9a276ec46680
+MD5 (mozilla-langzhtw-0.9.4.xpi) = d7d83fc47e7bab321d70417dcbad5bcb
+MD5 (mozilla-langzhtw-0.9.5.xpi) = 3561fed7e28651dd4bdabc1fccc2307c
+MD5 (mozilla-langzhtw-0.9.6.xpi) = 837ac3f6807d49dde25676cf7d6e6bd6
+MD5 (mozilla-langzhtw-0.9.8.xpi) = 09c3f5600745b35a6f7387b3d755eb9f
+MD5 (mozilla-langzhtw-0.9.9.xpi) = d2da9362f9cdb15287412abbbd4b40c2
+MD5 (mozilla-langzhtw-1.0.0rc2.xpi) = cb324ce7a5944ee2945dbe08d5aec2b9
+MD5 (mozilla-langzhtw-1.0.0rc3.xpi) = 326157fc3b1de063b61a1007cc809a22
+MD5 (mozilla-langzhtw-1.0.1.xpi) = 483fbe1f8a431ef407809706550bcef5
+MD5 (mozilla-langzhtw-1.0.xpi) = d0ce14b60fa524ad72f709f7e5be1493
+MD5 (mozilla-langzhtw-1.1.xpi) = c043c3bb7ada9dcd612edf574a19f0dd
+MD5 (mozilla-langzhtw-1.2.1.xpi) = d35e9989c6e493e7a4994be983635db3
+MD5 (mozilla-langzhtw-1.2.xpi) = ecacdf24d0e7be9bc85f4bf0a0b32a11
+MD5 (mozilla-langzhtw-1.2b.xpi) = 82443e8dbf9e05ded9016656b7349298
+MD5 (mozilla-langzhtw-N.6.0.xpi) = f32fb39741926a9d2f7020f3d932f8e6
+MD5 (mozilla-langzhtw-N.6.2.xpi) = 0474bc72fe570028428e6911ba1b7117
+MD5 (mozilla-langzhtw-N7PR1.xpi) = 8273ecfc8231dfb153f40db8cb48f178
diff --git a/chinese/mozilla-tclp/files/mozver b/chinese/mozilla-tclp/files/mozver
new file mode 100644
index 000000000000..9835c740cb02
--- /dev/null
+++ b/chinese/mozilla-tclp/files/mozver
@@ -0,0 +1,3 @@
+#!/bin/sh
+# this script is used to detect Mozilla revision only.
+$2 -v | $1 's/.*rv://; s/).*//'
diff --git a/chinese/mozilla-tclp/pkg-message b/chinese/mozilla-tclp/pkg-message
index 33687c02d610..9077b6c32533 100644
--- a/chinese/mozilla-tclp/pkg-message
+++ b/chinese/mozilla-tclp/pkg-message
@@ -6,3 +6,6 @@ Edit the file "${HOME}/.mozilla/${USER}/*.slt/user.js" (per user)
 If need printing, go /usr/ports/chinese/arphicttf to make WANT_GS=yes
 For detail: http://freebsd.sinica.edu.tw/~statue/zh-tut/web-browse.html
 ***********************************************************************
+After all, remember that mozilla-tclp highly depends on Mozilla. If you 
+     upgrade Mozilla, remember to reinstall mozilla-tclp. It will
+     try to automatically detect and match your Mozilla version.
diff --git a/chinese/mozilla-tclp/pkg-plist b/chinese/mozilla-tclp/pkg-plist
index e53bbbe619ba..b19a312a6a40 100644
--- a/chinese/mozilla-tclp/pkg-plist
+++ b/chinese/mozilla-tclp/pkg-plist
@@ -31,6 +31,8 @@ lib/mozilla/searchplugins/google_en.gif
 lib/mozilla/searchplugins/google_en.src
 lib/mozilla/searchplugins/google_tw.gif
 lib/mozilla/searchplugins/google_tw.src
+lib/mozilla/searchplugins/openfind.gif
+lib/mozilla/searchplugins/openfind.src
 @exec env HOME=/tmp LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
 @exec env HOME=/tmp LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
 @unexec mv %D/bin/mozilla.orig %D/bin/mozilla