diff options
author | tnn <tnn@pkgsrc.org> | 2008-05-15 20:01:03 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2008-05-15 20:01:03 +0000 |
commit | f9da872b3aa9b1a962928e2a155add79a800360e (patch) | |
tree | 5a2090b6d4bf20a77ccd14e06de84976f50485cc /sysutils | |
parent | 329f23a04679eb3bc50348d9db1c8e3401b0b5f3 (diff) | |
download | pkgsrc-f9da872b3aa9b1a962928e2a155add79a800360e.tar.gz |
Reach over from misc/gnuls to sysutils/coreutils for common logic and
patches. Updates gnuls to 6.11 and makes it track coreutils.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/coreutils/Makefile | 60 | ||||
-rw-r--r-- | sysutils/coreutils/Makefile.common | 53 |
2 files changed, 65 insertions, 48 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index 8985b131053..6069cc7b364 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,50 +1,9 @@ -# $NetBSD: Makefile,v 1.46 2008/05/13 09:22:46 tron Exp $ +# $NetBSD: Makefile,v 1.47 2008/05/15 20:01:03 tnn Exp $ -DISTNAME= coreutils-6.11 -CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/} - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnu.org/software/coreutils/ -COMMENT= GNU basic file, shell and text manipulation utilities - -PKG_DESTDIR_SUPPORT= user-destdir -NOT_FOR_PLATFORM= NetBSD-2.0[D-H]-* +.include "../../sysutils/coreutils/Makefile.common" CONFLICTS= fileutils-[0-9]* linuxls-[0-9]* sh-utils-[0-9]* textutils-[0-9]* -GNU_CONFIGURE= YES -USE_TOOLS+= msgfmt msgmerge perl xgettext -USE_PKGLOCALEDIR= YES - -INFO_FILES= YES - -TEST_TARGET= check - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Interix" -CONFIGURE_ENV+= ac_list_mounted_fs=found -.endif - -.if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*) -CONFIGURE_ENV+= ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes -.endif - -# Exclude programs from PLIST which aren't built on a platform. -PLIST_VARS+= hostid -.if ${OPSYS} != "Interix" -PLIST.hostid= yes -.endif - -# XXX - this hack is bound to cause fallout on some platform at some point. -# How can we determine the API version of the builtin gettext? -.if ${OPSYS} != "Linux" -CONFIGURE_ENV+= gt_cv_func_gnugettext3_libintl=yes -.endif -CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} - -CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} # if GNU_PROGRAM_PREFIX == 'g' # devel/id-utils installs a 'gid' program, so conflict with it # databases/geneweb a 'gwc' program, so conflict with it @@ -56,19 +15,24 @@ CONFLICTS+= graphviz<1.12 .endif # print/teTeX-bin installed a 'readlink' program, so # conflict with it if GNU_PROGRAM_PREFIX == '' (no problem in teTeX3-bin) -.if ${GNU_PROGRAM_PREFIX} == "" +.if empty(GNU_PROGRAM_PREFIX) CONFLICTS+= teTeX-bin<3 CONFLICTS+= mktemp-[0-9]* .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} -BUILD_DEFS+= GNU_PROGRAM_PREFIX +INFO_FILES= yes + +# Exclude programs from PLIST which aren't built on a platform. +PLIST_VARS+= hostid +.if ${OPSYS} != "Interix" +PLIST.hostid= yes +.endif #CONFIGURE_ARGS+= --enable-install-program=su #.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \ # ${OPSYS} == "OpenBSD" -#MAKE_FLAGS+= setuid_root_mode=a=rx -#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu +#MAKE_FLAGS+= setuid_root_mode=a=rx +#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu #MESSAGE_SUBST+= OPSYS=${OPSYS:Q} #.endif diff --git a/sysutils/coreutils/Makefile.common b/sysutils/coreutils/Makefile.common new file mode 100644 index 00000000000..feeae01ab57 --- /dev/null +++ b/sysutils/coreutils/Makefile.common @@ -0,0 +1,53 @@ +# $NetBSD: Makefile.common,v 1.1 2008/05/15 20:01:03 tnn Exp $ +# used by sysutils/coreutils/Makefile +# used by misc/gnuls/Makefile + +DISTNAME= coreutils-6.11 +CATEGORIES= sysutils +MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.gnu.org/software/coreutils/ +COMMENT= GNU basic file, shell and text manipulation utilities + +PKG_DESTDIR_SUPPORT= user-destdir +NOT_FOR_PLATFORM= NetBSD-2.0[D-H]-* + +PATCHDIR= ${.CURDIR}/../../sysutils/coreutils/patches +DISTINFO_FILE= ${.CURDIR}/../../sysutils/coreutils/distinfo + +GNU_CONFIGURE= YES +USE_TOOLS+= msgfmt msgmerge perl xgettext +USE_PKGLOCALEDIR= YES + +TEST_TARGET= check + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Interix" +CONFIGURE_ENV+= ac_list_mounted_fs=found +.endif + +.if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*) +CONFIGURE_ENV+= ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes +.endif + +# XXX - this hack is bound to cause fallout on some platform at some point. +# How can we determine the API version of the builtin gettext? +.if ${OPSYS} != "Linux" +CONFIGURE_ENV+= gt_cv_func_gnugettext3_libintl=yes +.endif +CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} + +CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} + +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} +BUILD_DEFS+= GNU_PROGRAM_PREFIX + +#CONFIGURE_ARGS+= --enable-install-program=su +#.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \ +# ${OPSYS} == "OpenBSD" +#MAKE_FLAGS+= setuid_root_mode=a=rx +#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu +#MESSAGE_SUBST+= OPSYS=${OPSYS:Q} +#.endif |