pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/scsl-jdk15 Fixed some pkglint warnings.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f991d324b94
branches:  trunk
changeset: 514809:6f991d324b94
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jun 18 08:51:10 2006 +0000

description:
Fixed some pkglint warnings.

diffstat:

 lang/scsl-jdk15/Makefile      |  15 +++++++++------
 lang/scsl-jdk15/PLIST         |   4 ++--
 lang/scsl-jdk15/buildlink3.mk |   4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (70 lines):

diff -r 05571310b375 -r 6f991d324b94 lang/scsl-jdk15/Makefile
--- a/lang/scsl-jdk15/Makefile  Sun Jun 18 08:45:56 2006 +0000
+++ b/lang/scsl-jdk15/Makefile  Sun Jun 18 08:51:10 2006 +0000
@@ -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 @@
 # 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 -r 05571310b375 -r 6f991d324b94 lang/scsl-jdk15/PLIST
--- a/lang/scsl-jdk15/PLIST     Sun Jun 18 08:45:56 2006 +0000
+++ b/lang/scsl-jdk15/PLIST     Sun Jun 18 08:51:10 2006 +0000
@@ -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.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 -r 05571310b375 -r 6f991d324b94 lang/scsl-jdk15/buildlink3.mk
--- a/lang/scsl-jdk15/buildlink3.mk     Sun Jun 18 08:45:56 2006 +0000
+++ b/lang/scsl-jdk15/buildlink3.mk     Sun Jun 18 08:51:10 2006 +0000
@@ -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 @@
 .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
 



Home | Main Index | Thread Index | Old Index