From danfe@FreeBSD.org  Wed Oct 10 09:34:05 2007
Return-Path: <danfe@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C4A116A419
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 10 Oct 2007 09:34:05 +0000 (UTC)
	(envelope-from danfe@FreeBSD.org)
Received: from ru.asempra.com (ru.asempra.com [80.64.81.150])
	by mx1.freebsd.org (Postfix) with ESMTP id C533113C4BB
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 10 Oct 2007 09:34:04 +0000 (UTC)
	(envelope-from danfe@FreeBSD.org)
Received: from stan.asempra.local (stan.asempra.local [192.168.33.20])
	by ru.asempra.com (8.12.11.20060308/8.12.11) with ESMTP id l9A9XvJF028096
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Oct 2007 16:34:03 +0700
Message-Id: <1192008834.71481@stan.asempra.local>
Date: Wed, 10 Oct 2007 16:33:54 +0700
From: "Alexey Dokuchaev" <danfe@FreeBSD.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject: [PATCH] Convert `converters/libiconv' to OPTIONS
X-Send-Pr-Version: gtk-send-pr 0.4.8 
X-GNATS-Notify:

>Number:         117063
>Category:       ports
>Synopsis:       [PATCH] Convert `converters/libiconv' to OPTIONS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 10 09:40:02 UTC 2007
>Closed-Date:    Wed Oct 10 13:31:07 UTC 2007
>Last-Modified:  Wed Oct 10 13:31:07 UTC 2007
>Originator:     Alexey Dokuchaev
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 7.0-CURRENT #0: Thu Oct  4 04:45:24 NOVST 2007
    root@stan.asempra.local:/usr/obj/usr/src/sys/LITE



>Description:


Log:

- Convert to OPTIONS
- Pet portlint (spaces -> tab)


>How-To-Repeat:


N/A


>Fix:


--- iconv-diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/converters/libiconv/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile	1 Feb 2007 02:41:21 -0000	1.39
+++ Makefile	10 Oct 2007 09:28:08 -0000
@@ -26,11 +26,16 @@
 MAN1=		iconv.1
 MAN3=		iconv.3 iconv_open.3 iconv_close.3
 
+OPTIONS=	EXTRA_ENCODINGS	"Include extra character sets"	on \
+		EXTRA_PATCHES	"Apply patches to fix CP932, add EUCJP-MS" off
+
 .ifdef USE_ICONV
 .error USE_ICONV is defined as an environment variable, or in the arguments \
 	to "make".  Please unset it and restart the build.
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_EXTRA_ENCODINGS)
 CONFIGURE_ARGS+=	--enable-extra-encodings
 .endif
@@ -38,19 +43,12 @@
 .if defined(WITH_EXTRA_PATCHES)
 PATCH_SITES+=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
 PATCH_SITES+=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=     nork
+PATCH_SITE_SUBDIR=	nork
 PATCHFILES+=	${DISTNAME}-cp932.patch.gz
 PATCH_DIST_STRIP+=	-p1
 .endif
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "libiconv has the following tunable option(s):"
-	@${ECHO_MSG} "	WITHOUT_EXTRA_ENCODINGS=yes	Disable extra character sets"
-	@${ECHO_MSG} "	WITH_EXTRA_PATCHES=yes		Apply extra patches (fixes cp932, adds EUCJP-MS)"
-	@${ECHO_MSG} ""
-
 post-patch:
 	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- iconv-diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Oct 10 09:40:40 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117063 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117063: commit references a PR
Date: Wed, 10 Oct 2007 13:29:46 +0000 (UTC)

 bland       2007-10-10 13:29:42 UTC
 
   FreeBSD ports repository
 
   Modified files:
     converters/libiconv  Makefile 
   Log:
   - Convert to OPTIONS.
   - Pet portlint (spaces -> tab).
   
   PR:             117063
   
   Revision  Changes    Path
   1.40      +7 -9      ports/converters/libiconv/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: bland 
State-Changed-When: Wed Oct 10 13:30:12 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117063 
>Unformatted:
