From owner-svn-ports-head@FreeBSD.ORG  Fri Apr  5 09:22:10 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EC7286C3;
 Fri,  5 Apr 2013 09:22:10 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DF195A6A;
 Fri,  5 Apr 2013 09:22:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r359MAOI020134;
 Fri, 5 Apr 2013 09:22:10 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r359MAYr020132;
 Fri, 5 Apr 2013 09:22:10 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201304050922.r359MAYr020132@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 5 Apr 2013 09:22:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315731 - head/archivers/gzip
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Apr 2013 09:22:11 -0000

Author: bapt
Date: Fri Apr  5 09:22:10 2013
New Revision: 315731
URL: http://svnweb.freebsd.org/changeset/ports/315731

Log:
  Fix leftovers by using USES=charsetfix
  Remove now useless pre-configure target
  While here convert NOPORTDOCS to DOCS option
  
  Reported by:	pointyhat via miwi
  Approved by:	portmgr (implicit)

Modified:
  head/archivers/gzip/Makefile

Modified: head/archivers/gzip/Makefile
==============================================================================
--- head/archivers/gzip/Makefile	Fri Apr  5 08:23:44 2013	(r315730)
+++ head/archivers/gzip/Makefile	Fri Apr  5 09:22:10 2013	(r315731)
@@ -11,6 +11,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	Compression utility designed to be a replacement for compress
 
+USES=		charsetfix
 GNU_CONFIGURE=	yes
 
 MAN1=	gunzip.1 gzexe.1 gzip.1 zcat.1 zcmp.1 zdiff.1 zforce.1 \
@@ -20,27 +21,22 @@ INFO=	gzip
 DOC_FILES=	AUTHORS COPYING ChangeLog ChangeLog-2007 INSTALL NEWS README \
 		THANKS TODO
 
-OPTIONS_DEFINE=	RSYNCABLE
+OPTIONS_DEFINE=	RSYNCABLE DOCS
 OPTIONS_DEFAULT=	RSYNCABLE
 RSYNCABLE_DESC=	Include --rsyncable patch
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRSYNCABLE}
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-gzip-rsyncable.diff
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} -e 's|^SHELL =.*|SHELL=/bin/sh|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|need_charset_alias=true|need_charset_alias=false|g' \
-		${WRKSRC}/lib/Makefile.in
-
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>