[Midnightbsd-cvs] mports [16017] trunk/sysutils/coreutils: coreutils 8.22

[laffer1 at midnightbsd.org]

Revision: 16017
          http://svnweb.midnightbsd.org/mports/?rev=16017
Author:   laffer1
Date:     2014-03-02 18:05:03 -0500 (Sun, 02 Mar 2014)
Log Message:
-----------
coreutils 8.22

Modified Paths:
--------------
    trunk/sysutils/coreutils/Makefile
    trunk/sysutils/coreutils/distinfo
    trunk/sysutils/coreutils/pkg-plist

Removed Paths:
-------------
    trunk/sysutils/coreutils/files/patch-Makefile.in

Modified: trunk/sysutils/coreutils/Makefile
===================================================================
--- trunk/sysutils/coreutils/Makefile	2014-03-02 22:56:41 UTC (rev 16016)
+++ trunk/sysutils/coreutils/Makefile	2014-03-02 23:05:03 UTC (rev 16017)
@@ -1,15 +1,17 @@
 # $MidnightBSD$
 
 PORTNAME=	coreutils
-PORTVERSION=	8.20
-PORTREVISION=	2
+PORTVERSION=	8.22
+PORTREVISION=	0
 CATEGORIES=	sysutils textproc
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	The Free Software Foundation's core utilities
+
 LICENSE=	gpl3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	id-utils-[0-9]* linux-gid-[0-9]*
 
@@ -22,11 +24,10 @@
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" FORCE_UNSAFE_CONFIGURE=1
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 
+USES=		gmake iconv charsetfix
+USE_PERL5_BUILD=	yes # build - required for tests and man page generation
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PERL5_BUILD=	yes # Required for tests and man page generation
-#USE_BISON=	yes
 
 INFO=		coreutils
 
@@ -47,25 +48,14 @@
 
 OPTIONS_DEFINE=	GMP NLS
 OPTIONS_DEFAULT=NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=   nls
+GMP_LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
+GMP_CONFIGURE_WITH=	gmp
 
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGMP}
-LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
-.else
-CONFIGURE_ARGS+=--without-gmp
-.endif
-
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 4015
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-stty.c
 .endif
@@ -73,4 +63,11 @@
 post-build:
 	@${REINPLACE_CMD} -e "s/ lib / /g" ${WRKSRC}/Makefile
 
-.include <bsd.port.post.mk>
+post-install:
+	@${STRIP_CMD} ${PREFIX}/bin/g* \
+		${PREFIX}/libexec/coreutils/glibstdbuf.so
+
+#regression-test: build
+#	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} check)
+
+.include <bsd.port.mk>

Modified: trunk/sysutils/coreutils/distinfo
===================================================================
--- trunk/sysutils/coreutils/distinfo	2014-03-02 22:56:41 UTC (rev 16016)
+++ trunk/sysutils/coreutils/distinfo	2014-03-02 23:05:03 UTC (rev 16017)
@@ -1,2 +1,2 @@
-SHA256 (coreutils-8.20.tar.xz) = dbcb798764827a0f74be738662ecb516705cf520330cd3d7b2640fdffa499eb2
-SIZE (coreutils-8.20.tar.xz) = 5273788
+SHA256 (coreutils-8.22.tar.xz) = 5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212
+SIZE (coreutils-8.22.tar.xz) = 5335124

Deleted: trunk/sysutils/coreutils/files/patch-Makefile.in
===================================================================
--- trunk/sysutils/coreutils/files/patch-Makefile.in	2014-03-02 22:56:41 UTC (rev 16016)
+++ trunk/sysutils/coreutils/files/patch-Makefile.in	2014-03-02 23:05:03 UTC (rev 16017)
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2013-02-07 10:21:58.916462288 -0600
-+++ Makefile.in	2013-02-07 10:22:05.081459567 -0600
-@@ -3114,7 +3114,7 @@
- 
- # for various GMP functions
- src_expr_LDADD = $(LDADD) $(LIB_GMP)
--src_factor_LDADD = $(LDADD) $(LIB_GMP)
-+src_factor_LDADD = $(LDADD) $(LIB_GMP) $(LIBICONV)
- src_false_LDADD = $(LDADD)
- src_fmt_LDADD = $(LDADD)
- src_fold_LDADD = $(LDADD)

Modified: trunk/sysutils/coreutils/pkg-plist
===================================================================
--- trunk/sysutils/coreutils/pkg-plist	2014-03-02 22:56:41 UTC (rev 16016)
+++ trunk/sysutils/coreutils/pkg-plist	2014-03-02 23:05:03 UTC (rev 16017)
@@ -47,6 +47,7 @@
 bin/gnice
 bin/gnl
 bin/gnohup
+bin/gnumfmt
 bin/gnproc
 bin/god
 bin/gpaste
@@ -137,6 +138,8 @@
 %%NLS%%share/locale/hr/LC_TIME/coreutils.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/hu/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ia/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ia/LC_TIME/coreutils.mo
 %%NLS%%share/locale/id/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/id/LC_TIME/coreutils.mo
 %%NLS%%share/locale/it/LC_MESSAGES/coreutils.mo
@@ -227,6 +230,9 @@
 %%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/it/LC_TIME
 %%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ia/LC_TIME
+%%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ia
 %%NLS%%@dirrmtry share/locale/id/LC_TIME
 %%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/hu/LC_TIME