diff options
-rw-r--r-- | www/mozilla/Makefile | 5 | ||||
-rw-r--r-- | www/mozilla/Makefile.common | 23 | ||||
-rw-r--r-- | www/mozilla/PLIST | 4 | ||||
-rwxr-xr-x | www/mozilla/files/moz-install | 6 | ||||
-rw-r--r-- | www/mozilla/files/mozilla-ELF.in | 2 | ||||
-rw-r--r-- | www/mozilla/files/mozilla-a.out.in | 2 |
6 files changed, 26 insertions, 16 deletions
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index ff69160154f..38d4ac3b8e6 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.105 2002/10/03 15:53:59 taya Exp $ +# $NetBSD: Makefile,v 1.106 2002/10/19 15:00:02 taya Exp $ MOZILLA= mozilla +MOZILLA_BIN= mozilla-bin MOZ_VER= 1.1 PKGREVISION= 1 EXTRACT_SUFX= .tar.gz COMMENT= Open-source version of the Netscape browser +BUILD_SVG= # defined + .include "../../www/mozilla/Makefile.common" diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 4a5e8d0ad74..b09a956676b 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,12 +1,12 @@ -# $NetBSD: Makefile.common,v 1.2 2002/10/03 16:08:13 taya Exp $ +# $NetBSD: Makefile.common,v 1.3 2002/10/19 15:00:02 taya Exp $ -DISTNAME= mozilla-source-${MOZ_VER} +DISTNAME?= mozilla-source-${MOZ_VER} PKGNAME= ${MOZILLA}-${MOZ_VER} MASTER_SITES= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_VER}/src/} CATEGORIES= www MAINTAINER= taya@netbsd.org -HOMEPAGE= http://www.mozilla.org/ +HOMEPAGE?= http://www.mozilla.org/ WRKSRC= ${WRKDIR}/mozilla FILESDIR= "../../www/mozilla/files" @@ -18,13 +18,12 @@ USE_PERL5= build USE_GMAKE= yes USE_X11BASE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-tests \ +CONFIGURE_ARGS+= --disable-tests \ --disable-debug \ --with-system-jpeg=${BUILDLINK_PREFIX.jpeg} \ --with-system-png=${BUILDLINK_PREFIX.png} \ --enable-mathml \ - --enable-crypto \ - --enable-svg + --enable-crypto SHAREMODE?= 644 ALL_TARGET= # empty @@ -46,15 +45,20 @@ NOT_FOR_PLATFORM= NetBSD-1.4.*-* NetBSD-*-m68k MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA} MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} -MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 -CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 LDFLAGS+= -Wl,-R${MOZ_LIBDIR} +.ifdef BUILD_SVG +MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 +CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 +CONFIGURE_ARGS+= --enable-svg +.endif + # avoid creating a .mozilla directory in the users home # directory SCRIPTS_ENV+= HOME="${WRKDIR}" PLIST_SUBST+= MOZILLA="${MOZILLA}" +PLIST_SUBST+= MOZILLA_BIN="${MOZILLA_BIN}" .if ${OBJECT_FMT} == "ELF" SO_SUFFIX= "so" .else @@ -75,6 +79,7 @@ SCRIPTS_ENV+= BINGRP=${BINGRP} SCRIPTS_ENV+= BINMODE=${BINMODE} SCRIPTS_ENV+= SETENV=${SETENV} SCRIPTS_ENV+= MOZILLA=${MOZILLA} +SCRIPTS_ENV+= MOZILLA_BIN=${MOZILLA_BIN} SCRIPTS_ENV+= SO_SUFFIX=${SO_SUFFIX} PTHREAD_OPTS+= native optional @@ -104,6 +109,8 @@ do-install: .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") CONFIGURE_ARGS+= --without-pthreads +.else +CONFIGURE_ARGS+= --with-pthreads .endif .include "../../mk/autoconf.mk" diff --git a/www/mozilla/PLIST b/www/mozilla/PLIST index d9f92f32125..51b920a16e4 100644 --- a/www/mozilla/PLIST +++ b/www/mozilla/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2002/08/29 15:11:07 taya Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/10/19 15:00:02 taya Exp $ bin/${MOZILLA} @comment begin PROGRAMS +lib/${MOZILLA}/${MOZILLA_BIN} lib/${MOZILLA}/dirver -lib/${MOZILLA}/mozilla-bin lib/${MOZILLA}/nsinstall lib/${MOZILLA}/regExport lib/${MOZILLA}/regchrome diff --git a/www/mozilla/files/moz-install b/www/mozilla/files/moz-install index cfe010b0e4c..0d15cfc4cbf 100755 --- a/www/mozilla/files/moz-install +++ b/www/mozilla/files/moz-install @@ -1,8 +1,8 @@ #!/bin/sh # -# $NetBSD: moz-install,v 1.2 2002/08/29 15:11:12 taya Exp $ +# $NetBSD: moz-install,v 1.3 2002/10/19 15:00:02 taya Exp $ -${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${PREFIX}/bin/${MOZILLA} +${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${PREFIX}/bin/${MOZILLA} ${CHOWN} ${BINOWN} ${PREFIX}/bin/${MOZILLA} ${CHGRP} ${BINGRP} ${PREFIX}/bin/${MOZILLA} ${CHMOD} ${BINMODE} ${PREFIX}/bin/${MOZILLA} @@ -13,7 +13,7 @@ ${CHMOD} ${BINMODE} ${PREFIX}/bin/${MOZILLA} TMP_PLIST=/tmp/TMP_PLIST.$$ trap "${RM} -f ${TMP_PLIST}" 1 2 3 10 11 -${SED} -e "s/\${MOZILLA}/${MOZILLA}/g" -e "s/\${SO_SUFFIX}/${SO_SUFFIX}/" < ${PLIST_SRC} > ${TMP_PLIST} +${SED} -e "s/\${MOZILLA}/${MOZILLA}/g" -e "s/\${SO_SUFFIX}/${SO_SUFFIX}/" -e "s/\${MOZILLA_BIN}/${MOZILLA_BIN}/g" < ${PLIST_SRC} > ${TMP_PLIST} # make directories for i in `${SED} -n -e '/^@comment begin DIRS$/,/^@comment end DIRS$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment | ${SED} -e 's/^@dirrm//'` ; do diff --git a/www/mozilla/files/mozilla-ELF.in b/www/mozilla/files/mozilla-ELF.in index e576957166a..99470536423 100644 --- a/www/mozilla/files/mozilla-ELF.in +++ b/www/mozilla/files/mozilla-ELF.in @@ -1,4 +1,4 @@ #!/bin/sh MOZILLA_FIVE_HOME=@PREFIX@/lib/@MOZILLA@ export MOZILLA_FIVE_HOME -exec @PREFIX@/lib/@MOZILLA@/mozilla-bin "$@" +exec @PREFIX@/lib/@MOZILLA@/@MOZILLA_BIN@ "$@" diff --git a/www/mozilla/files/mozilla-a.out.in b/www/mozilla/files/mozilla-a.out.in index 29e8e97e1e5..72af99363b6 100644 --- a/www/mozilla/files/mozilla-a.out.in +++ b/www/mozilla/files/mozilla-a.out.in @@ -3,4 +3,4 @@ MOZILLA_FIVE_HOME=@PREFIX@/lib/@MOZILLA@ LD_LIBRARY_PATH=@PREFIX@/lib/@MOZILLA@ export MOZILLA_FIVE_HOME export LD_LIBRARY_PATH -exec @PREFIX@/lib/@MOZILLA@/mozilla-bin "$@" +exec @PREFIX@/lib/@MOZILLA@/@MOZILLA_BIN@ "$@" |