Fixed many pkglint warnings.

3 files changed, 22 insertions, 26 deletions

diff --git a/lang/scsl-jre15/Makefile b/lang/scsl-jre15/Makefile
index b7e9cfd9664..b9408372198 100644
--- a/lang/scsl-jre15/Makefile
+++ b/lang/scsl-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/15 22:13:59 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/06/18 08:45:56 rillig Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -19,8 +19,8 @@ REQD_DIRS+=	${JAVA_HOME}/lib/images/cursors
 REQD_DIRS+=	${JAVA_HOME}/lib/security
 CONF_FILES=	# empty
 .sinclude "sfiles.mk"
-.for FILE in ${SFILES}
-CONF_FILES+=	${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
+.for f in ${SFILES}
+CONF_FILES+=	${JAVA_HOME}/lib/${f}.default ${JAVA_HOME}/lib/${f}
 .endfor
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.scsl-jre15
@@ -49,19 +49,21 @@ post-extract:
 	${TOUCH} ${WRKSRC}/.systemPrefs/.systemRootModFile
 
 do-configure:
+	set -e;								\
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
-		${MV} -f $$file $$file.default;				\
+		${MV} -f "$$file" "$$file".default;			\
 	done
-	@${ECHO} 'CONF_FILES="${CONF_FILES}"' >${WRKDIR}/HEADER.tmpl
+	@${ECHO} "CONF_FILES="${CONF_FILES:Q:Q} >${WRKDIR}/HEADER.tmpl
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
-	cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security
+	cd ${WRKDIR}/jce && ${PAX} -rw -pp -v . ${WRKSRC}/lib/security
 .endif
 
 #
 # re-create sfiles.mk from properties and config files
 #
+.PHONY: makesfiles
 makesfiles:
 	${ECHO} >  sfiles.mk '#	$$Net''BSD$$'
 	${ECHO} >> sfiles.mk '#'
diff --git a/lang/scsl-jre15/Makefile.common b/lang/scsl-jre15/Makefile.common
index df0bdad63bd..602811e4f20 100644
--- a/lang/scsl-jre15/Makefile.common
+++ b/lang/scsl-jre15/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2006/05/15 19:44:07 tv Exp $
+# $NetBSD: Makefile.common,v 1.2 2006/06/18 08:45:56 rillig Exp $
 
 DIST_VER=	1_5_0-p3-bin-duh1
 PKG_VER=	${DIST_VER:S/_/./g:S/-p/p/:S/-bin-duh/./}
@@ -38,24 +38,18 @@ EXTRACT_ENV+=	UNPACK200_FLAGS=-Htrue
 
 NO_MTREE=	yes	# since we change PREFIX
 
-_FETCH_MESSAGE= 							\
-	${ECHO} "======================================================================"; \
-	${ECHO} ; 							\
-	${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing";	\
-	${ECHO} " ${DOWNLOAD_NAME} must be fetched into:";		\
-	${ECHO} "	${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"; 	\
-	${ECHO} " from:"; 						\
-	${ECHO} "	${DOWNLOAD}";					\
-	${ECHO} ; \
-	${ECHO} " Click ${SHORT_NAME} in the ${OPSYS}/${MACHINE_ARCH} row for version ${DIST_VER:S/_/./g:S/-bin-/-/},";	\
-	${ECHO} " then read and accept the license to start the download."; \
-	${ECHO} ; 							\
-	${ECHO} "======================================================================"
+FETCH_MESSAGE=	"The file ${DISTNAME}${EXTRACT_SUFX} containing"
+FETCH_MESSAGE+=	"${DOWNLOAD_NAME} must be fetched into:"
+FETCH_MESSAGE+=	"	${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"
+FETCH_MESSAGE+=	"from:"
+FETCH_MESSAGE+=	"	${DOWNLOAD}"
+FETCH_MESSAGE+=	""
+FETCH_MESSAGE+=	"Click ${SHORT_NAME} in the ${OPSYS}/${MACHINE_ARCH} row for version ${DIST_VER:S/_/./g:S/-bin-/-/},"
+FETCH_MESSAGE+=	"then read and accept the license to start the download."
 
 post-fetch:
-	@if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then	\
-		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
-	fi
+	${TEST} -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}		\
+	|| ${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
 do-build:	# nothing
 
diff --git a/lang/scsl-jre15/buildlink3.mk b/lang/scsl-jre15/buildlink3.mk
index 4036867a3e1..65a13ce9f89 100644
--- a/lang/scsl-jre15/buildlink3.mk
+++ b/lang/scsl-jre15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/05/15 19:51:53 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/06/18 08:45:56 rillig Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SCSL_JRE15_BUILDLINK3_MK:=	${SCSL_JRE15_BUILDLINK3_MK}+
@@ -12,11 +12,11 @@ BUILDLINK_PACKAGES+=	scsl-jre15
 
 .if !empty(SCSL_JRE15_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.scsl-jre15+=		scsl-jre15-[0-9]*
-BUILDLINK_ABI_DEPENDS.scsl-jre15?=		scsl-jre15>=1.5.0
+BUILDLINK_ABI_DEPENDS.scsl-jre15+=		scsl-jre15>=1.5.0
 BUILDLINK_PKGSRCDIR.scsl-jre15?=		../../lang/scsl-jre15
 BUILDLINK_JAVA_PREFIX.scsl-jre15=	${PREFIX}/java/scsl-1.5
-.endif	# SCSL_JRE15_BUILDLINK3_MK
 
 UNLIMIT_RESOURCES+=	datasize	# Must be at least 131204
+.endif	# SCSL_JRE15_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}