ports/105848: [devel/popt] [patch] remove xgettext depends

[Alex Kozlov]

>Number:         105848
>Category:       ports
>Synopsis:       [devel/popt] [patch] remove xgettext depends
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 25 19:40:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Alex Kozlov
>Release:        FreeBSD 6.1
>Organization:
private
>Environment:
>Description:
	remove xgettext depends; don't check gettext ver in WITHOUT_NLS case; cleanup
>How-To-Repeat:
>Fix:

--- Makefile,orig       Tue Aug 15 01:55:15 2006
+++ Makefile			Mon Nov 18 10:32:08 2006
@@ -20,8 +20,6 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A getopt(3) like library with a number of enhancements, from Redhat
 
-BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
-
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -29,6 +27,9 @@
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--program-prefix=""
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
@@ -38,15 +39,17 @@
 PLIST_SUB+=	NLS=""
 .endif
 
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 pre-configure:
+# remove check for xgettext - popt do not use it anyway
+	@${REINPLACE_CMD} -e \
+		's:if test ! -f ../rpm.c:if test "1" != "1":' \
+		${WRKSRC}/configure
+
+.if !defined(WITHOUT_NLS)
 	@if [ -n "`${PKG_INFO} -I 'gettext-0.1[012].*' 2>/dev/null`" ]; then \
 		${ECHO_CMD} "${PKGNAME}: requires at least gettext 0.13, please upgrade your installed version."; \
 		${FALSE}; \
 	fi
+.endif
 
 .include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted: