style, indentation fixes.

1 files changed, 47 insertions, 50 deletions

diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index e0f44c9c353..ab02631f00e 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.64 2003/07/17 22:55:43 grant Exp $
+# $NetBSD: Makefile.common,v 1.65 2003/08/08 10:02:02 grant Exp $
 #
 # Common include file for communicator and navigator packages
 
@@ -26,28 +26,27 @@ MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/${SUB}/ \
 #
 .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
 PLIST_ARCH=	solaris-sparc
-.if (${OS_VERSION} == 5.5.1) || (${OS_VERSION} == 5.6) || \
-    (${OS_VERSION} == 5.7)
+.  if !empty(OS_VERSION:M5.5.1*) || !empty(OS_VERSION:M5.[67]*)
 NS_VERS=	4.79
 PKGNAME=	${BINNAME}-${NS_VERS}
 DISTUNAME=	sparc-sun-solaris2.5.1
 DIST_DIR_NAME=	supported/sunos551
 WRKNAME=	sparc-sun-solaris2.5.1
 VENDOR_NAME=	Solaris 2.5.1
-.else
+.  else
 DISTUNAME=	sparc-sun-solaris2.8
 DIST_DIR_NAME=	supported/sunos58
 WRKNAME=	sparc-sun-solaris2.8
 VENDOR_NAME=	Solaris 2.8
-.endif
-.if !defined(NS_NO_FLASH)
+.  endif
+.  if !defined(NS_NO_FLASH)
 DEPENDS+=	ns-flash>4.0:../../graphics/ns-flash
-.endif
-#
-.elif (${MACHINE_ARCH} == "alpha")
-.if !exists(/emul/osf1/sbin/loader)
+.  endif
+
+.elif ${MACHINE_ARCH} == "alpha"
+.  if !exists(/emul/osf1/sbin/loader)
 PKG_FAIL_REASON= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
-.endif
+.  endif
 NS_VERS=	4.78
 PKGNAME=	${BINNAME}-${NS_VERS}
 PLIST_ARCH=	osf-alpha
@@ -55,8 +54,8 @@ DISTUNAME=	alpha-dec-osf4.0
 DIST_DIR_NAME=	supported/dec_unix40
 WRKNAME=	alpha-dec-osf4.0
 VENDOR_NAME=	Tru64 UNIX
-#
-.elif (${MACHINE_ARCH} == "i386" && defined(NS_USE_BSDI))
+
+.elif ${MACHINE_ARCH} == "i386" && defined(NS_USE_BSDI)
 NS_VERS=	4.75
 PKGNAME=	${BINNAME}-${NS_VERS}
 PLIST_ARCH=	bsdi-i386
@@ -64,21 +63,21 @@ DISTUNAME=	x86-bsdi-bsd2
 DIST_DIR_NAME=	unsupported/bsdi21
 WRKNAME=	x86-bsdi-bsd2
 VENDOR_NAME=	BSD/OS 2.1
-#
-.elif (${MACHINE_ARCH} == "i386")
+
+.elif ${MACHINE_ARCH} == "i386"
 PLIST_ARCH=	linux-i386
 DISTUNAME=	x86-unknown-linux2.2
 DIST_DIR_NAME=	supported/linux22
 WRKNAME=	x86-unknown-linux2.2
 VENDOR_NAME=	Linux 2.2
-.if !defined(NS_NO_FLASH)
+.  if !defined(NS_NO_FLASH)
 DEPENDS+=	ns-flash>4.0:../../graphics/ns-flash
-.endif
-#
-.elif (((${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")) && defined(NS_USE_SUNOS))
-.if !exists(/emul/sunos/usr/lib/ld.so)
+.  endif
+
+.elif ((${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && defined(NS_USE_SUNOS))
+.  if !exists(/emul/sunos/usr/lib/ld.so)
 PKG_FAIL_REASON= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)"
-.endif
+.  endif
 NS_VERS=	4.61
 PKGNAME=	${BINNAME}-${NS_VERS}
 NS_ENCRYPTION=	export
@@ -89,25 +88,26 @@ DIST_DIR_NAME=	unsupported/sunos413
 WRKNAME=	${DISTUNAME}
 VENDOR_NAME=	SunOS 4.1.3
 MASTER_SITES=	ftp://archive.netscape.com/archive/communicator/${SUB}/
-#
-.elif (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
+
+.elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
 PLIST_ARCH=	solaris-sparc
-.if !exists(/emul/svr4/usr/lib/ld.so.1)
+.  if !exists(/emul/svr4/usr/lib/ld.so.1)
 PKG_FAIL_REASON= "${PKGNAME} requires Solaris libraries - see compat_svr4(8)"
-.endif
+.  endif
 NS_VERS=	4.79
 PKGNAME=	${BINNAME}-${NS_VERS}
 DISTUNAME=      sparc-sun-solaris2.5.1
 DIST_DIR_NAME=  supported/sunos551
 WRKNAME=        sparc-sun-solaris2.5.1
 VENDOR_NAME=    Solaris 2.5.1
-#
-.elif (${MACHINE_ARCH} == "powerpc")
-.if (${BINNAME} == "navigator")
+
+# powerpc is "unusual"
+.elif ${MACHINE_ARCH} == "powerpc"
+.  if ${BINNAME} == "navigator"
 PKG_FAIL_REASON=  "There is no navigator-only package for PowerPC"
 PKG_FAIL_REASON+= "platform.  Please cd to ../communicator and"
 PKG_FAIL_REASON+= "install communicator package instead."
-.endif
+.  endif
 NS_VERS=	4.73
 PKGNAME=	${BINNAME}-${NS_VERS}
 DISTNAME=	netscape-4.7-3.ppc
@@ -124,10 +124,10 @@ SORT=		sort
 RPM2PKG=	rpm2pkg
 RPM2PKGARGS=	${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
 VENDOR_NAME=	# empty.  what should be here?
+
 .else
 PLIST_ARCH=
 .endif
-#
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE?=	http://home.netscape.com/browsers/index.html
@@ -143,17 +143,16 @@ NS_NAME=	${BINNAME}-${NS_VERS}
 PKGNAME?=	${BINNAME}-${NS_VERS}
 DISTNAME?=	${BINNAME}-v${NS_VERS_SHORT}-${NS_ENCRYPTION}.${DISTUNAME}
 
-.if ((${OPSYS} != "Linux") && ((${MACHINE_ARCH} == "i386" && !defined(NS_USE_BSDI)) || ${MACHINE_ARCH} == "powerpc"))
+.if (${OPSYS} != "Linux" && ((${MACHINE_ARCH} == "i386" && !defined(NS_USE_BSDI)) || ${MACHINE_ARCH} == "powerpc"))
 DEPENDS+=	suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=	suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
 
-.if (${BINNAME} != "netscape")
-
+.if ${BINNAME} != "netscape"
 NO_BUILD=	YES
 
-.if (${MACHINE_ARCH} == "powerpc")
-
+# powerpc is "unusual"
+.  if ${MACHINE_ARCH} == "powerpc"
 do-extract:
 	${MKDIR} ${WRKSRC}
 
@@ -172,9 +171,7 @@ do-install:
 	${ECHO} bin/${NS_NAME} >> ${PLIST_SRC}
 	${SORT} -r ${PLIST_SRC} > ${PLIST_SRC}.sorted
 	${MV} ${PLIST_SRC}.sorted ${PLIST_SRC}
-
-.else
-
+.  else
 NS_VERS_SHORT=	${NS_VERS:S/.//}
 SUB=		english/${NS_VERS}/unix/${DIST_DIR_NAME}/${DIST_SDIR_NAME}
 
@@ -193,19 +190,19 @@ PLIST_SUBST+=	NS_VERS=${NS_VERS} LDAP_VERS=${LDAP_VERS} BINNAME=${BINNAME}
 do-install:
 	${INSTALL_DATA_DIR} ${MOZILLA_HOME}/java/classes
 	${INSTALL_SCRIPT} ${WRKSRC}/vreg ${MOZILLA_HOME}
-.for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar jsd10.jar \
-    ldap${LDAP_VERS}.jar resource.jar scd10.jar
+.    for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar \
+       jsd10.jar ldap${LDAP_VERS}.jar resource.jar scd10.jar
 	${INSTALL_DATA} ${WRKSRC}/${file} ${MOZILLA_HOME}/java/classes
-.endfor
+.    endfor
 	cd ${MOZILLA_HOME} ; ${DECOMPRESS_CMD} \
 		${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif | ${PAX} -r
 	cd ${MOZILLA_HOME} ; ${DECOMPRESS_CMD} \
 		${WRKSRC}/netscape-v${NS_VERS_SHORT}.nif | ${PAX} -cr \
 		'*libflashplayer.so' '*ShockwaveFlash.class' '*dynMotif*' \
 		|| ${TRUE}
-.if (${BINNAME} == "communicator")
+.    if ${BINNAME} == "communicator"
 	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/spellchk-v${NS_VERS_SHORT}.nif
-.endif
+.    endif
 
 	${SED} -e 's#@@MOZILLA_HOME@@#${MOZILLA_HOME}#g' \
 	       -e 's#@@NS_PLUGINS_DIR@@#${NS_PLUGINS_DIR}#g' \
@@ -214,27 +211,27 @@ do-install:
 	${RM} -f ${PREFIX}/bin/${BINNAME}
 	${LN} -sf ${NS_NAME} ${PREFIX}/bin/${BINNAME}
 
-.if ${PLIST_ARCH} == "sunos-sparc"
+.    if ${PLIST_ARCH} == "sunos-sparc"
 	# Bizarre magic to handle the NIS and DNS versions. Make DNS default.
 	@${SED} -e 's#MOZILLA_HOME/netscape#MOZILLA_HOME/netscape_nis#g' \
 	    <${WRKDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}_nis.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}_nis.sh \
 	    ${PREFIX}/bin/${NS_NAME}_nis
-.if (${BINNAME} == "communicator")
+.      if ${BINNAME} == "communicator"
 	${LN} -sf ${NS_NAME}_nis ${PREFIX}/bin/netscape_nis
-.endif
+.      endif
 	${MV} ${MOZILLA_HOME}/netscape ${MOZILLA_HOME}/netscape_nis
 	${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape
-.endif
+.    endif
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
 
 	${CHOWN} -R 0:0 ${MOZILLA_HOME}
 	${CHMOD} -R go-w ${MOZILLA_HOME}
-.endif
+.  endif
 
 .endif
 
-.if (${BINNAME} != "netscape")
+.if ${BINNAME} != "netscape"
 USE_BUILDLINK2=	# defined
-.include "../../emulators/suse_linux/Makefile.application"
+.  include "../../emulators/suse_linux/Makefile.application"
 .endif