Set DIST_SUBDIR for lynx-current too, like lynx, so that we're

not collecting the same "DISTFILES" in two different places.

2 files changed, 31 insertions, 22 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index cb0f55ef5ee..e50b5f17ab9 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/08/11 01:36:24 fredb Exp $
+# $NetBSD: Makefile,v 1.18 2000/08/11 13:18:39 fredb Exp $
 #
 
 DISTNAME=		lynx2.8.4dev.7
@@ -7,8 +7,8 @@ CATEGORIES=		www
 MASTER_SITES=		http://lynx.isc.org/current/ \
 			http://lynx.isc.org/po/ \
 			http://www.iro.umontreal.ca/contrib/po/teams/PO/
-EXTRACT_SUFX=		.tar.bz2		# For dependence on bzip2
-DISTFILES+=		lynx2.8.4dev.7.tar.bz2
+EXTRACT_SUFX=		.tar.bz2		# This is redundant, but it pulls in
+DISTFILES+=		lynx2.8.4dev.7.tar.bz2	# the dependence on bzip2, if needed.
 DISTFILES+=		lynx-2.8.3.rel1.cs.po
 DISTFILES+=		lynx-2.8.4.da.po
 DISTFILES+=		lynx-2.8.3.rel1.de.po
@@ -31,6 +31,7 @@ RESTRICTED=		"Crypto, export-controlled"
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
+DIST_SUBDIR=		lynx
 EXTRACT_ONLY=		${DISTFILES:M*.tar.bz2}
 WRKSRC=			${WRKDIR}/lynx2-8-4
 
@@ -68,14 +69,22 @@ CONFIGURE_ARGS+=	--enable-prettysrc
 CONFIGURE_ARGS+=	--enable-read-eta
 
 post-extract:
-	${CP} ${DISTDIR}/lynx-2.8.3.rel1.cs.po ${WRKSRC}/po/cs.po
-	${CP} ${DISTDIR}/lynx-2.8.4.da.po ${WRKSRC}/po/da.po
-	${CP} ${DISTDIR}/lynx-2.8.3.rel1.de.po ${WRKSRC}/po/de.po
-	${CP} ${DISTDIR}/lynx-2.8.3.rel1.ja.po ${WRKSRC}/po/ja.po
-	${CP} ${DISTDIR}/lynx-2.8.3.rel1.nl.po ${WRKSRC}/po/nl.po
-	${CP} ${DISTDIR}/lynx-2.8.3.rel1.pt_BR.po ${WRKSRC}/po/pt_BR.po
-	${CP} ${DISTDIR}/lynx-2.8.3.rel1.ru.po ${WRKSRC}/po/ru.po
-	${CP} ${DISTDIR}/lynx-2.8.3.rel1.sl.po ${WRKSRC}/po/sl.po
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.cs.po \
+	  ${WRKSRC}/po/cs.po
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.4.da.po \
+	  ${WRKSRC}/po/da.po
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.de.po \
+	  ${WRKSRC}/po/de.po
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.ja.po \
+	  ${WRKSRC}/po/ja.po
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.nl.po \
+	  ${WRKSRC}/po/nl.po
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.pt_BR.po \
+	  ${WRKSRC}/po/pt_BR.po
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.ru.po \
+	  ${WRKSRC}/po/ru.po
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.sl.po \
+	  ${WRKSRC}/po/sl.po
 
 post-configure:
 	(${ECHO}; \
diff --git a/www/lynx-current/files/md5 b/www/lynx-current/files/md5
index 07134133aaa..c91e5e54382 100644
--- a/www/lynx-current/files/md5
+++ b/www/lynx-current/files/md5
@@ -1,12 +1,12 @@
-$NetBSD: md5,v 1.5 2000/08/07 11:48:48 fredb Exp $
+$NetBSD: md5,v 1.6 2000/08/11 13:18:45 fredb Exp $
 
-MD5 (lynx2.8.4dev.7.tar.bz2) = bb44496c4ba2d90958a0548054c8b529
-MD5 (lynx-2.8.3.rel1.cs.po) = af4f8890fe06500f878a664bf3eba362
-MD5 (lynx-2.8.4.da.po) = 8a9a5e30b655ef6bb4541b0fd60d552b
-MD5 (lynx-2.8.3.rel1.de.po) = 0ed4a1d0a09a6c1742a2808f22c747db
-MD5 (lynx-2.8.3.rel1.ja.po) = afe4cdd5cd4908de9e21b07b335faa0a
-MD5 (lynx-2.8.3.rel1.nl.po) = 33e98f38c2f61bd86311c2e5be4a7e97
-MD5 (lynx-2.8.3.rel1.pt_BR.po) = 1deedb9954cbe299d2c6fcdc65b24084
-MD5 (lynx-2.8.3.rel1.ru.po) = 3cc74eb861aefcb0037bb0784cca7227
-MD5 (lynx-2.8.3.rel1.sl.po) = 4f5562aa17f767f40f549ea015d39a20
-MD5 (lynx-283-ssl.patch.gz) = c48607b33f493284ba60c8a431a13b03
+MD5 (lynx/lynx2.8.4dev.7.tar.bz2) = bb44496c4ba2d90958a0548054c8b529
+MD5 (lynx/lynx-2.8.3.rel1.cs.po) = af4f8890fe06500f878a664bf3eba362
+MD5 (lynx/lynx-2.8.4.da.po) = 8a9a5e30b655ef6bb4541b0fd60d552b
+MD5 (lynx/lynx-2.8.3.rel1.de.po) = 0ed4a1d0a09a6c1742a2808f22c747db
+MD5 (lynx/lynx-2.8.3.rel1.ja.po) = afe4cdd5cd4908de9e21b07b335faa0a
+MD5 (lynx/lynx-2.8.3.rel1.nl.po) = 33e98f38c2f61bd86311c2e5be4a7e97
+MD5 (lynx/lynx-2.8.3.rel1.pt_BR.po) = 1deedb9954cbe299d2c6fcdc65b24084
+MD5 (lynx/lynx-2.8.3.rel1.ru.po) = 3cc74eb861aefcb0037bb0784cca7227
+MD5 (lynx/lynx-2.8.3.rel1.sl.po) = 4f5562aa17f767f40f549ea015d39a20
+MD5 (lynx/lynx-283-ssl.patch.gz) = c48607b33f493284ba60c8a431a13b03