pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/sysutils/coreutils pkglint cleanup. Fix CONFLICTS patt...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c59af5a0adf2
branches:  trunk
changeset: 509612:c59af5a0adf2
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Mar 12 12:37:30 2006 +0000

description:
pkglint cleanup. Fix CONFLICTS pattern to include [0-9] at the end.

diffstat:

 sysutils/coreutils/Makefile |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 8ef577958045 -r c59af5a0adf2 sysutils/coreutils/Makefile
--- a/sysutils/coreutils/Makefile       Sun Mar 12 12:36:01 2006 +0000
+++ b/sysutils/coreutils/Makefile       Sun Mar 12 12:37:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/03/12 12:36:01 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2006/03/12 12:37:30 wiz Exp $
 
 DISTNAME=      coreutils-5.2.1
 PKGREVISION=   2
@@ -14,7 +14,7 @@
 
 BUILD_USES_MSGFMT=     YES
 
-CONFLICTS=     fileutils-* linuxls-* sh-utils-* textutils-*
+CONFLICTS=     fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]*
 
 GNU_CONFIGURE=         YES
 USE_TOOLS+=            perl
@@ -25,7 +25,7 @@
 TEST_TARGET=           check
 
 SUBST_CLASSES+=                root
-SUBST_MESSAGE.root=    "Fixing hardcoded root."
+SUBST_MESSAGE.root=    Fixing hardcoded root.
 SUBST_STAGE.root=      post-patch
 SUBST_FILES.root=      src/Makefile.in
 SUBST_SED.root=                -e 's, root , ${ROOT_USER} ,g'
@@ -62,7 +62,7 @@
   ${OPSYS} == "OpenBSD"
 MAKE_FLAGS+=   setuid_root_mode=a=rx
 MESSAGE_SRC=    ${.CURDIR}/MESSAGE.gsu
-MESSAGE_SUBST+=        OPSYS=${OPSYS}
+MESSAGE_SUBST+=        OPSYS=${OPSYS:Q}
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"



Home | Main Index | Thread Index | Old Index