svn commit: r317469 - in head/lang: python26 python27 python31 python32 python33

[Jason Helfman]

Author: jgh
Date: Mon May  6 06:32:22 2013
New Revision: 317469
URL: http://svnweb.freebsd.org/changeset/ports/317469

Log:
  - adoption of USES for gettext
  
  Approved by:	portmgr (bapt@)

Modified:
  head/lang/python26/Makefile
  head/lang/python27/Makefile
  head/lang/python31/Makefile
  head/lang/python32/Makefile
  head/lang/python33/Makefile

Modified: head/lang/python26/Makefile
==============================================================================
--- head/lang/python26/Makefile	Mon May  6 06:30:39 2013	(r317468)
+++ head/lang/python26/Makefile	Mon May  6 06:32:22 2013	(r317469)
@@ -58,6 +58,17 @@ OPTIONS_SINGLE_UCS=	UCS2 UCS4
 
 NLS_DESC=	Enable Gettext support for the locale module
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building
+#LDFLAGS+=	"-L${LOCALBASE}/lib"
+#CFLAGS+=	"-I${LOCALBASE}/include"
+.else
+CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSEM}
@@ -80,15 +91,6 @@ PLIST_SUB+=	IF_DEFAULT=""
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
-# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building
-#LDFLAGS+=	"-L${LOCALBASE}/lib"
-#CFLAGS+=	"-I${LOCALBASE}/include"
-.else
-CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 .if ${PORT_OPTIONS:MPTH}

Modified: head/lang/python27/Makefile
==============================================================================
--- head/lang/python27/Makefile	Mon May  6 06:30:39 2013	(r317468)
+++ head/lang/python27/Makefile	Mon May  6 06:32:22 2013	(r317469)
@@ -58,6 +58,17 @@ OPTIONS_SINGLE_UCS=	UCS2 UCS4
 
 NLS_DESC=	Enable Gettext support for the locale module
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building
+#LDFLAGS+=	"-L${LOCALBASE}/lib"
+#CFLAGS+=	"-I${LOCALBASE}/include"
+.else
+CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSEM}
@@ -80,15 +91,6 @@ PLIST_SUB+=	IF_DEFAULT=""
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
-# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building
-#LDFLAGS+=	"-L${LOCALBASE}/lib"
-#CFLAGS+=	"-I${LOCALBASE}/include"
-.else
-CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 .if ${PORT_OPTIONS:MPTH}

Modified: head/lang/python31/Makefile
==============================================================================
--- head/lang/python31/Makefile	Mon May  6 06:30:39 2013	(r317468)
+++ head/lang/python31/Makefile	Mon May  6 06:32:22 2013	(r317469)
@@ -52,6 +52,17 @@ OPTIONS_DEFAULT=	THREADS UCS4 PYMALLOC I
 
 NLS_DESC=	Enable Gettext support for the locale module
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building
+#LDFLAGS+=	"-L${LOCALBASE}/lib"
+#CFLAGS+=	"-I${LOCALBASE}/include"
+.else
+CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
@@ -67,15 +78,6 @@ PLIST_SUB+=	IF_DEFAULT_MAJOR=""
 PLIST_SUB+=	IF_DEFAULT_MAJOR="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
-# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building
-#LDFLAGS+=	"-L${LOCALBASE}/lib"
-#CFLAGS+=	"-I${LOCALBASE}/include"
-.else
-CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 CONFIGURE_ARGS+=	--with-threads

Modified: head/lang/python32/Makefile
==============================================================================
--- head/lang/python32/Makefile	Mon May  6 06:30:39 2013	(r317468)
+++ head/lang/python32/Makefile	Mon May  6 06:32:22 2013	(r317469)
@@ -53,6 +53,17 @@ OPTIONS_DEFAULT=	THREADS UCS4 PYMALLOC I
 
 NLS_DESC=	Enable Gettext support for the locale module
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building
+#LDFLAGS+=	"-L${LOCALBASE}/lib"
+#CFLAGS+=	"-I${LOCALBASE}/include"
+.else
+CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
@@ -68,15 +79,6 @@ PLIST_SUB+=	IF_DEFAULT_MAJOR=""
 PLIST_SUB+=	IF_DEFAULT_MAJOR="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
-# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building
-#LDFLAGS+=	"-L${LOCALBASE}/lib"
-#CFLAGS+=	"-I${LOCALBASE}/include"
-.else
-CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 CONFIGURE_ARGS+=	--with-threads

Modified: head/lang/python33/Makefile
==============================================================================
--- head/lang/python33/Makefile	Mon May  6 06:30:39 2013	(r317468)
+++ head/lang/python33/Makefile	Mon May  6 06:32:22 2013	(r317469)
@@ -54,6 +54,17 @@ OPTIONS_DEFAULT=	THREADS PYMALLOC IPV6
 
 NLS_DESC=	Enable Gettext support for the locale module
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building
+#LDFLAGS+=	"-L${LOCALBASE}/lib"
+#CFLAGS+=	"-I${LOCALBASE}/include"
+.else
+CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
@@ -69,15 +80,6 @@ PLIST_SUB+=	IF_DEFAULT_MAJOR=""
 PLIST_SUB+=	IF_DEFAULT_MAJOR="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=	yes
-# XXX do not set any LDFLAGS or CFLAGS - this causes pyexpat to fail building
-#LDFLAGS+=	"-L${LOCALBASE}/lib"
-#CFLAGS+=	"-I${LOCALBASE}/include"
-.else
-CONFIGURE_ENV+=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 CONFIGURE_ARGS+=	--with-threads