From owner-freebsd-ports Mon Mar 27 13: 5:51 2000 Delivered-To: freebsd-ports@freebsd.org Received: from mfo01.iij.ad.jp (mfo01.iij.ad.jp [202.232.2.118]) by hub.freebsd.org (Postfix) with ESMTP id 90F7C37B690; Mon, 27 Mar 2000 13:05:40 -0800 (PST) (envelope-from sada@rr.iij4u.or.jp) Received: from rr.iij4u.or.jp (rr.iij4u.or.jp [210.130.0.42]) by mfo01.iij.ad.jp (8.8.8/MFO1.3) with ESMTP id GAA27138; Tue, 28 Mar 2000 06:05:38 +0900 (JST) Received: from localhost (h019.p105.iij4u.or.jp [210.130.105.19]) by rr.iij4u.or.jp (8.8.8+2.2IIJ/4U1.1) with ESMTP id GAA00192; Tue, 28 Mar 2000 06:05:36 +0900 (JST) To: girgen@partitur.se, dirk@FreeBSD.org Cc: ports@FreeBSD.org From: sada@FreeBSD.org Subject: Take master/slave style with www/linux-netscape47-navigator Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Mailer: mnews [version 1.22] 1999-12/19(Sun) Message-Id: <20000327055350Q.sada@rr.iij4u.or.jp> Date: Mon, 27 Mar 2000 05:53:50 +0900 X-Dispatcher: imput version 20000228(IM140) Lines: 245 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org As last time I said, www/linux-netscape47-naviagtor/Makefile should include l-n47-c/Makefile and maintain cost would be decreased. Also I recommend Girgen to be navigator's maintainer. Now the port is too small to be maintained independently. remove files: linux-netscape47-communicator/pkg/REQ # forgotten to remove by me linux-netscape47-navigator/files/mailcap Index: linux-netscape47-communicator/Makefile =================================================================== RCS file: /ncvs/ports/www/linux-netscape47-communicator/Makefile,v retrieving revision 1.19 diff -u -w -B -b -r1.19 Makefile --- linux-netscape47-communicator/Makefile 2000/03/11 17:22:00 1.19 +++ linux-netscape47-communicator/Makefile 2000/03/26 08:19:09 @@ -7,26 +7,26 @@ # $FreeBSD: ports/www/linux-netscape47-communicator/Makefile,v 1.19 2000/03/11 17:22:00 sada Exp $ # -DISTNAME= linux-netscape-communicator-${BROWSER_VER} +DISTNAME= linux-netscape-${BROWSER}-${BROWSER_VER} CATEGORIES= www linux MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/english/4.72/unix/supported/linux20_glibc2/complete_install/ \ ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.72/unix/supported/linux20_glibc2/complete_install/ -DISTFILES= communicator-v472-export.x86-unknown-linuxglibc2.0.tar.gz +DISTFILES= ${BROWSER}-v472-export.x86-unknown-linuxglibc2.0.tar.gz -MAINTAINER= girgen@partitur.se +MAINTAINER?= girgen@partitur.se RUN_DEPENDS= /compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base ONLY_FOR_ARCHS= i386 # don't overwrite the native FreeBSD port's shell script wrapper in ${PREFIX}/bin -BROWSER= communicator-linux +BROWSER_ARC= ${BROWSER}-linux -WRKSRC= ${WRKDIR}/communicator-v472.x86-unknown-linux2.0 +WRKSRC= ${WRKDIR}/${BROWSER}-v472.x86-unknown-linux2.0 USE_LINUX_LIB= yes -MAILCAP= ${.CURDIR}/files/mailcap +MAILCAP= ${.CURDIR}/../linux-netscape47-communicator/files/mailcap NSUBDIR= lib/netscape-linux .include "../netscape47-communicator/Makefile" Index: linux-netscape47-communicator/pkg/REQ =================================================================== RCS file: REQ diff -N REQ --- /tmp/cvsfg2058 Mon Mar 27 05:16:57 2000 +++ /dev/null Mon Mar 27 04:58:37 2000 @@ -1,5 +0,0 @@ -#! /bin/sh - -# use fake shell REQ script, since we don't require X aout libs. - -exit 0; Index: linux-netscape47-navigator/Makefile =================================================================== RCS file: /ncvs/ports/www/linux-netscape47-navigator/Makefile,v retrieving revision 1.20 diff -u -w -B -b -r1.20 Makefile --- linux-netscape47-navigator/Makefile 2000/03/12 19:07:09 1.20 +++ linux-netscape47-navigator/Makefile 2000/03/26 08:03:47 @@ -7,26 +7,8 @@ # $FreeBSD: ports/www/linux-netscape47-navigator/Makefile,v 1.20 2000/03/12 19:07:09 asami Exp $ # -DISTNAME= linux-netscape-navigator-${BROWSER_VER} -CATEGORIES= www linux -MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/english/4.72/unix/supported/linux20_glibc2/complete_install/ \ - ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/4.72/unix/supported/linux20_glibc2/complete_install/ -DISTFILES= navigator-v472-export.x86-unknown-linuxglibc2.0.tar.gz - MAINTAINER= dirk@FreeBSD.org - -RUN_DEPENDS= /compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_base - -ONLY_FOR_ARCHS= i386 - -# don't overwrite the native FreeBSD port's shell script wrapper in ${PREFIX}/bin -BROWSER= navigator-linux - -WRKSRC= ${WRKDIR}/navigator-v472.x86-unknown-linux2.0 - -USE_LINUX_LIB= yes -MAILCAP= ${.CURDIR}/files/mailcap -NSUBDIR= lib/netscape-linux +BROWSER= navigator -.include "../netscape47-communicator/Makefile" +.include "../linux-netscape47-communicator/Makefile" Index: linux-netscape47-navigator/files/mailcap =================================================================== RCS file: mailcap diff -N mailcap --- /tmp/cvsem2058 Mon Mar 27 05:16:57 2000 +++ /dev/null Mon Mar 27 04:58:37 2000 @@ -1,69 +0,0 @@ -# Example .mailcap file for FreeBSD machines -# -# First a note about syntax: -# The first token in a configuration line represents a mime type. -# A mime type is of the form "SubGroup/Item" and either token -# can be replaced by the wildcard character "*" -# -# the second token is the command that you would run -# when the specified mime type is encountered. An example -# would be "xv %s" where %s will be replaced by a filename -# -# remaining tokens represent name value pairs. -# -# the "test=" pair invokes the test command -# specified and checks the UNIX shell return code to see if the -# test passed. If the test passes the mime mapping is made, otherwise -# the mapping is not made. -# -# the "stream-buffer-size=" pair tells the application -# to use a popen command to invoke the program specified and to -# pipe all data into the command. Only programs that can handle -# piped input can use this method. When this method is used -# a "%s" should not be included in the command. You should -# make sure that the program you wish to use can accept piped -# data by trying something like this before using it: -# cat "YOUR_DATA_FILE_HERE" | COMMAND_TO_TEST -# -# You may continue lines by using the backslash character "\" - -# FreeBSD doesn't seem to support `sfplay' yet, but if a port comes -# along then the following should be enabled. -# -# plays AIFF files -#audio/x-aiff; sfplay %s - -# plays AIFC files -#audio/x-aifc; sfplay %s - -# FreeBSD has no wavplay utility either, but if someone -# would care to port one then this can also be used. -# plays WAV files -#audio/x-wav; wavplay %s > /dev/null 2>&1 - -# FreeBSD /dev/audio is sun compliant -audio/basic; cat %s > /dev/audio - -# use this to play MPEG audio if you have maplay installed -audio/x-mpeg; maplay -; stream-buffer-size=2000 - -# use this to play MPEG video files if you have mpeg_play installed -video/mpeg; mpeg_play -quiet %s - -# All other anims go well with xanim (if installed) -video/*; xanim %s > /dev/null 2>&1 - -# use this to display postscript files -application/postscript; ghostview %s - -# use this to display pdf files -application/pdf; acroread %s 2>/dev/null - -# this is the default for non GIF or JPEG images -image/*; xv %s - -# if you would prefer an external viewer for GIF and JPEG images -# uncomment the following lines for XV to act as your external viewer. -#image/gif; xv %s -#image/jpg; xv %s -#image/jpeg; xv %s Index: netscape3/Makefile =================================================================== RCS file: /ncvs/ports/www/netscape3/Makefile,v retrieving revision 1.38 diff -u -w -B -b -r1.38 Makefile Index: netscape4-communicator/Makefile =================================================================== RCS file: /ncvs/ports/www/netscape4-communicator/Makefile,v retrieving revision 1.62 diff -u -w -B -b -r1.62 Makefile --- netscape4-communicator/Makefile 2000/03/11 17:22:01 1.62 +++ netscape4-communicator/Makefile 2000/03/26 19:43:21 @@ -6,7 +6,7 @@ # $FreeBSD: ports/www/netscape4-communicator/Makefile,v 1.62 2000/03/11 17:22:01 sada Exp $ # -DISTNAME?= netscape-${BROWSER}-${BROWSER_VER} +DISTNAME?= netscape-${BROWSER_ARC}-${BROWSER_VER} CATEGORIES?= www MASTER_SITES?= ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/ DISTFILES?= communicator-v408-export.x86-unknown-freebsd.tar.gz @@ -29,6 +29,7 @@ AUTOADMIN?= autoadmin-v408.x86-unknown-freebsd.tar.gz BROWSER?= communicator +BROWSER_ARC?= ${BROWSER} BROWSER_VER?= 4.08 FORTIFY= Fortify-1.4.6-unix-x86 NDIR= ${PREFIX}/${NSUBDIR} @@ -38,7 +39,7 @@ WRAPPER_TEMPLATE= ${MASTERDIR}/files/netscape.sh MAILCAP?= ${MASTERDIR}/files/mailcap -PLIST_SUB= BROWSER=${BROWSER} BROWSER_VER=${BROWSER_VER} \ +PLIST_SUB= BROWSER=${BROWSER_ARC} BROWSER_VER=${BROWSER_VER} \ NSUBDIR=${NSUBDIR} .if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN) @@ -71,7 +72,7 @@ post-configure: ${SED} -e "s;@PREFIX@;${PREFIX};g" -e "s;@NSUBDIR@;${NSUBDIR};g" \ - -e "s;@BROWSER@;${BROWSER};g" \ + -e "s;@BROWSER@;${BROWSER_ARC};g" \ -e "s;@BROWSER_VER@;${BROWSER_VER};g" \ ${WRAPPER_TEMPLATE} >${WRKSRC}/netscape ${CHMOD} +x ${WRKSRC}/netscape @@ -90,11 +91,11 @@ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $${i} ${EXTRACT_AFTER_ARGS} -C ${NDIR}; \ done ${WRKSRC}/vreg ${NDIR}/registry ${WRKSRC}/infile - ${MV} -f ${NDIR}/netscape ${NDIR}/${BROWSER}-${BROWSER_VER}.bin + ${MV} -f ${NDIR}/netscape ${NDIR}/${BROWSER_ARC}-${BROWSER_VER}.bin ${INSTALL_SCRIPT} ${WRKSRC}/netscape \ - ${BINDIR}/${BROWSER}-${BROWSER_VER} - ${LN} -sf ${BROWSER}-${BROWSER_VER} ${BINDIR}/${BROWSER}-4 - ${LN} -sf ${BROWSER}-4 ${BINDIR}/netscape + ${BINDIR}/${BROWSER_ARC}-${BROWSER_VER} + ${LN} -sf ${BROWSER_ARC}-${BROWSER_VER} ${BINDIR}/${BROWSER_ARC}-4 + ${LN} -sf ${BROWSER_ARC}-4 ${BINDIR}/netscape if [ ! -f ${NDIR}/mailcap ] ; then \ ${INSTALL_DATA} ${MAILCAP} ${NDIR}; \ fi @@ -105,7 +106,7 @@ .if defined(USE_128BIT) && !defined(NO_FORTIFY) cd ${WRKDIR}/${FORTIFY} \ && (${ECHO}; ${ECHO} yes; ${ECHO} no; ${ECHO} no) \ - | ./Fortify.sh ${NDIR}/${BROWSER}-${BROWSER_VER}.bin + | ./Fortify.sh ${NDIR}/${BROWSER_ARC}-${BROWSER_VER}.bin .endif ${CHOWN} -R root:wheel ${NDIR} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message