Date: Fri, 10 Mar 2000 00:56:40 +0900 From: sada@FreeBSD.org To: freebsd-ports@FreeBSD.ORG, obrien@FreeBSD.org, reg@FreeBSD.org, girgen@partitur.se Cc: sada@FreeBSD.org Subject: ports/www/netscape4-communicator/REQ Message-ID: <20000310005640O.sada@rr.iij4u.or.jp>
next in thread | raw e-mail | index | archive | help
Hello.
Obrien, your last commitment to
ports/www/netscape4-communicator/pkg/REQ (2000/01/07 16:32:07)
broke library warning message for package users,
because pkg_add never present ARCH environment.
How to repeat: pkg_add the ports on a clean FreeBSD box.
Jeremy's XFree86-aoutlib must have same problem.
I'm planning to apply below patches.
As usual, comments are welcome :)
--
Index: linux-netscape47-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/linux-netscape47-communicator/Makefile,v
retrieving revision 1.18
diff -u -w -r1.18 Makefile
--- linux-netscape47-communicator/Makefile 2000/03/04 23:58:11 1.18
+++ linux-netscape47-communicator/Makefile 2000/03/09 13:24:08
@@ -24,8 +24,7 @@
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
Index: netscape4-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/netscape4-communicator/Makefile,v
retrieving revision 1.61
diff -u -w -r1.61 Makefile
--- netscape4-communicator/Makefile 2000/03/07 07:23:32 1.61
+++ netscape4-communicator/Makefile 2000/03/09 13:47:10
@@ -13,8 +13,6 @@
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 @@
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 @@
RESTRICTED= "Contains strong cryptography"
.endif
+.if !defined(_PREMKINCLUDED)
+.include <bsd.port.pre.mk>
+.endif
+
+.if (${ARCH} == "i386") && !defined(USE_LINUX_LIB)
+NEED_AOUT= 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 @@
${CHMOD} +x ${WRKSRC}/netscape
${ECHO} -n ${INFILE_HEAD},${NDIR} >${WRKSRC}/infile
+.if defined(NEED_AOUT)
pre-install:
PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
+.endif
do-install:
${MKDIR} ${NDIR}/java/classes
@@ -104,7 +113,7 @@
${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>
Index: netscape4-communicator/pkg/REQ
===================================================================
RCS file: REQ
diff -N REQ
--- /tmp/cvsdr1129 Thu Mar 9 22:50:39 2000
+++ /dev/null Thu Mar 9 19:14:45 2000
@@ -1,28 +0,0 @@
-#!/bin/sh
-env=/usr/bin/env
-fgrep=/usr/bin/fgrep
-ldconfig=/sbin/ldconfig
-if [ x$2 = xINSTALL ]; then
- if [ x$ARCH = i386 ]; then
- $env OBJFORMAT=aout $ldconfig -r | $fgrep -q -e '-lc.3'
- if [ $? -ne 0 ]; then
- cat <<END
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ There are no aout libs on this machine. Install compat22 distribution. +
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-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
-fi
-exit 0;
-
Index: netscape4-communicator/pkg/REQ.aout
===================================================================
RCS file: REQ.aout
diff -N REQ.aout
--- /dev/null Thu Mar 9 19:14:45 2000
+++ REQ.aout Thu Mar 9 22:49:12 2000
@@ -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;
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000310005640O.sada>