diff options
author | trevor <trevor@FreeBSD.org> | 2002-03-04 10:11:01 +0000 |
---|---|---|
committer | trevor <trevor@FreeBSD.org> | 2002-03-04 10:11:01 +0000 |
commit | cacff94bde1be6b6afd262caf88eb576c6b8b19e (patch) | |
tree | f69522d4304170f22e4ad68b872d1fdbd54ae574 /www/netscape7 | |
parent | cc0d0412aab32294d013efec78305ec19dc8fd42 (diff) | |
download | FreeBSD-ports-cacff94bde1be6b6afd262caf88eb576c6b8b19e.zip FreeBSD-ports-cacff94bde1be6b6afd262caf88eb576c6b8b19e.tar.gz |
Generate all three lines of the netscape6 script (STARTUP_CMD) within the Makefile.
Diffstat (limited to 'www/netscape7')
-rw-r--r-- | www/netscape7/Makefile | 12 | ||||
-rw-r--r-- | www/netscape7/files/start.sh | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile index b1bd6f1..79970a0 100644 --- a/www/netscape7/Makefile +++ b/www/netscape7/Makefile @@ -67,7 +67,7 @@ USE_XLIB= yes WRKSRC= ${WRKDIR}/netscape-installer/xpi INSTALL_DIR= ${PREFIX}/lib/linux-netscape6 PLIST= ${WRKDIR}/pkg-plist -STARTUP_CMD= netscape6 +STARTUP_CMD= ${WRKDIR}/netscape6 .if !defined(BATCH) IS_INTERACTIVE= yes @@ -146,11 +146,13 @@ do-configure: # - kldload linux # ${SETENV} $DISPLAY="NONE" ${WRKSRC}/bin/netscape file:///dev/null # @${ECHO} \"Factory not found\" and \"cannot open display\" errors here are normal. - ${SED} -e "s;%%INSTALL_DIR%%;${INSTALL_DIR};g" \ - ${FILESDIR}/start.sh >${WRKDIR}/${STARTUP_CMD} + ${ECHO_CMD} "#!/bin/sh" > ${STARTUP_CMD} + ${ECHO_CMD} -n "cd " >> ${STARTUP_CMD} + ${ECHO_CMD} ${INSTALL_DIR} >> ${STARTUP_CMD} + ${ECHO_CMD} "exec ./netscape" >> ${STARTUP_CMD} pre-install: - ${ECHO_CMD} bin/${STARTUP_CMD} > ${PLIST} + ${ECHO_CMD} bin/netscape6 > ${PLIST} cd ${WRKSRC}/bin; for i in `find * \! -type d | sort`; do \ ${ECHO_CMD} lib/linux-netscape6/$${i} >> ${PLIST}; \ done @@ -171,7 +173,7 @@ pre-package: do-install: ${MKDIR} ${INSTALL_DIR} ${CP} -Rp ${WRKSRC}/bin/* ${WRKSRC}/plugins ${INSTALL_DIR} - ${INSTALL_SCRIPT} ${WRKDIR}/${STARTUP_CMD} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${STARTUP_CMD} ${PREFIX}/bin post-install: ${CAT} ${PKGMESSAGE} diff --git a/www/netscape7/files/start.sh b/www/netscape7/files/start.sh deleted file mode 100644 index 58f1fb9..0000000 --- a/www/netscape7/files/start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd %%INSTALL_DIR%% -exec ./netscape |