diff options
| author | Trevor Johnson <trevor@FreeBSD.org> | 2001-03-06 04:04:26 +0000 |
|---|---|---|
| committer | Trevor Johnson <trevor@FreeBSD.org> | 2001-03-06 04:04:26 +0000 |
| commit | 0cdfbcbbba58de648c606202da468aa43155ac59 (patch) | |
| tree | 11e9645bd6e25f2eeac40facbd233bdbab3dc440 | |
| parent | fixes for two libfwf-related compilation problems (see comments in (diff) | |
Instead of running the browser in order to generate the component.reg
and xpti.dat files, use pre-generated copies of those files. This
should make the build more reliable.
Notes
Notes:
svn path=/head/; revision=39110
| -rw-r--r-- | www/linux-netscape6/Makefile | 12 | ||||
| -rw-r--r-- | www/linux-netscape6/distinfo | 1 | ||||
| -rw-r--r-- | www/netscape7/Makefile | 12 | ||||
| -rw-r--r-- | www/netscape7/distinfo | 1 |
4 files changed, 18 insertions, 8 deletions
diff --git a/www/linux-netscape6/Makefile b/www/linux-netscape6/Makefile index e0671b4ce031..05b7ad7260c0 100644 --- a/www/linux-netscape6/Makefile +++ b/www/linux-netscape6/Makefile @@ -68,6 +68,10 @@ DISTFILES= browser.xpi \ # langende.xpi langenfr.xpi langengb.xpi langenjp.xpi talkback.xpi jre.xpi AIM.xpi DIST_SUBDIR= netscape6/english/${PORTVERSION} +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= trevor +PATCHFILES= linux-netscape6-${PORTVERSION}-generated-files.tar.gz + MAINTAINER= trevor@FreeBSD.org BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip @@ -81,7 +85,6 @@ NO_FILTER_SHLIBS= yes ONLY_FOR_ARCHS= i386 USE_XLIB= yes WRKSRC= ${WRKDIR}/netscape-installer/xpi - INSTALL_DIR= ${PREFIX}/lib/linux-netscape6 PLIST= ${WRKDIR}/pkg-plist STARTUP_CMD= netscape6 @@ -98,11 +101,12 @@ do-extract: do-patch: ${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/bin/chrome/user-skins.rdf ${WRKSRC}/bin/chrome/user-locales.rdf ${CP} -p ${FILESDIR}/*rdf ${WRKSRC}/bin/chrome + ${TAR} -C ${WRKSRC}/bin -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} 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. +# - 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} diff --git a/www/linux-netscape6/distinfo b/www/linux-netscape6/distinfo index 68a540d72dab..dbb83e56a33b 100644 --- a/www/linux-netscape6/distinfo +++ b/www/linux-netscape6/distinfo @@ -5,3 +5,4 @@ MD5 (netscape6/english/6.01/mail.xpi) = 84fe2c90d392af7efbc1203dfb119edb MD5 (netscape6/english/6.01/psm.xpi) = f3ebf86a9bef797cdd73d54c377c2a24 MD5 (netscape6/english/6.01/spellchecker.xpi) = 10f02b57ce76fe1c2aeac90c326f5cd1 MD5 (netscape6/english/6.01/xpcom.xpi) = 3802f2b572d61565367e7d720f2552ff +MD5 (netscape6/english/6.01/linux-netscape6-6.01-generated-files.tar.gz) = 6d1ac6abbe5879eba00a88bb229e005e diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile index e0671b4ce031..05b7ad7260c0 100644 --- a/www/netscape7/Makefile +++ b/www/netscape7/Makefile @@ -68,6 +68,10 @@ DISTFILES= browser.xpi \ # langende.xpi langenfr.xpi langengb.xpi langenjp.xpi talkback.xpi jre.xpi AIM.xpi DIST_SUBDIR= netscape6/english/${PORTVERSION} +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= trevor +PATCHFILES= linux-netscape6-${PORTVERSION}-generated-files.tar.gz + MAINTAINER= trevor@FreeBSD.org BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip @@ -81,7 +85,6 @@ NO_FILTER_SHLIBS= yes ONLY_FOR_ARCHS= i386 USE_XLIB= yes WRKSRC= ${WRKDIR}/netscape-installer/xpi - INSTALL_DIR= ${PREFIX}/lib/linux-netscape6 PLIST= ${WRKDIR}/pkg-plist STARTUP_CMD= netscape6 @@ -98,11 +101,12 @@ do-extract: do-patch: ${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/bin/chrome/user-skins.rdf ${WRKSRC}/bin/chrome/user-locales.rdf ${CP} -p ${FILESDIR}/*rdf ${WRKSRC}/bin/chrome + ${TAR} -C ${WRKSRC}/bin -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} 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. +# - 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} diff --git a/www/netscape7/distinfo b/www/netscape7/distinfo index 68a540d72dab..dbb83e56a33b 100644 --- a/www/netscape7/distinfo +++ b/www/netscape7/distinfo @@ -5,3 +5,4 @@ MD5 (netscape6/english/6.01/mail.xpi) = 84fe2c90d392af7efbc1203dfb119edb MD5 (netscape6/english/6.01/psm.xpi) = f3ebf86a9bef797cdd73d54c377c2a24 MD5 (netscape6/english/6.01/spellchecker.xpi) = 10f02b57ce76fe1c2aeac90c326f5cd1 MD5 (netscape6/english/6.01/xpcom.xpi) = 3802f2b572d61565367e7d720f2552ff +MD5 (netscape6/english/6.01/linux-netscape6-6.01-generated-files.tar.gz) = 6d1ac6abbe5879eba00a88bb229e005e |