Skip site navigation (1)Skip section navigation (2)
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:   ports/117063: [PATCH] Convert `converters/libiconv' to OPTIONS
Message-ID:  <1192008834.71481@stan.asempra.local>
Resent-Message-ID: <200710100940.l9A9e280081149@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         117063
>Category:       ports
>Synopsis:       [PATCH] Convert `converters/libiconv' to OPTIONS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 10 09:40:02 UTC 2007
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1192008834.71481>