From a1e86a2475d65b34a54ab65fad03d870c8a236e8 Mon Sep 17 00:00:00 2001
From: Trevor Johnson <trevor@FreeBSD.org>
Date: Wed, 27 Dec 2000 12:55:56 +0000
Subject: Correct breakage caused by my hasty addition of DIST_SUBDIR.  Add
 dependency on archivers/unzip.  Thanks to Kevin Lo for reporting both
 problems.  Also, reassure users about a harmless error.

---
 www/linux-netscape6/Makefile | 4 +++-
 www/linux-netscape6/distinfo | 2 +-
 www/netscape7/Makefile       | 4 +++-
 www/netscape7/distinfo       | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'www')

diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile
index 3c20890da6fb..395856811dd2 100644
--- a/www/linux-netscape6/Makefile
+++ b/www/linux-netscape6/Makefile
@@ -28,6 +28,7 @@ DIST_SUBDIR=	netscape6/english/${PORTVERSION}
 
 MAINTAINER=	trevor@FreeBSD.org
 
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	${LINUX_BASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
 		${LINUX_BASE}/usr/lib/libgtk-1.2.so.0.5.0:${PORTSDIR}/x11-toolkits/linux-gtk \
 		${LINUX_BASE}/usr/lib/libjpeg.so.62.0.0:${PORTSDIR}/graphics/linux-jpeg
@@ -45,7 +46,7 @@ STARTUP_CMD=	netscape6
 
 do-extract:
 	${MKDIR} ${WRKSRC}
-	@${TAR} xzf ${DISTDIR}/${DISTFILES} -C ${WRKDIR}
+	@${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} -C ${WRKDIR}
 .for i in browser deflenus jre langenus mail psm spellchecker xpcom
 	unzip -qo ${WRKSRC}/${i}.xpi -d ${WRKSRC}
 .endfor
@@ -63,6 +64,7 @@ do-patch:
 
 do-configure:
 	${SETENV} $DISPLAY="NONE" ${WRKSRC}/bin/netscape file:///dev/null
+	@${ECHO} A \"cannot open display\" error here is normal.
 	${SED} -e "s;%%INSTALL_DIR%%;${INSTALL_DIR};g" \
 	${FILESDIR}/start.sh >${WRKDIR}/${STARTUP_CMD}
 
diff --git a/www/linux-netscape6/distinfo b/www/linux-netscape6/distinfo
index 61a7aa125a32..7ea2ef80303b 100644
--- a/www/linux-netscape6/distinfo
+++ b/www/linux-netscape6/distinfo
@@ -1 +1 @@
-MD5 (netscape-i686-pc-linux-gnu-sea.tar.gz) = 8ed6dd0c331153dc95c0e72bc098ff3b
+MD5 (netscape6/english/6.0/netscape-i686-pc-linux-gnu-sea.tar.gz) = 8ed6dd0c331153dc95c0e72bc098ff3b
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 3c20890da6fb..395856811dd2 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -28,6 +28,7 @@ DIST_SUBDIR=	netscape6/english/${PORTVERSION}
 
 MAINTAINER=	trevor@FreeBSD.org
 
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	${LINUX_BASE}/lib/ld.so:${PORTSDIR}/emulators/linux_base \
 		${LINUX_BASE}/usr/lib/libgtk-1.2.so.0.5.0:${PORTSDIR}/x11-toolkits/linux-gtk \
 		${LINUX_BASE}/usr/lib/libjpeg.so.62.0.0:${PORTSDIR}/graphics/linux-jpeg
@@ -45,7 +46,7 @@ STARTUP_CMD=	netscape6
 
 do-extract:
 	${MKDIR} ${WRKSRC}
-	@${TAR} xzf ${DISTDIR}/${DISTFILES} -C ${WRKDIR}
+	@${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} -C ${WRKDIR}
 .for i in browser deflenus jre langenus mail psm spellchecker xpcom
 	unzip -qo ${WRKSRC}/${i}.xpi -d ${WRKSRC}
 .endfor
@@ -63,6 +64,7 @@ do-patch:
 
 do-configure:
 	${SETENV} $DISPLAY="NONE" ${WRKSRC}/bin/netscape file:///dev/null
+	@${ECHO} A \"cannot open display\" error here is normal.
 	${SED} -e "s;%%INSTALL_DIR%%;${INSTALL_DIR};g" \
 	${FILESDIR}/start.sh >${WRKDIR}/${STARTUP_CMD}
 
diff --git a/www/netscape7/distinfo b/www/netscape7/distinfo
index 61a7aa125a32..7ea2ef80303b 100644
--- a/www/netscape7/distinfo
+++ b/www/netscape7/distinfo
@@ -1 +1 @@
-MD5 (netscape-i686-pc-linux-gnu-sea.tar.gz) = 8ed6dd0c331153dc95c0e72bc098ff3b
+MD5 (netscape6/english/6.0/netscape-i686-pc-linux-gnu-sea.tar.gz) = 8ed6dd0c331153dc95c0e72bc098ff3b
-- 
cgit