* As per discussion with Emmanuel Dreyfus, install the package into /usr/pkg,

  not /usr/pkg/emul/linux/usr on powerpc.  This requires rpm2pkg-1.2.
* Provide "communicator-4.73" wrapper shell script and "communicator" symbolic
  link to point it.  Original "netscape" script still exists.

2 files changed, 34 insertions, 4 deletions

diff --git a/www/communicator/files/communicator.sh.linux-powerpc b/www/communicator/files/communicator.sh.linux-powerpc
new file mode 100755
index 00000000000..2cc66971a60
--- /dev/null
+++ b/www/communicator/files/communicator.sh.linux-powerpc
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# $NetBSD: communicator.sh.linux-powerpc,v 1.1 2001/03/29 14:03:11 kei Exp $
+
+PREFIX=@PREFIX@
+BINNAME=@BINNAME@
+
+if [ -z "$*" ]; then
+	HOMEPAGE=$HOME/public_html/index.html
+	if [ -f $HOME/.netscape/preferences.js ]; then
+		if grep "browser.startup.homepage" \
+		    $HOME/.netscape/preferences.js > /dev/null; then
+			HOMEPAGE=""
+		fi
+	fi
+	exec $PREFIX/lib/netscape/netscape-$BINNAME $HOMEPAGE
+else
+	exec $PREFIX/lib/netscape/netscape-$BINNAME $*
+fi
+
+echo "An error occurred running and $PREFIX/lib/netscape/netscape-$BINNAME."
+exit 1
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 292d5f20781..3e9950698ce 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2001/03/27 03:20:24 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.33 2001/03/29 14:03:11 kei Exp $
 #
 # Common include file for communicator and navigator packages
 
@@ -93,8 +93,7 @@ EMULSUBDIR=	emul/linux
 EMULDIR=	${PREFIX}/${EMULSUBDIR}
 SORT=		sort
 RPM2PKG=	rpm2pkg
-RPM2PKGARGS=	-d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR}
-RPM2PKGARGS+=	${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+RPM2PKGARGS=	${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
 VENDER_NAME=	# empty.  what should be here?
 .endif
 #
@@ -124,7 +123,16 @@ do-extract:
 do-install:
 	${CP} ${PKGDIR}/DESCR.linux-powerpc ${WRKDIR}
 	${RM} -f ${PLIST_SRC}
-	${RPM2PKG} -d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR} ${RPM2PKGARGS}
+	${RPM2PKG} -d ${PREFIX} -f ${PLIST_SRC} -s 1 ${RPM2PKGARGS}
+
+	${SED} -e 's#@BINNAME@#${BINNAME}#g' \
+	       -e 's#@PREFIX@#${PREFIX}#g' \
+	    <${FILESDIR}/${BINNAME}.sh.linux-powerpc >${WRKDIR}/${BINNAME}.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${NS_NAME}
+	${RM} -f ${PREFIX}/bin/${BINNAME}
+	${LN} -sf ${NS_NAME} ${PREFIX}/bin/${BINNAME}
+	${ECHO} bin/${BINNAME} >> ${PLIST_SRC}
+	${ECHO} bin/${NS_NAME} >> ${PLIST_SRC}
 	${SORT} -r ${PLIST_SRC} > ${PLIST_SRC}.sorted
 	${MV} ${PLIST_SRC}.sorted ${PLIST_SRC}