Upgrade to 4.7.

NOTE: Now we couldn't use Fortify with Netscape 4.7s.
svn path=/head/; revision=22165
1999-10-04 22:21:38 +00:00 · 1999-10-04 22:21:38 +00:00 · 2c1d4b4e9e · 2021-03-31 03:12:20 +00:00
commit 2c1d4b4e9e
parent 86c9ecef2d
21 changed files with 193 additions and 70 deletions
--- a/japanese/Makefile
+++ b/japanese/Makefile
@ -151,6 +151,8 @@
    SUBDIR += netscape4-navigator
    SUBDIR += netscape46-communicator
    SUBDIR += netscape46-navigator
+    SUBDIR += netscape47-communicator
+    SUBDIR += netscape47-navigator
    SUBDIR += newosaka
    SUBDIR += ng
    SUBDIR += ng-canna
--- a/japanese/netscape47-communicator/Makefile
+++ b/japanese/netscape47-communicator/Makefile
@ -1,22 +1,20 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.6*
+# Version required:	4.7
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
 # $FreeBSD$
 #

+RUN_DEPENDS=	${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape47-${BROWSER}
+
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
+FILESDIR=	${.CURDIR}/../netscape47-communicator/files
+PATCHDIR=	${.CURDIR}/../netscape47-communicator/patches
+PKGDIR=		${.CURDIR}/../netscape47-communicator/pkg

-MAINTAINER=	sada@FreeBSD.org
-
-RUN_DEPENDS=	${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape46-${BROWSER}
-
-FILESDIR=	${.CURDIR}/../netscape46-communicator/files
-PATCHDIR=	${.CURDIR}/../netscape46-communicator/patches
-
-BROWSER_CMD=	ja-${BROWSER}-46
-BROWSER_VERSION=	4.61
+BROWSER_CMD=	ja-${BROWSER}-47
+BROWSER_VERSION=	4.7
 JAPANIZE_KIT=	communicator-ja-euc-v461-export.generic-generic-generic.tar.gz
 NETHELP=	nethelp-v451

--- a/japanese/netscape47-communicator/files/patch-aa
+++ b/japanese/netscape47-communicator/files/patch-aa
@ -1,5 +1,12 @@
--- Netscape.ad-ja_euc.orig	Fri Jul 23 19:14:48 1999
-+++ Netscape.ad-ja_euc	Fri Jul 23 19:15:19 1999
+--- Netscape.ad-ja_euc.orig	Sun Oct  3 07:11:33 1999
+++ Netscape.ad-ja_euc	Sun Oct  3 07:02:48 1999
+@@ -1,5 +1,5 @@
+ ! Insert copyright and license here 1994
+-! Netscape.ad --- app-defaults file for Netscape 4.61.
+! Netscape.ad --- app-defaults file for Netscape 4.7.
+ !
+ ! Bugs and commentary to x_cbug@netscape.com.
+ ! Created: Jamie Zawinski <use the bug address, please>, 23-Jun-94.
@@ -42,8 +42,11 @@
 ! complaints from people who think they understand this stuff better than
 ! I do.
@ -51,7 +58,16 @@
 
 ! This resource may be used to specify a default background image.  It should
 ! be a file name or URL pointing to a GIF, JPEG, or XBM image.  If it is blank,
-@@ -827,7 +830,15 @@
+@@ -441,6 +444,8 @@
+ 	 Alt ~Ctrl<Key>4:		xfeDoCommand(openCalendar)			\n\
+ 	Meta ~Ctrl<Key>5:		xfeDoCommand(openConference)		\n\
+ 	 Alt ~Ctrl<Key>5:		xfeDoCommand(openConference)		\n\
+	Meta ~Ctrl<Key>7:	xfeDoCommand(openRadio)				\n\
+	 Alt ~Ctrl<Key>7:	xfeDoCommand(openRadio)				\n\
+ 											\
+ 	~Meta ~Alt ~Ctrl<Key>Prior:		PageUp()					\n\
+ 	~Meta ~Alt ~Ctrl<Key>Next:		PageDown()					\n\
+@@ -827,7 +832,15 @@
 	<Btn2Motion>:			DisarmLinkIfMoved()		\n\
 	<Btn3Motion>:			DisarmLinkIfMoved()		\n\
 	<Motion>:			DescribeLink()			\n\
@ -68,7 +84,7 @@
 
 *drawingArea*XmList.highlightThickness:	2
 
-@@ -1107,6 +1118,12 @@
+@@ -1107,6 +1120,12 @@
 ! in which case they ought to apply to the text in that text field instead.
 ! Doesn't all this crap just make you want to hurl?
 *globalNonTextTranslations:		#override			\n\
@ -81,7 +97,18 @@
 	~Meta ~Alt ~Ctrl<Key>space:	xfeDoCommand(spacebar)		\n\
 									  \
 	~Meta ~Alt ~Ctrl<Key>Delete:	PageUp()			\n\
-@@ -2231,7 +2248,7 @@
+@@ -1304,8 +1323,8 @@
+ 	 Alt ~Ctrl<Key>4:		xfeDoCommand(openCalendar)			\n\
+ 	Meta ~Ctrl<Key>5:		xfeDoCommand(openConference)		\n\
+ 	 Alt ~Ctrl<Key>5:		xfeDoCommand(openConference)		\n\
+-	Meta ~Ctrl<Key>6:		xfeDoCommand(openCalendar)			\n\
+-	 Alt ~Ctrl<Key>6:		xfeDoCommand(openCalendar)			\n\
+	Meta ~Ctrl<Key>7:		xfeDoCommand(openRadio)			\n\
+	 Alt ~Ctrl<Key>7:		xfeDoCommand(openRadio)			\n\
+ 											\
+ 	~Meta ~Alt ~Ctrl<Key>Prior:		PageUp()					\n\
+ 	~Meta ~Alt ~Ctrl<Key>Next:		PageDown()					\n\
+@@ -2231,7 +2250,7 @@
 *decreaseFont.documentationString:	\
 このページの表示に使用するフォント サイズを小さくします。
 
@ -90,7 +117,29 @@
 *reload.mnemonic:					R
 *reload.acceleratorText:			Alt+R
 ! In mail and news reply to sender uses this accelerator
-@@ -4526,7 +4543,7 @@
+@@ -3197,6 +3216,12 @@
+ *openCalendar.documentationString:	\
+ 個人用カレンダー ウィンドウを開きます。
+ 
+*menuBar*openRadio.labelString:		Radio
+*menuBar*openRadio.mnemonic:		d
+*menuBar*openRadio.acceleratorText:	Alt+7
+*openRadio.documentationString:		\
+ラジオプレーヤーを開きます。
+
+ *menuBar*toggleTaskbarShowing.labelString:	コンポーネント バー
+ *menuBar*toggleTaskbarShowing.mnemonic:	C
+ *toggleTaskbarShowing.documentationString:	\
+@@ -4488,7 +4513,7 @@
+ ! changed at runtime; these resources won't override that.
+ *title:					Netscape
+ *iconName:				Netscape
+-*Navigator.title:			Netscape Navigator 4.61
+*Navigator.title:			Netscape Navigator 4.7
+ *MailThread.title:			Netscape メール & ニュースグループ
+ *MailThread.iconName:		メール & ニュースグループ
+ 
+@@ -4526,7 +4551,7 @@
 !                                       ------------------------
 ! back
 ! forward
@ -99,7 +148,7 @@
 *reloadWithFrameCmdString:				フレームの再読み込み(R)
 *popup.frameReload.mnemonic:			 R
 *popup.showImage.labelString:			画像の表示(G)
-@@ -5047,6 +5064,8 @@
+@@ -5047,6 +5072,8 @@
 !*openURLDialog.width:				500
 *openURLDialog*openInEditor.labelString: Composer で開く
 *openURLDialog*openInBrowser.labelString: Navigator で開く
@ -108,7 +157,25 @@
 
 *message_popup.title:			Netscape
 *message_popup*OK.labelString:	OK
-@@ -6012,7 +6031,7 @@
+@@ -5416,7 +5443,7 @@
+ *drawingArea*XmScrolledWindow.spacing:			0
+ 
+ ! Do not under any circumstances change the following line:
+-Netscape.version: 		4.61
+Netscape.version: 		4.7
+ 
+ 
+ ! ============================================================================
+@@ -5942,6 +5969,8 @@
+ *destinations.documentationString:  パーソナルスタートページにジャンプします。
+ *guide.tipString:            インターネット上のおもしろい場所
+ *guide.documentationString:  インターネット上のおもしろい場所にジャンプします。
+*myshopping.tipString:			ショッピングのページにジャンプ
+*myshopping.documentationString:	ショッピングのページにジャンプします。
+ *showImages.tipString:              ページの画像を表示
+ *reload.tipString:                  サーバからページをもう一度読み込む
+ *stopLoading.tipString:             実行中の転送を中断
+@@ -6012,7 +6041,7 @@
 
 
 *urlLocationLabel.netsiteLabelString:		Netsite:
@ -117,7 +184,15 @@
 *urlLocationLabel.editedLabelString:		ジャンプ:
 
 ! this must be the longer of the two...
-@@ -6423,10 +6442,10 @@
+@@ -6304,6 +6333,7 @@
+ *prefs*appearance*conference.labelString:	Conference
+ *prefs*appearance*netcaster.labelString:	Netcaster
+ *prefs*appearance*calendar.labelString:	Calendar
+*prefs*appearance*radio.labelString:	Radio
+ *prefs*appearance*frame2*toolbarBoxLabel.labelString:	ツールバーの表示
+ *prefs*appearance*frame2*picAndText.labelString:	絵と文字
+ *prefs*appearance*frame2*picOnly.labelString:		絵
+@@ -6423,10 +6453,10 @@
 
 *prefs*cache*cacheLabel.labelString:		\
 キャッシュは頻繁にアクセスされるドキュメントをコピーしておくことで、\n\
@ -130,7 +205,7 @@
 ボタンをクリックします。
 *prefs*cache*cacheDirLabel.labelString:		キャッシュフォルダ:
 *prefs*cache*memoryLabel.labelString:		メモリ キャッシュ:
-@@ -6455,7 +6474,7 @@
+@@ -6455,7 +6485,7 @@
 *prefs*proxies*auto.labelString:			自動プロキシ設定
 *prefs*proxies*config.labelString:			設定ファイルの場所 (URL)
 *prefs*proxies*view.labelString:			表示...
@ -139,7 +214,14 @@
 
 ! Preferences dialog - General - Proxies - View
 
-@@ -7410,7 +7429,7 @@
+@@ -7404,13 +7434,14 @@
+ *toolBar*search.labelString:	検索
+ *toolBar*destinations.labelString:	Netscape
+ *toolBar*guide.labelString:	ガイド
+*toolBar*myshopping.labelString:	買物
+ *toolBar*showImages.labelString:	画像
+ *toolBar*loadImages.labelString:	画像の読み込み
+ *toolBar*print.labelString:	印刷
 *print.tipString:                   このページを印刷
 *MailThread*print.tipString:        選択したメッセージを印刷
 *MailMsg*print.tipString:           選択したメッセージを印刷
@ -148,7 +230,7 @@
 
 ! buttons specific to the compose frame.
 *toolBar*sendMessageNow.labelString:	送信
-@@ -7464,7 +7483,7 @@
+@@ -7464,7 +7495,7 @@
 *bccBtn.documentationString:          メッセージを作成してブラインドカーボン コピーを選択した項目宛に送信します
 !
 ! buttons used everywhere (it seems.)
@ -157,7 +239,25 @@
 *toolBar*stopLoading.labelString:	停止
 
 *changeDocumentEncoding.documentationString: ドキュメントの文字コード セットを指定します。
-@@ -9000,7 +9019,7 @@
+@@ -7975,6 +8006,8 @@
+ 
+ *string .6776: (名前が指定されていません)
+ 
+*string .6775:	ユーザにより中断されました。
+
+ *strings.6764:データの送信中にネットワーク エラーが発生\nしました。\n(ネットワーク エラー: %s)\n\nもう一度接続してみてください。
+ 
+ *strings.6771:メールの送信中にエラーが発生しました:\nSMTP サーバに接続することができませんでした。\nサーバがダウンしているか、設定に誤りがあるようです。\n\nメールの設定に誤りがないか確認して、もう一度\nやり直してください。
+@@ -8243,6 +8276,8 @@
+ 
+ *strings.6524:メッセージの送信処理は完了しましたが、送信済みフォルダに\nメッセージをコピーすることができませんでした。メッセージ\nの作成ウィンドウに戻りますか？
+ 
+*strings.6523:文字「%s」はIMAPサーバで予約されています。別の名前を選んでください。
+
+ *strings.-1192:セキュリティの認証中に I/O エラーが発生しました。\n接続し直してみてください。
+ 
+ *strings.-1191:セキュリティ ライブラリでエラーが発生しました。\nサイトとの接続を保護できないかもしれません。
+@@ -9000,7 +9035,7 @@
 
 *strings.23715:新規/編集 ...
 
@ -166,7 +266,18 @@
 
 *strings.23717:削除
 
-@@ -14545,3 +14564,7 @@
+@@ -12799,6 +12834,10 @@
+ 
+ *strings.22494:バックアップ用の Javascript 設定ファイルが存在しないか、エラーがあります。\n\n標準設定を使用します。
+ 
+*strings.22495:http://home.netscape.com/bookmark/4_7/tshop.html
+
+*strings.22496:http://home.netscape.com/bookmark/4_7/tradio.html
+
+ *strings.22501:サーバ ファイルを維持
+ 
+ *strings.22502:ローカル ファイルを維持
+@@ -14545,3 +14584,7 @@
 *textPropertiesDialog.ApplyLabelString:		フィルタ
 *tableCreateDialog.ApplyLabelString:		フィルタ
 *documentPropertiesDialog.ApplyLabelString:		フィルタ
--- a/japanese/netscape47-communicator/pkg-plist
+++ b/japanese/netscape47-communicator/pkg-plist
@ -1,4 +1,4 @@
-bin/ja-communicator-46
+bin/ja-communicator-47
@exec ln -sf %f %B/netscape
@exec mkdir -p %D/%%NSUBDIR%%/locale
@exec ln -sf /usr/share/locale/en_US.ISO_8859-1 %D/%%NSUBDIR%%/locale/%%LANG%%
--- a/japanese/netscape47-navigator/Makefile
+++ b/japanese/netscape47-navigator/Makefile
@ -1,16 +1,14 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.6
+# Version required:	4.7
 # Date created:		29 Dec 1998
 # Whom:			sada@FreeBSD.org
 #
 # $FreeBSD$
 #

-MAINTAINER=	sada@FreeBSD.org
-
 FILESDIR=	${BASEDIR}/files

-BASEDIR=	${.CURDIR}/../netscape46-communicator
+BASEDIR=	${.CURDIR}/../netscape47-communicator
 BROWSER=	navigator

 .include	"${BASEDIR}/Makefile"
--- a/www/Makefile
+++ b/www/Makefile
@ -61,9 +61,11 @@
    SUBDIR += netscape4-communicator
    SUBDIR += netscape4-communicator.us
    SUBDIR += netscape4-navigator
-    SUBDIR += netscape47-communicator.us
    SUBDIR += netscape46-communicator
    SUBDIR += netscape46-navigator
+    SUBDIR += netscape47-communicator
+    SUBDIR += netscape47-communicator.us
+    SUBDIR += netscape47-navigator
    SUBDIR += npc
    SUBDIR += p5-Apache
    SUBDIR += p5-Apache-Radius
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@ -1,22 +1,21 @@
 # New ports collection makefile for: netscape (communicator suite)
-# Version required:	4.6*
+# Version required:	4.7
 # Date created:		24 Feb 1997
 # Whom:			thepish
 #
 # $FreeBSD$
 #

-MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/complete_install/
-DISTFILES?=	communicator-v461-export.x86-unknown-freebsd.tar.gz
-
-MAINTAINER?=	sada@FreeBSD.org
+MASTER_SITES?=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/complete_install/
+DISTFILES?=	communicator-v47-export.x86-unknown-freebsd.tar.gz

 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 NO_LATEST_LINK=	yes
-WRKSRC?=	${WRKDIR}/${BROWSER}-v461.x86-unknown-freebsd
+WRKSRC?=	${WRKDIR}/${BROWSER}-v47.x86-unknown-freebsd

-BROWSER_VER?=	4.61
-INFILE_HEAD?=	'Communicator,4.61.0.99147'
+BROWSER_VER=	4.7
+INFILE_HEAD?=	'Communicator,4.7.0.19990915'
 NO_AUTOADMIN=	yes
+NO_FORTIFY=	yes

 .include "${MASTERDIR}/Makefile"
--- a/www/bsdi-netscape47-communicator/pkg-plist
+++ b/www/bsdi-netscape47-communicator/pkg-plist
@ -8,7 +8,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/README
 %%NSUBDIR%%/XKeysymDB
 %%NSUBDIR%%/bookmark.htm
-%%NSUBDIR%%/communicator-4.61.bin
+%%NSUBDIR%%/communicator-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/java/classes/aix/font.properties
 %%NSUBDIR%%/java/classes/aix/font.properties.cs
 %%NSUBDIR%%/java/classes/aix/font.properties.hu
@ -66,6 +66,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
 %%NSUBDIR%%/java/classes/ldap30.jar
 %%NSUBDIR%%/java/classes/resource.jar
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@ -1,17 +1,15 @@
 # New ports collection makefile for: netscape (navigator only)
-# Version required:	4.6*
+# Version required:	4.7
 # Date created:		20 Sept 1998
 # Whom:			brett@peloton.physics.montana.edu
 #
 # $FreeBSD$
 #

-MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/navigator_standalone/
-DISTFILES=	navigator-v461-export.x86-unknown-freebsd.tar.gz
-
-MAINTAINER?=	sada@FreeBSD.org
+MASTER_SITES=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/navigator_standalone/
+DISTFILES=	navigator-v47-export.x86-unknown-freebsd.tar.gz

 BROWSER=	navigator
-INFILE_HEAD=	'Navigator,4.61.0.99147'
+INFILE_HEAD=	'Navigator,4.7.0.19990915'

-.include "${.CURDIR}/../netscape46-communicator/Makefile"
+.include "${.CURDIR}/../netscape47-communicator/Makefile"
--- a/www/bsdi-netscape47-navigator/pkg-comment
+++ b/www/bsdi-netscape47-navigator/pkg-comment
@ -1 +1 @@
-Netscape ver 4.6 navigator web-surfboard
+Netscape ver 4.7 navigator web-surfboard
--- a/www/bsdi-netscape47-navigator/pkg-plist
+++ b/www/bsdi-netscape47-navigator/pkg-plist
@ -65,12 +65,13 @@ bin/navigator-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
 %%NSUBDIR%%/java/classes/ldap30.jar
 %%NSUBDIR%%/java/classes/resource.jar
 %%NSUBDIR%%/java/classes/scd10.jar
 %%NSUBDIR%%/mailcap
-%%NSUBDIR%%/navigator-4.61.bin
+%%NSUBDIR%%/navigator-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/nethelp/Back_dep.gif
 %%NSUBDIR%%/nethelp/Back_dis.gif
 %%NSUBDIR%%/nethelp/Back_sel.gif
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@ -22,7 +22,6 @@ NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 STRIP=
 WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
-FILESDIR=	${.CURDIR}/files
 PKGDIR=		${.CURDIR}/pkg
 PKGREQ=		${MASTERDIR}/pkg/REQ

@ -53,6 +52,10 @@ RESTRICTED=     "Contains strong cryptography"

 .SILENT:

+makesum:
+	${ECHO} "You should make ${FILESDIR}/md5 by hand"
+	${FALSE}
+
 .if !defined(USE_128BIT) && !defined(NO_FORTIFY)
 pre-extract:
 	${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
--- a/www/netscape4-communicator/distinfo
+++ b/www/netscape4-communicator/distinfo
@ -1,3 +1,8 @@
 MD5 (communicator-v408-export.x86-unknown-freebsd.tar.gz) = dfe7005dd39ac900fe336d6f052acfdb
 MD5 (autoadmin-v408.x86-unknown-freebsd.tar.gz) = 0435245b83fc5d9be6844ebfa1a242f0
 MD5 (Fortify-1.4.4-unix-x86.tar.gz) = eb243ab8098f8fc2a63674d1e86ffe09
+MD5 (navigator-v408-export.x86-unknown-freebsd.tar.gz) = 63d607f8e861471f4dcd14d048e1f652
+MD5 (communicator-v461-export.x86-unknown-freebsd.tar.gz) = 308686a3266e5e3aa27692c33313a159
+MD5 (navigator-v461-export.x86-unknown-freebsd.tar.gz) = 49600fb97ba24ca14baf91282f3ad441
+MD5 (communicator-v47-export.x86-unknown-freebsd.tar.gz) = 8cfeb91cce138d9c11bd8ee5f9fa8648
+MD5 (navigator-v47-export.x86-unknown-freebsd.tar.gz) = c84b2779c25cfb10ebace307e56dc569
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@ -9,8 +9,6 @@
 MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/${BROWSER_VER}/english/unix/unsupported/freebsd/navigator_standalone/
 DISTFILES=	navigator-v408-export.x86-unknown-freebsd.tar.gz

-MAINTAINER?=	sada@FreeBSD.org
-
 MASTERDIR=	${.CURDIR}/../netscape4-communicator

 BROWSER=	navigator
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@ -1,22 +1,21 @@
 # New ports collection makefile for: netscape (communicator suite)
-# Version required:	4.6*
+# Version required:	4.7
 # Date created:		24 Feb 1997
 # Whom:			thepish
 #
 # $FreeBSD$
 #

-MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/complete_install/
-DISTFILES?=	communicator-v461-export.x86-unknown-freebsd.tar.gz
-
-MAINTAINER?=	sada@FreeBSD.org
+MASTER_SITES?=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/complete_install/
+DISTFILES?=	communicator-v47-export.x86-unknown-freebsd.tar.gz

 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 NO_LATEST_LINK=	yes
-WRKSRC?=	${WRKDIR}/${BROWSER}-v461.x86-unknown-freebsd
+WRKSRC?=	${WRKDIR}/${BROWSER}-v47.x86-unknown-freebsd

-BROWSER_VER?=	4.61
-INFILE_HEAD?=	'Communicator,4.61.0.99147'
+BROWSER_VER=	4.7
+INFILE_HEAD?=	'Communicator,4.7.0.19990915'
 NO_AUTOADMIN=	yes
+NO_FORTIFY=	yes

 .include "${MASTERDIR}/Makefile"
--- a/www/netscape47-communicator/pkg-plist
+++ b/www/netscape47-communicator/pkg-plist
@ -8,7 +8,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/README
 %%NSUBDIR%%/XKeysymDB
 %%NSUBDIR%%/bookmark.htm
-%%NSUBDIR%%/communicator-4.61.bin
+%%NSUBDIR%%/communicator-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/java/classes/aix/font.properties
 %%NSUBDIR%%/java/classes/aix/font.properties.cs
 %%NSUBDIR%%/java/classes/aix/font.properties.hu
@ -66,6 +66,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
 %%NSUBDIR%%/java/classes/ldap30.jar
 %%NSUBDIR%%/java/classes/resource.jar
--- a/www/netscape47-navigator/Makefile
+++ b/www/netscape47-navigator/Makefile
@ -1,17 +1,15 @@
 # New ports collection makefile for: netscape (navigator only)
-# Version required:	4.6*
+# Version required:	4.7
 # Date created:		20 Sept 1998
 # Whom:			brett@peloton.physics.montana.edu
 #
 # $FreeBSD$
 #

-MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/navigator_standalone/
-DISTFILES=	navigator-v461-export.x86-unknown-freebsd.tar.gz
-
-MAINTAINER?=	sada@FreeBSD.org
+MASTER_SITES=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/navigator_standalone/
+DISTFILES=	navigator-v47-export.x86-unknown-freebsd.tar.gz

 BROWSER=	navigator
-INFILE_HEAD=	'Navigator,4.61.0.99147'
+INFILE_HEAD=	'Navigator,4.7.0.19990915'

-.include "${.CURDIR}/../netscape46-communicator/Makefile"
+.include "${.CURDIR}/../netscape47-communicator/Makefile"
--- a/www/netscape47-navigator/pkg-comment
+++ b/www/netscape47-navigator/pkg-comment
@ -1 +1 @@
-Netscape ver 4.6 navigator web-surfboard
+Netscape ver 4.7 navigator web-surfboard
--- a/www/netscape47-navigator/pkg-plist
+++ b/www/netscape47-navigator/pkg-plist
@ -65,12 +65,13 @@ bin/navigator-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/jae40.jar
 %%NSUBDIR%%/java/classes/java40.jar
 %%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
 %%NSUBDIR%%/java/classes/ldap30.jar
 %%NSUBDIR%%/java/classes/resource.jar
 %%NSUBDIR%%/java/classes/scd10.jar
 %%NSUBDIR%%/mailcap
-%%NSUBDIR%%/navigator-4.61.bin
+%%NSUBDIR%%/navigator-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/nethelp/Back_dep.gif
 %%NSUBDIR%%/nethelp/Back_dis.gif
 %%NSUBDIR%%/nethelp/Back_sel.gif
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@ -22,7 +22,6 @@ NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 STRIP=
 WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
-FILESDIR=	${.CURDIR}/files
 PKGDIR=		${.CURDIR}/pkg
 PKGREQ=		${MASTERDIR}/pkg/REQ

@ -53,6 +52,10 @@ RESTRICTED=     "Contains strong cryptography"

 .SILENT:

+makesum:
+	${ECHO} "You should make ${FILESDIR}/md5 by hand"
+	${FALSE}
+
 .if !defined(USE_128BIT) && !defined(NO_FORTIFY)
 pre-extract:
 	${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
--- a/www/netscape48-communicator/distinfo
+++ b/www/netscape48-communicator/distinfo
@ -1,3 +1,8 @@
 MD5 (communicator-v408-export.x86-unknown-freebsd.tar.gz) = dfe7005dd39ac900fe336d6f052acfdb
 MD5 (autoadmin-v408.x86-unknown-freebsd.tar.gz) = 0435245b83fc5d9be6844ebfa1a242f0
 MD5 (Fortify-1.4.4-unix-x86.tar.gz) = eb243ab8098f8fc2a63674d1e86ffe09
+MD5 (navigator-v408-export.x86-unknown-freebsd.tar.gz) = 63d607f8e861471f4dcd14d048e1f652
+MD5 (communicator-v461-export.x86-unknown-freebsd.tar.gz) = 308686a3266e5e3aa27692c33313a159
+MD5 (navigator-v461-export.x86-unknown-freebsd.tar.gz) = 49600fb97ba24ca14baf91282f3ad441
+MD5 (communicator-v47-export.x86-unknown-freebsd.tar.gz) = 8cfeb91cce138d9c11bd8ee5f9fa8648
+MD5 (navigator-v47-export.x86-unknown-freebsd.tar.gz) = c84b2779c25cfb10ebace307e56dc569