pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Fixed some pkglint warnings.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/07f1bfb171d9
branches:  trunk
changeset: 519309:07f1bfb171d9
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 01 14:16:21 2006 +0000

description:
Fixed some pkglint warnings.

diffstat:

 comms/kermit/Makefile         |  23 ++++++++++++-----------
 devel/buildtool/buildlink3.mk |  18 +++++++++---------
 2 files changed, 21 insertions(+), 20 deletions(-)

diffs (108 lines):

diff -r 207a2ce45eba -r 07f1bfb171d9 comms/kermit/Makefile
--- a/comms/kermit/Makefile     Sun Oct 01 14:00:12 2006 +0000
+++ b/comms/kermit/Makefile     Sun Oct 01 14:16:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/09/09 02:41:55 obache Exp $
+# $NetBSD: Makefile,v 1.68 2006/10/01 14:16:21 rillig Exp $
 
 DISTNAME=      cku211
 PKGNAME=       kermit-8.0.211
@@ -17,9 +17,10 @@
 WRKSRC=                ${WRKDIR}
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 BUILD_DEFS+=   KFLAGS LIBS MANINSTALL
-MAKE_ENV+=     KFLAGS=${KFLAGS:Q} LIBS=${LIBS:M*:Q}
+MAKE_ENV+=     KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
 MAKE_ENV+=     SSLINC=${SSLINC:Q} SSLLIB=${SSLLIB:Q}
 MAKE_FILE=     makefile
+USE_TOOLS+=    nroff
 
 #KFLAGS+=      -DNODEBUG -DNOOLDMODEMS
 
@@ -41,12 +42,12 @@
 
 .include "options.mk"
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin share/doc/kermit
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/wermit ${PREFIX}/bin/kermit
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kermit
        ${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/kermit
+       set -e; \
        for OPT in ${MANINSTALL} broken-solaris-needs-this; do \
          case $$OPT in \
            catinstall) \
@@ -61,18 +62,18 @@
          esac; \
        done
 
-.for __tmp__ in NetBSD-1.3*
-.if ${MACHINE_PLATFORM:M${__tmp__}} != ""
-LIBS+=          -ltermcap
-.endif
+.for p in NetBSD-1.3*
+.  if ${MACHINE_PLATFORM:M${p}} != ""
+LIBS+=         -ltermcap
+.  endif
 .endfor
 
 .if ${OPSYS} == "Darwin"
-.if empty(OS_VERSION:M[0-6]\.*)
+.  if empty(OS_VERSION:M[0-6]\.*)
 BUILD_TARGET=  macosx103
-.else
+.  else
 BUILD_TARGET=  macosx10
-.endif
+.  endif
 .elif ${OPSYS} == "Linux"
 BUILD_TARGET=  linux
 .else
diff -r 207a2ce45eba -r 07f1bfb171d9 devel/buildtool/buildlink3.mk
--- a/devel/buildtool/buildlink3.mk     Sun Oct 01 14:00:12 2006 +0000
+++ b/devel/buildtool/buildlink3.mk     Sun Oct 01 14:16:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/10/01 14:20:58 rillig Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 BUILDTOOL_BUILDLINK3_MK:=      ${BUILDTOOL_BUILDLINK3_MK}+
@@ -21,10 +21,10 @@
 
 HAS_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      ${BUILDTOOL} config
-CONFIGURE_ENV+=                BT_FLAGS_CC=${CFLAGS:M*:Q}
-CONFIGURE_ENV+=                BT_FLAGS_CPP=${CPPFLAGS:M*:Q}
-CONFIGURE_ENV+=                BT_FLAGS_CXX=${CXXFLAGS:M*:Q}
-CONFIGURE_ENV+=                BT_FLAGS_LD=${LDFLAGS:M*:Q}
+CONFIGURE_ENV+=                BT_FLAGS_CC=${CFLAGS:Q}
+CONFIGURE_ENV+=                BT_FLAGS_CPP=${CPPFLAGS:Q}
+CONFIGURE_ENV+=                BT_FLAGS_CXX=${CXXFLAGS:Q}
+CONFIGURE_ENV+=                BT_FLAGS_LD=${LDFLAGS:Q}
 CONFIGURE_ENV+=                BT_PROG_AWK=${TOOLS_AWK:Q}
 CONFIGURE_ENV+=                BT_PROG_CC=${CC:Q}
 CONFIGURE_ENV+=                BT_PROG_CXX=${CXX:Q}
@@ -32,17 +32,17 @@
 CONFIGURE_ENV+=                BT_PROG_M4=${TOOLS_M4:Q}
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
 
-.if !target(do-build)
+.  if !target(do-build)
 do-build:
        ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} && \
                ${SETENV} ${MAKE_ENV} ${BUILDTOOL} build
-.endif
+.  endif
 
-.if !target(do-install)
+.  if !target(do-install)
 do-install:
        ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} && \
                ${SETENV} ${MAKE_ENV} ${BUILDTOOL} install
-.endif
+.  endif
 
 .endif # BUILDTOOL_BUILDLINK3_MK
 



Home | Main Index | Thread Index | Old Index