diff options
author | ghen <ghen> | 2006-02-06 00:25:06 +0000 |
---|---|---|
committer | ghen <ghen> | 2006-02-06 00:25:06 +0000 |
commit | 4b03ca1f6b34b4603d44e1796cfa61e1221e4519 (patch) | |
tree | 89d018154fa5445e4614af8e401f1c992d876dac | |
parent | 5db454a3b53f50a335f7f76570971f3df136c60f (diff) | |
download | pkgsrc-4b03ca1f6b34b4603d44e1796cfa61e1221e4519.tar.gz |
Reindent + fix some pkglint warnings.
-rw-r--r-- | www/mozilla-gtk2/Makefile | 34 | ||||
-rw-r--r-- | www/mozilla-gtk2/buildlink3.mk | 14 | ||||
-rw-r--r-- | www/mozilla/Makefile | 26 | ||||
-rw-r--r-- | www/mozilla/Makefile.common | 154 | ||||
-rw-r--r-- | www/mozilla/buildlink3.mk | 14 | ||||
-rw-r--r-- | www/mozilla/options.mk | 6 |
6 files changed, 124 insertions, 124 deletions
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile index a856afe9abf..cc3e9e31787 100644 --- a/www/mozilla-gtk2/Makefile +++ b/www/mozilla-gtk2/Makefile @@ -1,26 +1,26 @@ -# $NetBSD: Makefile,v 1.33 2006/02/05 23:11:26 joerg Exp $ +# $NetBSD: Makefile,v 1.34 2006/02/06 00:25:06 ghen Exp $ -MOZILLA= mozilla-gtk2 -MOZILLA_BIN= mozilla-bin -MOZ_VER= 1.7.12 -PKGREVISION= 3 -EXTRACT_SUFX= .tar.bz2 +MOZILLA= mozilla-gtk2 +MOZILLA_BIN= mozilla-bin +MOZ_VER= 1.7.12 +PKGREVISION= 3 +EXTRACT_SUFX= .tar.bz2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -#DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +#DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2 #SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL} -DIST_SUBDIR= mozilla-1.7.12 -DISTINFO_FILE= ${.CURDIR}/../../www/mozilla/distinfo -PATCHDIR= ${.CURDIR}/../../www/mozilla/patches -FILESDIR= ${.CURDIR}/../../www/mozilla/files +DIST_SUBDIR= mozilla-1.7.12 +DISTINFO_FILE= ${.CURDIR}/../../www/mozilla/distinfo +PATCHDIR= ${.CURDIR}/../../www/mozilla/patches +FILESDIR= ${.CURDIR}/../../www/mozilla/files -COMMENT= Full featured gecko-based browser built with GTK2 +COMMENT= Full featured gecko-based browser built with GTK2 -BUILD_SVG= # defined -BUILD_MATHML= # defined -BUILD_CALENDAR= # defined +BUILD_SVG= # yes +BUILD_MATHML= # yes +BUILD_CALENDAR= # yes -_MOZILLA_USE_GTK2= # defined +_MOZILLA_USE_GTK2= # yes MOZILLA_USE_XFT= YES .include "../../www/mozilla/Makefile.common" diff --git a/www/mozilla-gtk2/buildlink3.mk b/www/mozilla-gtk2/buildlink3.mk index 72415c3b989..67caea8800e 100644 --- a/www/mozilla-gtk2/buildlink3.mk +++ b/www/mozilla-gtk2/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.14 2006/02/05 23:11:26 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2006/02/06 00:25:06 ghen Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MOZILLA_GTK2_BUILDLINK3_MK:= ${MOZILLA_GTK2_BUILDLINK3_MK}+ +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +MOZILLA_GTK2_BUILDLINK3_MK:= ${MOZILLA_GTK2_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mozilla-gtk2 +BUILDLINK_DEPENDS+= mozilla-gtk2 .endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmozilla-gtk2} -BUILDLINK_PACKAGES+= mozilla-gtk2 +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmozilla-gtk2} +BUILDLINK_PACKAGES+= mozilla-gtk2 .if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.7.5 @@ -22,4 +22,4 @@ BUILDLINK_PKGSRCDIR.mozilla-gtk2?= ../../www/mozilla-gtk2 .include "../../net/libIDL/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index d6514a14af9..bc3f08b7fce 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,22 +1,22 @@ -# $NetBSD: Makefile,v 1.155 2006/02/05 23:11:25 joerg Exp $ +# $NetBSD: Makefile,v 1.156 2006/02/06 00:25:06 ghen Exp $ -MOZILLA= mozilla -MOZILLA_BIN= mozilla-bin -MOZ_VER= 1.7.12 -PKGREVISION= 3 -EXTRACT_SUFX= .tar.bz2 +MOZILLA= mozilla +MOZILLA_BIN= mozilla-bin +MOZ_VER= 1.7.12 +PKGREVISION= 3 +EXTRACT_SUFX= .tar.bz2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -#DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +#DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2 #SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL} -DIST_SUBDIR= mozilla-1.7.12 +DIST_SUBDIR= mozilla-1.7.12 -COMMENT= Full featured gecko-based browser +COMMENT= Full featured gecko-based browser -BUILD_SVG= # defined -BUILD_MATHML= # defined -BUILD_CALENDAR= # defined +BUILD_SVG= # yes +BUILD_MATHML= # yes +BUILD_CALENDAR= # yes .include "../../www/mozilla/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index a7c374be7ef..298eed0c429 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,22 +1,22 @@ -# $NetBSD: Makefile.common,v 1.68 2006/02/05 14:43:59 ghen Exp $ +# $NetBSD: Makefile.common,v 1.69 2006/02/06 00:25:06 ghen Exp $ -MOZ_DIST_VER?= ${MOZ_VER} -DISTNAME?= mozilla-${MOZ_DIST_VER}-source -PKGNAME= ${MOZILLA}-${MOZ_VER} -MASTER_SITES?= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_DIST_VER}/source/} -CATEGORIES?= www +MOZ_DIST_VER?= ${MOZ_VER} +DISTNAME?= mozilla-${MOZ_DIST_VER}-source +PKGNAME= ${MOZILLA}-${MOZ_VER} +MASTER_SITES?= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_DIST_VER}/source/} +CATEGORIES?= www -MAINTAINER= taya@NetBSD.org -HOMEPAGE?= http://www.mozilla.org/ +MAINTAINER= taya@NetBSD.org +HOMEPAGE?= http://www.mozilla.org/ -FILESDIR= ${.CURDIR}/../../www/mozilla/files +FILESDIR= ${.CURDIR}/../../www/mozilla/files -BUILD_DEPENDS+= zip>=2.3:../../archivers/zip +BUILD_DEPENDS+= zip>=2.3:../../archivers/zip -WRKSRC= ${WRKDIR}/mozilla -USE_LANGUAGES= c c++ -USE_TOOLS+= autoconf213 gmake perl pkg-config -GNU_CONFIGURE= yes +WRKSRC= ${WRKDIR}/mozilla +USE_LANGUAGES= c c++ +USE_TOOLS+= autoconf213 gmake perl pkg-config +GNU_CONFIGURE= yes INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../www/mozilla/INSTALL @@ -40,40 +40,40 @@ PKGCONFIG_OVERRIDE+= build/unix/mozilla-xpcom.pc # rpaths until this has happened. PKGCONFIG_OVERRIDE_STAGE= post-build -CONFIGURE_ARGS+= --disable-tests \ - --disable-pedantic \ - --with-system-jpeg=${BUILDLINK_PREFIX.jpeg} \ - --with-system-png=${BUILDLINK_PREFIX.png} \ - --enable-crypto +CONFIGURE_ARGS+= --disable-tests +CONFIGURE_ARGS+= --disable-pedantic +CONFIGURE_ARGS+= --with-system-jpeg=${BUILDLINK_PREFIX.jpeg} +CONFIGURE_ARGS+= --with-system-png=${BUILDLINK_PREFIX.png} +CONFIGURE_ARGS+= --enable-crypto -SHAREMODE?= 644 -BUILD_TARGET= # empty +SHAREMODE?= 644 +BUILD_TARGET= # empty UNLIMIT_RESOURCES= datasize memorysize stacksize -.include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .if defined(_MOZILLA_USE_GTK2) -.include "../../net/libIDL/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs +.include "../../net/libIDL/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs .else -.include "../../graphics/gdk-pixbuf/buildlink3.mk" -.include "../../net/ORBit/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -CONFIGURE_ARGS+= --enable-default-toolkit=gtk +.include "../../graphics/gdk-pixbuf/buildlink3.mk" +.include "../../net/ORBit/buildlink3.mk" +.include "../../x11/gtk/buildlink3.mk" +CONFIGURE_ARGS+= --enable-default-toolkit=gtk .endif # NetBSD-*-m68k builds, but "regchrome" dumps core. NOT_FOR_PLATFORM= NetBSD-1.4.*-* NetBSD-*-m68k -MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA:Q} +MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA:Q} -MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA} -MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q} -CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q} -LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR} +MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA} +MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q} +CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q} +LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR} .if defined(BUILD_SVG) MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 @@ -97,52 +97,52 @@ CONFIGURE_ARGS+= --enable-xinerama # avoid creating a .mozilla directory in the users home # directory -SCRIPTS_ENV+= HOME="${WRKDIR}" +SCRIPTS_ENV+= HOME="${WRKDIR:Q}" -PLIST_SUBST+= MOZILLA=${MOZILLA:Q} -PLIST_SUBST+= MOZILLA_BIN=${MOZILLA_BIN:Q} -FILES_SUBST+= MOZILLA=${MOZILLA:Q} -FILES_SUBST+= MOZILLA_BIN=${MOZILLA_BIN:Q} +PLIST_SUBST+= MOZILLA=${MOZILLA:Q} +PLIST_SUBST+= MOZILLA_BIN=${MOZILLA_BIN:Q} +FILES_SUBST+= MOZILLA=${MOZILLA:Q} +FILES_SUBST+= MOZILLA_BIN=${MOZILLA_BIN:Q} .if ${OBJECT_FMT} == "ELF" -SO_SUFFIX= so -SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_PROGRAM}" +SO_SUFFIX= so +SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_PROGRAM:Q}" .elif ${OBJECT_FMT} == "Mach-O" -SO_SUFFIX= dylib -SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_LIB}" +SO_SUFFIX= dylib +SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_LIB:Q}" .else -SO_SUFFIX= so.1.0 -SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_PROGRAM}" +SO_SUFFIX= so.1.0 +SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_PROGRAM:Q}" .endif -PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} +PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} .if (${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc") SUNOSLIB= .else -SUNOSLIB= "@comment " +SUNOSLIB= "@comment " .endif -PLIST_SUBST+= SUNOSLIB=${SUNOSLIB} - -SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT:Q} -SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC:Q} -SCRIPTS_ENV+= SED=${SED:Q} -SCRIPTS_ENV+= RM=${RM:Q} -SCRIPTS_ENV+= EGREP=${EGREP:Q} -SCRIPTS_ENV+= CHOWN=${CHOWN:Q} -SCRIPTS_ENV+= CHGRP=${CHGRP:Q} -SCRIPTS_ENV+= CHMOD=${CHMOD:Q} -SCRIPTS_ENV+= BINOWN=${BINOWN:Q} -SCRIPTS_ENV+= BINGRP=${BINGRP:Q} -SCRIPTS_ENV+= BINMODE=${BINMODE:Q} -SCRIPTS_ENV+= SETENV=${SETENV:Q} -SCRIPTS_ENV+= MOZILLA=${MOZILLA:Q} -SCRIPTS_ENV+= MOZILLA_BIN=${MOZILLA_BIN:Q} -SCRIPTS_ENV+= SO_SUFFIX=${SO_SUFFIX:Q} -SCRIPTS_ENV+= SUNOSLIB=${SUNOSLIB} - -PTHREAD_OPTS+= native optional +PLIST_SUBST+= SUNOSLIB=${SUNOSLIB:Q} + +SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT:Q} +SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC:Q} +SCRIPTS_ENV+= SED=${SED:Q} +SCRIPTS_ENV+= RM=${RM:Q} +SCRIPTS_ENV+= EGREP=${EGREP:Q} +SCRIPTS_ENV+= CHOWN=${CHOWN:Q} +SCRIPTS_ENV+= CHGRP=${CHGRP:Q} +SCRIPTS_ENV+= CHMOD=${CHMOD:Q} +SCRIPTS_ENV+= BINOWN=${BINOWN:Q} +SCRIPTS_ENV+= BINGRP=${BINGRP:Q} +SCRIPTS_ENV+= BINMODE=${BINMODE:Q} +SCRIPTS_ENV+= SETENV=${SETENV:Q} +SCRIPTS_ENV+= MOZILLA=${MOZILLA:Q} +SCRIPTS_ENV+= MOZILLA_BIN=${MOZILLA_BIN:Q} +SCRIPTS_ENV+= SO_SUFFIX=${SO_SUFFIX:Q} +SCRIPTS_ENV+= SUNOSLIB=${SUNOSLIB:Q} + +PTHREAD_OPTS+= native optional .if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64") -GCC_REQD+= 3.4 +GCC_REQD+= 3.4 .endif .include "../../mk/compiler.mk" @@ -151,16 +151,16 @@ COPTS?= -O2 .endif CONFIGURE_ARGS+= --enable-optimize=${COPTS:Q} -XPTCFILES+= xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s -XPTCFILES+= xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp +XPTCFILES+= xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s +XPTCFILES+= xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp .if ${OPSYS} == "Darwin" BUILDLINK_PASSTHRU_DIRS+=/Developer .endif post-extract: -.for F in ${XPTCFILES} - ${CP} ${FILESDIR}/${F} ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/${F} +.for f in ${XPTCFILES} + ${CP} ${FILESDIR}/${f} ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/${f} .endfor pre-configure: @@ -180,9 +180,9 @@ do-install: .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -CONFIGURE_ARGS+= --without-pthreads +CONFIGURE_ARGS+= --without-pthreads .else -CONFIGURE_ARGS+= --with-pthreads +CONFIGURE_ARGS+= --with-pthreads .endif .if ${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h) @@ -197,6 +197,6 @@ SUBST_STAGE.pc= post-extract SUBST_FILES.pc= build/unix/*.pc.in SUBST_SED.pc= -e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \ -e "s|%libdir%|${PREFIX}/lib/${MOZILLA}|g" -SUBST_MESSAGE.pc= "Fixing pkgconfig files." +SUBST_MESSAGE.pc= Fixing pkgconfig files. .include "../../www/mozilla/options.mk" diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk index a81677a92f0..cdeb556d700 100644 --- a/www/mozilla/buildlink3.mk +++ b/www/mozilla/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:11:25 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2006/02/06 00:25:06 ghen Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -MOZILLA_BUILDLINK3_MK:= ${MOZILLA_BUILDLINK3_MK}+ +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +MOZILLA_BUILDLINK3_MK:= ${MOZILLA_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= mozilla +BUILDLINK_DEPENDS+= mozilla .endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmozilla} -BUILDLINK_PACKAGES+= mozilla +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmozilla} +BUILDLINK_PACKAGES+= mozilla .if !empty(MOZILLA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.mozilla+= mozilla>=1.7.5 @@ -23,4 +23,4 @@ BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla .include "../../net/ORBit/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/mozilla/options.mk b/www/mozilla/options.mk index c1a90d10c75..03defbedc86 100644 --- a/www/mozilla/options.mk +++ b/www/mozilla/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.4 2006/02/05 21:15:26 ghen Exp $ +# $NetBSD: options.mk,v 1.5 2006/02/06 00:25:06 ghen Exp $ PKG_OPTIONS_VAR = PKG_OPTIONS.gecko PKG_SUPPORTED_OPTIONS = debug -.if( ${MOZILLA_BIN} == "firefox-bin" || ${MOZILLA_BIN} == "thunderbird-bin" ) +.if ( ${MOZILLA_BIN} == "firefox-bin" || ${MOZILLA_BIN} == "thunderbird-bin" ) PKG_SUPPORTED_OPTIONS += official-mozilla-branding .endif @@ -12,7 +12,7 @@ PKG_SUPPORTED_OPTIONS += official-mozilla-branding # this .if test looks backward, but the missing options disables debug, # so it is correct .if empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-debug .endif # Enable Official mozilla.org Branding for Firefox. |