diff options
-rw-r--r-- | www/linux-netscape47-communicator/Makefile | 3 | ||||
-rw-r--r-- | www/linux-netscape6/Makefile | 3 | ||||
-rw-r--r-- | www/netscape4-communicator/Makefile | 17 | ||||
-rw-r--r-- | www/netscape4-communicator/pkg-req.aout | 30 | ||||
-rw-r--r-- | www/netscape48-communicator/Makefile | 17 | ||||
-rw-r--r-- | www/netscape48-communicator/pkg-req.aout | 30 | ||||
-rw-r--r-- | www/netscape7/Makefile | 3 |
7 files changed, 89 insertions, 14 deletions
diff --git a/www/linux-netscape47-communicator/Makefile b/www/linux-netscape47-communicator/Makefile index a2798bfd4b77..cf798f4b02b3 100644 --- a/www/linux-netscape47-communicator/Makefile +++ b/www/linux-netscape47-communicator/Makefile @@ -24,8 +24,7 @@ BROWSER= communicator-linux WRKSRC= ${WRKDIR}/communicator-v472.x86-unknown-linux2.0 -# use fake shell REQ script, since we don't require X aout libs. -PKGREQ= ${.CURDIR}/pkg/REQ +USE_LINUX_LIB= yes MAILCAP= ${.CURDIR}/files/mailcap NSUBDIR= lib/netscape-linux diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile index a2798bfd4b77..cf798f4b02b3 100644 --- a/www/linux-netscape6/Makefile +++ b/www/linux-netscape6/Makefile @@ -24,8 +24,7 @@ BROWSER= communicator-linux WRKSRC= ${WRKDIR}/communicator-v472.x86-unknown-linux2.0 -# use fake shell REQ script, since we don't require X aout libs. -PKGREQ= ${.CURDIR}/pkg/REQ +USE_LINUX_LIB= yes MAILCAP= ${.CURDIR}/files/mailcap NSUBDIR= lib/netscape-linux diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile index a84cd1133a05..d8bd884bdf8a 100644 --- a/www/netscape4-communicator/Makefile +++ b/www/netscape4-communicator/Makefile @@ -13,8 +13,6 @@ DISTFILES?= communicator-v408-export.x86-unknown-freebsd.tar.gz MAINTAINER?= sada@FreeBSD.org -RUN_DEPENDS?= ${X11BASE}/lib/aout/libX11.so.6.1:${PORTSDIR}/x11/XFree86-aoutlibs - Y2K= http://home.netscape.com/products/year2000/faq/client.html .if !defined(INFILE_HEAD) @@ -28,7 +26,6 @@ NO_FILTER_SHLIBS= yes STRIP= WRKSRC?= ${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd PKGDIR= ${.CURDIR}/pkg -PKGREQ?= ${MASTERDIR}/pkg/REQ AUTOADMIN?= autoadmin-v408.x86-unknown-freebsd.tar.gz BROWSER?= communicator @@ -55,6 +52,16 @@ DISTFILES+= ${FORTIFY}.tar.gz RESTRICTED= "Contains strong cryptography" .endif +.if !defined(_PREMKINCLUDED) +.include <bsd.port.pre.mk> +.endif + +.if (${ARCH} == "i386") && !defined(USE_LINUX_LIB) +USE_AOUT_LIB= yes +PKGREQ= ${MASTERDIR}/pkg/REQ.aout +RUN_DEPENDS= ${X11BASE}/lib/aout/libX11.so.6.1:${PORTSDIR}/x11/XFree86-aoutlibs +.endif + .SILENT: .if !defined(USE_128BIT) && !defined(NO_FORTIFY) @@ -70,8 +77,10 @@ post-configure: ${CHMOD} +x ${WRKSRC}/netscape ${ECHO} -n ${INFILE_HEAD},${NDIR} >${WRKSRC}/infile +.if defined(USE_AOUT_LIB) pre-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL +.endif do-install: ${MKDIR} ${NDIR}/java/classes @@ -104,7 +113,7 @@ post-install: ${CAT} ${PKGDIR}/DESCR # hack to allow slave ports to include bsd.port.pre.mk and then this file -.if defined(PRE_MK_INCLUDED) +.if defined(_PREMKINCLUDED) .include <bsd.port.post.mk> .else .include <bsd.port.mk> diff --git a/www/netscape4-communicator/pkg-req.aout b/www/netscape4-communicator/pkg-req.aout new file mode 100644 index 000000000000..2e5ef56fe552 --- /dev/null +++ b/www/netscape4-communicator/pkg-req.aout @@ -0,0 +1,30 @@ +#!/bin/sh +env=/usr/bin/env +fgrep=/usr/bin/fgrep +ldconfig=/sbin/ldconfig +ld_so=/usr/libexec/ld.so +if [ x$2 = xINSTALL ]; then + $env OBJFORMAT=aout $ldconfig -r | $fgrep -q -e '-lc.3' + if [ $? -ne 0 -o ! -x $ld_so ]; then + cat <<END +++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++ There are no aout libs on this machine. + ++ 1. Install compat22 distribution, + ++ 2. restart your system, + ++ 3. then retry "make install" this port + ++ or "pkg_add" this package. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ +END + exit 1 + fi + $env OBJFORMAT=aout $ldconfig -r | $fgrep -q -e '-lX11.6' + if [ $? -ne 0 ]; then + cat <<END ++++++++++++++++++++++++++++++++++++++++++++++ ++ There are no X aout libs on this machine. + ++++++++++++++++++++++++++++++++++++++++++++++ +END + exit 1 + fi +fi +exit 0; diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile index a84cd1133a05..d8bd884bdf8a 100644 --- a/www/netscape48-communicator/Makefile +++ b/www/netscape48-communicator/Makefile @@ -13,8 +13,6 @@ DISTFILES?= communicator-v408-export.x86-unknown-freebsd.tar.gz MAINTAINER?= sada@FreeBSD.org -RUN_DEPENDS?= ${X11BASE}/lib/aout/libX11.so.6.1:${PORTSDIR}/x11/XFree86-aoutlibs - Y2K= http://home.netscape.com/products/year2000/faq/client.html .if !defined(INFILE_HEAD) @@ -28,7 +26,6 @@ NO_FILTER_SHLIBS= yes STRIP= WRKSRC?= ${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd PKGDIR= ${.CURDIR}/pkg -PKGREQ?= ${MASTERDIR}/pkg/REQ AUTOADMIN?= autoadmin-v408.x86-unknown-freebsd.tar.gz BROWSER?= communicator @@ -55,6 +52,16 @@ DISTFILES+= ${FORTIFY}.tar.gz RESTRICTED= "Contains strong cryptography" .endif +.if !defined(_PREMKINCLUDED) +.include <bsd.port.pre.mk> +.endif + +.if (${ARCH} == "i386") && !defined(USE_LINUX_LIB) +USE_AOUT_LIB= yes +PKGREQ= ${MASTERDIR}/pkg/REQ.aout +RUN_DEPENDS= ${X11BASE}/lib/aout/libX11.so.6.1:${PORTSDIR}/x11/XFree86-aoutlibs +.endif + .SILENT: .if !defined(USE_128BIT) && !defined(NO_FORTIFY) @@ -70,8 +77,10 @@ post-configure: ${CHMOD} +x ${WRKSRC}/netscape ${ECHO} -n ${INFILE_HEAD},${NDIR} >${WRKSRC}/infile +.if defined(USE_AOUT_LIB) pre-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL +.endif do-install: ${MKDIR} ${NDIR}/java/classes @@ -104,7 +113,7 @@ post-install: ${CAT} ${PKGDIR}/DESCR # hack to allow slave ports to include bsd.port.pre.mk and then this file -.if defined(PRE_MK_INCLUDED) +.if defined(_PREMKINCLUDED) .include <bsd.port.post.mk> .else .include <bsd.port.mk> diff --git a/www/netscape48-communicator/pkg-req.aout b/www/netscape48-communicator/pkg-req.aout new file mode 100644 index 000000000000..2e5ef56fe552 --- /dev/null +++ b/www/netscape48-communicator/pkg-req.aout @@ -0,0 +1,30 @@ +#!/bin/sh +env=/usr/bin/env +fgrep=/usr/bin/fgrep +ldconfig=/sbin/ldconfig +ld_so=/usr/libexec/ld.so +if [ x$2 = xINSTALL ]; then + $env OBJFORMAT=aout $ldconfig -r | $fgrep -q -e '-lc.3' + if [ $? -ne 0 -o ! -x $ld_so ]; then + cat <<END +++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++ There are no aout libs on this machine. + ++ 1. Install compat22 distribution, + ++ 2. restart your system, + ++ 3. then retry "make install" this port + ++ or "pkg_add" this package. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ +END + exit 1 + fi + $env OBJFORMAT=aout $ldconfig -r | $fgrep -q -e '-lX11.6' + if [ $? -ne 0 ]; then + cat <<END ++++++++++++++++++++++++++++++++++++++++++++++ ++ There are no X aout libs on this machine. + ++++++++++++++++++++++++++++++++++++++++++++++ +END + exit 1 + fi +fi +exit 0; diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile index a2798bfd4b77..cf798f4b02b3 100644 --- a/www/netscape7/Makefile +++ b/www/netscape7/Makefile @@ -24,8 +24,7 @@ BROWSER= communicator-linux WRKSRC= ${WRKDIR}/communicator-v472.x86-unknown-linux2.0 -# use fake shell REQ script, since we don't require X aout libs. -PKGREQ= ${.CURDIR}/pkg/REQ +USE_LINUX_LIB= yes MAILCAP= ${.CURDIR}/files/mailcap NSUBDIR= lib/netscape-linux |