diff options
| author | rillig <rillig@pkgsrc.org> | 2006-06-18 08:51:10 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-06-18 08:51:10 +0000 |
| commit | b9192ba38e370ff14834364f6e4d7ca5b2df5055 (patch) | |
| tree | 166c5c9096cf54a09e56ac9843724f5d9255376b /lang | |
| parent | 99e1e6106844438ab54d9f3e4df55e7251c23f1c (diff) | |
| download | pkgsrc-b9192ba38e370ff14834364f6e4d7ca5b2df5055.tar.gz | |
Fixed some pkglint warnings.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/scsl-jdk15/Makefile | 15 | ||||
| -rw-r--r-- | lang/scsl-jdk15/PLIST | 4 | ||||
| -rw-r--r-- | lang/scsl-jdk15/buildlink3.mk | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/lang/scsl-jdk15/Makefile b/lang/scsl-jdk15/Makefile index 6230fccd7a2..75c0019ff01 100644 --- a/lang/scsl-jdk15/Makefile +++ b/lang/scsl-jdk15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2006/05/15 19:44:07 tv Exp $ +# $NetBSD: Makefile,v 1.2 2006/06/18 08:51:10 rillig Exp $ DISTNAME= jdk-${DIST_VER}-${DIST_ARCH} PKGNAME= scsl-jdk15-${PKG_VER} @@ -15,14 +15,17 @@ JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \ # Remove parts that are in common with the JRE # post-extract: + set -e; \ + cd ${WRKSRC}; \ common=`${AWK} '/^#.*/ { next } /^$$/ { next } { print }' ${FILESDIR}/common`; \ - cd ${WRKSRC}; for i in $$common; do \ - if [ -d $$i ]; then \ - ${RM} -rf $$i; \ + for i in $$common; do \ + if [ -d "$$i" ]; then \ + ${RM} -rf "$$i"; \ else \ - ${RM} -f $$i; \ + ${RM} -f "$$i"; \ fi; \ done - ${LN} -sf . ${WRKSRC}/jre + ${RM} -f ${WRKSRC}/jre + ${LN} -s . ${WRKSRC}/jre .include "../../lang/scsl-jre15/Makefile.common" diff --git a/lang/scsl-jdk15/PLIST b/lang/scsl-jdk15/PLIST index caa7872c913..6323242af93 100644 --- a/lang/scsl-jdk15/PLIST +++ b/lang/scsl-jdk15/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2006/05/15 19:44:07 tv Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/06/18 08:51:11 rillig Exp $ bin/scsl15-appletviewer bin/scsl15-apt bin/scsl15-extcheck @@ -544,9 +544,9 @@ java/scsl-1.5/demo/jvmti/hprof/src/hprof_tracker.c java/scsl-1.5/demo/jvmti/hprof/src/hprof_tracker.h java/scsl-1.5/demo/jvmti/hprof/src/hprof_util.c java/scsl-1.5/demo/jvmti/hprof/src/hprof_util.h -java/scsl-1.5/demo/jvmti/hprof/src/jvm.hprof.txt java/scsl-1.5/demo/jvmti/hprof/src/bsd/hprof_md.c java/scsl-1.5/demo/jvmti/hprof/src/bsd/hprof_md.c.orig +java/scsl-1.5/demo/jvmti/hprof/src/jvm.hprof.txt java/scsl-1.5/demo/jvmti/hprof/src/manual.html java/scsl-1.5/demo/jvmti/index.html java/scsl-1.5/demo/jvmti/java_crw_demo/README.txt diff --git a/lang/scsl-jdk15/buildlink3.mk b/lang/scsl-jdk15/buildlink3.mk index 0dbf5a1a28a..b6bcdeac8d6 100644 --- a/lang/scsl-jdk15/buildlink3.mk +++ b/lang/scsl-jdk15/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:51:11 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SCSL_JDK15_BUILDLINK3_MK:= ${SCSL_JDK15_BUILDLINK3_MK}+ @@ -13,7 +13,7 @@ BUILDLINK_PACKAGES+= scsl-jdk15 .if !empty(SCSL_JDK15_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.scsl-jdk15+= scsl-jdk15-[0-9]* -BUILDLINK_ABI_DEPENDS.scsl-jdk15?= scsl-jdk15>=1.5.0 +BUILDLINK_ABI_DEPENDS.scsl-jdk15+= scsl-jdk15>=1.5.0 BUILDLINK_PKGSRCDIR.scsl-jdk15?= ../../lang/scsl-jdk15 BUILDLINK_DEPMETHOD.scsl-jdk15?= build |