svn commit: r342188 - in head/sysutils/xfsprogs: . files

[Pawel Pekala]

Author: pawel
Date: Sat Feb  1 17:01:13 2014
New Revision: 342188
URL: http://svnweb.freebsd.org/changeset/ports/342188
QAT: https://qat.redports.org/buildarchive/r342188/

Log:
  - Update to version 2.9.8 [1]
  - Add LICENSE [1]
  - Remove leading article from COMMENT
  - Convert USE_GMAKE to USES=gmake
  - Respect CFLAGS by setting OPTIMIZER variable to space
    otherwise it is set to '-g -O2'
  - Consolidate targets to just post-patch and
    post-configure - this makes things simpler
  - Mute REINPLACE_CMD and FIND commands
  - Add support for staging
  
  PR:		ports/180542 [1]
  Submitted by:	Pedro Giffuni <giffunip at tutopia.com>

Deleted:
  head/sysutils/xfsprogs/files/patch-freebsd.c
Modified:
  head/sysutils/xfsprogs/Makefile
  head/sysutils/xfsprogs/distinfo
  head/sysutils/xfsprogs/pkg-plist

Modified: head/sysutils/xfsprogs/Makefile
==============================================================================
--- head/sysutils/xfsprogs/Makefile	Sat Feb  1 16:57:04 2014	(r342187)
+++ head/sysutils/xfsprogs/Makefile	Sat Feb  1 17:01:13 2014	(r342188)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfsprogs
-PORTVERSION=	2.9.4
-PORTREVISION=	3
+PORTVERSION=	2.9.8
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 		ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
@@ -11,44 +10,41 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	-1.tar.gz
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A set of utilities and library to manipulate an xfs filesystem
+COMMENT=	Set of utilities and library to manipulate an XFS filesystem
 
-USE_GMAKE=	yes
-USES=		gettext
+LICENSE=	GPLv2
+
+USES=		gettext gmake
 USE_AUTOTOOLS=	autoconf libtool:env
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=		INSTALL="${INSTALL} ${_BINOWNGRP}" \
-			LIBTOOL=${LIBTOOL}
+			LIBTOOL=${LIBTOOL} OPTIMIZER=" "
 MAKE_ENV+=		INSTALL="${INSTALL} ${_BINOWNGRP}"
 CONFIGURE_ARGS+=	--disable-shared --enable-readline
 ALL_TARGET=
 
-MAN5=	xfs.5
-MAN8=	fsck.xfs.8 mkfs.xfs.8 xfs_admin.8 xfs_bmap.8 xfs_check.8 \
-	xfs_copy.8 xfs_db.8 xfs_freeze.8 xfs_growfs.8 xfs_info.8 \
-	xfs_io.8 xfs_logprint.8 xfs_mdrestore.8 xfs_metadump.8 xfs_mkfile.8 xfs_ncheck.8 \
-	xfs_quota.8 xfs_repair.8 xfs_rtcp.8
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-post-extract:
-	${LN} -sf ${WRKDIR}/${PORTNAME}-${PORTVERSION} ${WRKSRC}
-	${REINPLACE_CMD} -e '/utmp/d' \
-		${WRKSRC}/quota/report.c ${WRKSRC}/quota/util.c
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-pre-configure:
-	${RM} -f ${WRKSRC}/configure
+post-patch:
+	@${REINPLACE_CMD} -e '/utmp/d' \
+		${WRKSRC}/quota/report.c ${WRKSRC}/quota/util.c
+	@${FIND} ${WRKDIR} -name "*.m4" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|/usr/local|'${LOCALBASE}'|g'
+	@${RM} -f ${WRKSRC}/configure
 
 post-configure:
-	${FIND} ${WRKSRC}/include -name "builddefs" | ${XARGS} ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC}/include -name "builddefs" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|LIBRT =|LIBRT = -lrt|g'
+	@${REINPLACE_CMD} 's|$$(PKG_DOC_DIR)|$$(DESTDIR)&|g' ${WRKSRC}/Makefile
+.for dir in db doc fsck growfs io logprint mdrestore mkfs quota repair rtcp
+	@${REINPLACE_CMD} -E 's,PKG_(BIN|DOC|INC|SBIN)_DIR,DESTDIR)$$(&,g' \
+		${WRKSRC}/${dir}/Makefile
+.endfor
+.for i in 3 5 8
+	@${REINPLACE_CMD} 's|$$(PKG_MAN_DIR)|$$(DESTDIR)&|g' \
+		${WRKSRC}/man/man${i}/Makefile
+.endfor
+	@${REINPLACE_CMD} 's|$$(PKG_LOCALE_DIR)|$$(DESTDIR)&|' \
+		${WRKSRC}/include/buildmacros
 
-post-patch:
-	${FIND} ${WRKDIR} -name "*.m4" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|/usr/local|'${LOCALBASE}'|g'
-.ifdef NOPORTDOCS
-	@${REINPLACE_CMD} -e 's/doc//' -e '/PKG_DOC_DIR/d' ${WRKSRC}/Makefile
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/sysutils/xfsprogs/distinfo
==============================================================================
--- head/sysutils/xfsprogs/distinfo	Sat Feb  1 16:57:04 2014	(r342187)
+++ head/sysutils/xfsprogs/distinfo	Sat Feb  1 17:01:13 2014	(r342188)
@@ -1,2 +1,2 @@
-SHA256 (xfsprogs_2.9.4-1.tar.gz) = ae6b2481ab1cc23ba5179ca444c29c6e519504b412a0b2deaa13e05dc8f6f189
-SIZE (xfsprogs_2.9.4-1.tar.gz) = 997236
+SHA256 (xfsprogs_2.9.8-1.tar.gz) = 84e8e32c9b2ead2ce6b97cc11da23f90a825c0593263508e14e0ef3ea4f61dff
+SIZE (xfsprogs_2.9.8-1.tar.gz) = 1003288

Modified: head/sysutils/xfsprogs/pkg-plist
==============================================================================
--- head/sysutils/xfsprogs/pkg-plist	Sat Feb  1 16:57:04 2014	(r342187)
+++ head/sysutils/xfsprogs/pkg-plist	Sat Feb  1 17:01:13 2014	(r342188)
@@ -13,6 +13,26 @@ bin/xfs_mkfile
 bin/xfs_metadump
 bin/xfs_quota
 bin/xfs_rtcp
+man/man5/xfs.5.gz
+man/man8/fsck.xfs.8.gz
+man/man8/mkfs.xfs.8.gz
+man/man8/xfs_admin.8.gz
+man/man8/xfs_bmap.8.gz
+man/man8/xfs_check.8.gz
+man/man8/xfs_copy.8.gz
+man/man8/xfs_db.8.gz
+man/man8/xfs_freeze.8.gz
+man/man8/xfs_growfs.8.gz
+man/man8/xfs_info.8.gz
+man/man8/xfs_io.8.gz
+man/man8/xfs_logprint.8.gz
+man/man8/xfs_mdrestore.8.gz
+man/man8/xfs_metadump.8.gz
+man/man8/xfs_mkfile.8.gz
+man/man8/xfs_ncheck.8.gz
+man/man8/xfs_quota.8.gz
+man/man8/xfs_repair.8.gz
+man/man8/xfs_rtcp.8.gz
 sbin/fsck.xfs
 sbin/mkfs.xfs
 sbin/xfs_repair