diff options
-rw-r--r-- | www/linux-netscape47-communicator/Makefile | 10 | ||||
-rw-r--r-- | www/linux-netscape47-navigator/Makefile | 24 | ||||
-rw-r--r-- | www/linux-netscape6/Makefile | 10 | ||||
-rw-r--r-- | www/netscape4-communicator/Makefile | 17 | ||||
-rw-r--r-- | www/netscape48-communicator/Makefile | 17 | ||||
-rw-r--r-- | www/netscape7/Makefile | 10 |
6 files changed, 35 insertions, 53 deletions
diff --git a/www/linux-netscape47-communicator/Makefile b/www/linux-netscape47-communicator/Makefile index cf798f4b02b3..2d053bebd4dc 100644 --- a/www/linux-netscape47-communicator/Makefile +++ b/www/linux-netscape47-communicator/Makefile @@ -7,11 +7,11 @@ # $FreeBSD$ # -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 @@ -20,13 +20,13 @@ 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" diff --git a/www/linux-netscape47-navigator/Makefile b/www/linux-netscape47-navigator/Makefile index 85b64b948580..87d05ba93c4b 100644 --- a/www/linux-netscape47-navigator/Makefile +++ b/www/linux-netscape47-navigator/Makefile @@ -7,26 +7,6 @@ # $FreeBSD$ # -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 +BROWSER= navigator -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 - -.include "../netscape47-communicator/Makefile" +.include "../linux-netscape47-communicator/Makefile" diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile index cf798f4b02b3..2d053bebd4dc 100644 --- a/www/linux-netscape6/Makefile +++ b/www/linux-netscape6/Makefile @@ -7,11 +7,11 @@ # $FreeBSD$ # -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 @@ -20,13 +20,13 @@ 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" diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile index d8bd884bdf8a..3b95f5f5c261 100644 --- a/www/netscape4-communicator/Makefile +++ b/www/netscape4-communicator/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -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 @@ PKGDIR= ${.CURDIR}/pkg 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 @@ INFILE_HEAD?= 'Communicator,4.08.0.98306' 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 @@ pre-extract: 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 @@ do-install: ${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 @@ do-install: .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} diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile index d8bd884bdf8a..3b95f5f5c261 100644 --- a/www/netscape48-communicator/Makefile +++ b/www/netscape48-communicator/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -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 @@ PKGDIR= ${.CURDIR}/pkg 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 @@ INFILE_HEAD?= 'Communicator,4.08.0.98306' 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 @@ pre-extract: 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 @@ do-install: ${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 @@ do-install: .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} diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile index cf798f4b02b3..2d053bebd4dc 100644 --- a/www/netscape7/Makefile +++ b/www/netscape7/Makefile @@ -7,11 +7,11 @@ # $FreeBSD$ # -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 @@ -20,13 +20,13 @@ 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" |