Bug 185599 - sysutils/coreutils: update to 8.22, support staging and use options helpers
Summary: sysutils/coreutils: update to 8.22, support staging and use options helpers
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Jason Helfman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-09 07:40 UTC by Jason Helfman
Modified: 2014-01-24 01:10 UTC (History)
0 users

See Also:

Attachments
file.diff (5.98 KB, patch)
2014-01-09 07:40 UTC, Jason Helfman 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jason Helfman freebsd_committer freebsd_triage 2014-01-09 07:40:01 UTC 
update to 8.22
support staging
trim master_site
use option helpers
shift away from inclusion of bsd.port.pre.mk as bsd.port.options.mk can test OSVERSION (less expensive)
patch of Makefile was merged upstream so removed patch
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-09 07:40:08 UTC 
Maintainer of sysutils/coreutils,

Please note that PR ports/185599 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/185599

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-09 07:40:09 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Jason Helfman freebsd_committer freebsd_triage 2014-01-09 07:41:11 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->jgh

I'll take it.
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-01-24 01:02:01 UTC 
Author: jgh
Date: Fri Jan 24 01:01:53 2014
New Revision: 340873
URL: http://svnweb.freebsd.org/changeset/ports/340873
QAT: https://qat.redports.org/buildarchive/r340873/

Log:
  - update to 8.22
  - support staging, strip libraries
  - trim master_site
  - use option helpers
  - shift away from inclusion of bsd.port.pre.mk as bsd.port.options.mk
    can test OSVERSION (less expensive)
  - patch of Makefile was merged upstream so removed patch
  
  PR:		185599
  Submitted by:	jgh@ (myself)
  Approved by:	maintainer timeout, jharris@widomaker.com ( 15 days )

Deleted:
  head/sysutils/coreutils/files/patch-Makefile.in
Modified:
  head/sysutils/coreutils/Makefile
  head/sysutils/coreutils/distinfo
  head/sysutils/coreutils/pkg-plist

Modified: head/sysutils/coreutils/Makefile
==============================================================================
--- head/sysutils/coreutils/Makefile	Fri Jan 24 00:14:07 2014	(r340872)
+++ head/sysutils/coreutils/Makefile	Fri Jan 24 01:01:53 2014	(r340873)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	coreutils
-PORTVERSION=	8.20
-PORTREVISION=	2
+PORTVERSION=	8.22
 CATEGORIES=	sysutils textproc
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jharris@widomaker.com
@@ -30,47 +29,19 @@ USES=		gmake perl5
 USE_PERL5=	build	# build - required for tests and man page generation
 USE_XZ=		yes
 USE_LDCONFIG=	yes
-#USE_BISON=	yes
 
 INFO=		coreutils
 
-MAN1=	gbasename.1 gcat.1 gchcon.1 gchgrp.1 gchmod.1 gchown.1 gchroot.1 \
-	gcksum.1 gcomm.1 gcp.1 gcsplit.1 gcut.1 gdate.1 gdd.1 gdf.1 gdir.1 \
-	gdircolors.1 gdirname.1 gdu.1 gecho.1 genv.1 gexpand.1 gexpr.1 \
-	gfactor.1 gfalse.1 gfmt.1 gfold.1 ggroups.1 ghead.1 ghostid.1 \
-	gid.1 ginstall.1 gjoin.1 gkill.1 glink.1 gln.1 \
-	glogname.1 gls.1 gmd5sum.1 gmkdir.1 gmkfifo.1 gmknod.1 gmktemp.1 \
-	gmv.1 gnice.1 gnl.1 gnohup.1 god.1 gpaste.1 gpathchk.1 gpinky.1 \
-	gpr.1 gprintenv.1 gprintf.1 gptx.1 gpwd.1 greadlink.1 grealpath.1 grm.1 \
-	grmdir.1 gruncon.1 gseq.1 gsha1sum.1 gshred.1 gsleep.1 gsort.1 \
-	gsplit.1 gstdbuf.1 gnustat.1 gstty.1 gsum.1 gsync.1 gtac.1 \
-	gtail.1 gtee.1 gtest.1 gtimeout.1 gtouch.1 gtr.1 gtrue.1 gtruncate.1 \
-	gtsort.1 gtty.1 guname.1 gunexpand.1 guniq.1 gunlink.1 guptime.1 \
-	gusers.1 gvdir.1 gwc.1 gwho.1 gwhoami.1 gyes.1 gbase64.1 gsha224sum.1 \
-	gsha256sum.1 gsha384sum.1 gsha512sum.1 gshuf.1 gnproc.1
-
 OPTIONS_DEFINE=	GMP NLS
 OPTIONS_DEFAULT=NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=   nls
+GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_CONFIGURE_ENABLE=	gmp
 
-NO_STAGE=	yes
 .include <bsd.port.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} >= 800039
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-stty.c
 .endif
@@ -78,7 +49,11 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-s
 post-build:
 	@${REINPLACE_CMD} -e "s/ lib / /g" ${WRKSRC}/Makefile
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \
+		${STAGEDIR}${PREFIX}/libexec/coreutils/glibstdbuf.so
+
 #regression-test: build
 #	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} check)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/sysutils/coreutils/distinfo
==============================================================================
--- head/sysutils/coreutils/distinfo	Fri Jan 24 00:14:07 2014	(r340872)
+++ head/sysutils/coreutils/distinfo	Fri Jan 24 01:01:53 2014	(r340873)
@@ -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

Modified: head/sysutils/coreutils/pkg-plist
==============================================================================
--- head/sysutils/coreutils/pkg-plist	Fri Jan 24 00:14:07 2014	(r340872)
+++ head/sysutils/coreutils/pkg-plist	Fri Jan 24 01:01:53 2014	(r340873)
@@ -101,6 +101,108 @@ bin/gwho
 bin/gwhoami
 bin/gyes
 libexec/coreutils/glibstdbuf.so
+man/man1/gbase64.1.gz
+man/man1/gbasename.1.gz
+man/man1/gcat.1.gz
+man/man1/gchcon.1.gz
+man/man1/gchgrp.1.gz
+man/man1/gchmod.1.gz
+man/man1/gchown.1.gz
+man/man1/gchroot.1.gz
+man/man1/gcksum.1.gz
+man/man1/gcomm.1.gz
+man/man1/gcp.1.gz
+man/man1/gcsplit.1.gz
+man/man1/gcut.1.gz
+man/man1/gdate.1.gz
+man/man1/gdd.1.gz
+man/man1/gdf.1.gz
+man/man1/gdir.1.gz
+man/man1/gdircolors.1.gz
+man/man1/gdirname.1.gz
+man/man1/gdu.1.gz
+man/man1/gecho.1.gz
+man/man1/genv.1.gz
+man/man1/gexpand.1.gz
+man/man1/gexpr.1.gz
+man/man1/gfactor.1.gz
+man/man1/gfalse.1.gz
+man/man1/gfmt.1.gz
+man/man1/gfold.1.gz
+man/man1/ggroups.1.gz
+man/man1/ghead.1.gz
+man/man1/ghostid.1.gz
+man/man1/gid.1.gz
+man/man1/ginstall.1.gz
+man/man1/gjoin.1.gz
+man/man1/gkill.1.gz
+man/man1/glink.1.gz
+man/man1/gln.1.gz
+man/man1/glogname.1.gz
+man/man1/gls.1.gz
+man/man1/gmd5sum.1.gz
+man/man1/gmkdir.1.gz
+man/man1/gmkfifo.1.gz
+man/man1/gmknod.1.gz
+man/man1/gmktemp.1.gz
+man/man1/gmv.1.gz
+man/man1/gnice.1.gz
+man/man1/gnl.1.gz
+man/man1/gnohup.1.gz
+man/man1/gnproc.1.gz
+man/man1/gnumfmt.1.gz
+man/man1/gnustat.1.gz
+man/man1/god.1.gz
+man/man1/gpaste.1.gz
+man/man1/gpathchk.1.gz
+man/man1/gpinky.1.gz
+man/man1/gpr.1.gz
+man/man1/gprintenv.1.gz
+man/man1/gprintf.1.gz
+man/man1/gptx.1.gz
+man/man1/gpwd.1.gz
+man/man1/greadlink.1.gz
+man/man1/grealpath.1.gz
+man/man1/grm.1.gz
+man/man1/grmdir.1.gz
+man/man1/gruncon.1.gz
+man/man1/gseq.1.gz
+man/man1/gsha1sum.1.gz
+man/man1/gsha224sum.1.gz
+man/man1/gsha256sum.1.gz
+man/man1/gsha384sum.1.gz
+man/man1/gsha512sum.1.gz
+man/man1/gshred.1.gz
+man/man1/gshuf.1.gz
+man/man1/gsleep.1.gz
+man/man1/gsort.1.gz
+man/man1/gsplit.1.gz
+man/man1/gstdbuf.1.gz
+man/man1/gstty.1.gz
+man/man1/gsum.1.gz
+man/man1/gsync.1.gz
+man/man1/gtac.1.gz
+man/man1/gtail.1.gz
+man/man1/gtee.1.gz
+man/man1/gtest.1.gz
+man/man1/gtimeout.1.gz
+man/man1/gtouch.1.gz
+man/man1/gtr.1.gz
+man/man1/gtrue.1.gz
+man/man1/gtruncate.1.gz
+man/man1/gtsort.1.gz
+man/man1/gtty.1.gz
+man/man1/guname.1.gz
+man/man1/gunexpand.1.gz
+man/man1/guniq.1.gz
+man/man1/gunlink.1.gz
+man/man1/guptime.1.gz
+man/man1/gusers.1.gz
+man/man1/gvdir.1.gz
+man/man1/gwc.1.gz
+man/man1/gwho.1.gz
+man/man1/gwhoami.1.gz
+man/man1/gyes.1.gz
 %%NLS%%share/locale/af/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/af/LC_TIME/coreutils.mo
 %%NLS%%share/locale/be/LC_MESSAGES/coreutils.mo
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 Jason Helfman freebsd_committer freebsd_triage 2014-01-24 01:02:07 UTC 
State Changed
From-To: feedback->closed

Committed. Thanks!