From nobody@FreeBSD.org  Sat Jun 15 21:07:42 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 17CE032D
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Jun 2013 21:07:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A3A81979
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Jun 2013 21:07:42 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r5FL7fUM047897
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 15 Jun 2013 21:07:41 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r5FL7fiU047892;
	Sat, 15 Jun 2013 21:07:41 GMT
	(envelope-from nobody)
Message-Id: <201306152107.r5FL7fiU047892@oldred.freebsd.org>
Date: Sat, 15 Jun 2013 21:07:41 GMT
From: Kevin Zheng <kevinz5000@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Fix build for devel/cgit on systems with WITHOUT_NLS
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         179599
>Category:       ports
>Synopsis:       [patch] Fix build for devel/cgit on systems with WITHOUT_NLS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 15 21:10:01 UTC 2013
>Closed-Date:    Sun Jun 16 23:17:44 UTC 2013
>Last-Modified:  Sun Jun 16 23:20:00 UTC 2013
>Originator:     Kevin Zheng
>Release:        9.1-RELEASE-p3
>Organization:
>Environment:
FreeBSD sigma.local 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:11:52 UTC 2013     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
I'm one of those few people who set WITHOUT_NLS (or its modern equivalent) because I simply never use NLS anyways. Unfortunately this means that I run in to a lot of problems with ports that want gettext around anyways.

When "WITHOUT_NLS=yes" is set in 'make.conf', gettext is not installed in my Poudriere cleanroom build. On normal systems, gettext is usually there, and on Redports, NLS is always built. Hence, this issue isn't usually reported until some poor guy like me comes along.

Basically, I can fix the build for me by adding "USES+= gettext" in the port Makefile. Because I am greedy and selfish, I'll do this until I can find a better fix that doesn't require us use something we don't want.

Also, take maintainership because I use this port.
>How-To-Repeat:
Set up a poudriere with "WITHOUT_NLS=yes" set and build cgit. It won't build.
>Fix:
Apply the attached patch.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 321016)
+++ Makefile	(working copy)
@@ -10,8 +10,8 @@
 DISTFILES=	cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \
 		git-${GIT_VERSION}.tar.gz:git
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Fast webinterface for git
+MAINTAINER=	kevinz5000@gmail.com
+COMMENT=	Fast web frontend for Git repositories
 
 LICENSE=	GPLv2
 
@@ -19,7 +19,7 @@
 GIT_VERSION=	1.8.2.3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USES=		iconv shebangfix
+USES=		gettext iconv shebangfix
 SHEBANG_FILES=	filters/html-converters/resources/markdown.pl
 USE_GMAKE=	yes
 USE_OPENSSL=	yes


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: antoine 
State-Changed-When: Sun Jun 16 23:17:07 UTC 2013 
State-Changed-Why:  
The problem has been fixed, thanks for the report! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179599: commit references a PR
Date: Sun, 16 Jun 2013 23:14:49 +0000 (UTC)

 Author: antoine
 Date: Sun Jun 16 23:14:41 2013
 New Revision: 321081
 URL: http://svnweb.freebsd.org/changeset/ports/321081
 
 Log:
   - Fix build WITHOUT_NLS, NO_GETTEXT must be passed to make
   - Fix plist with pkg_install
   - Pass maintainership to reporter
   
   PR:		ports/179599
   Reported by:	Kevin Zheng
 
 Modified:
   head/devel/cgit/Makefile
   head/devel/cgit/pkg-plist
 
 Modified: head/devel/cgit/Makefile
 ==============================================================================
 --- head/devel/cgit/Makefile	Sun Jun 16 22:42:53 2013	(r321080)
 +++ head/devel/cgit/Makefile	Sun Jun 16 23:14:41 2013	(r321081)
 @@ -3,15 +3,15 @@
  
  PORTNAME=	cgit
  PORTVERSION=	0.9.2
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	devel www
  MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
  		GOOGLE_CODE:git
  DISTFILES=	cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \
  		git-${GIT_VERSION}.tar.gz:git
  
 -MAINTAINER=	ports@FreeBSD.org
 -COMMENT=	Fast webinterface for git
 +MAINTAINER=	kevinz5000@gmail.com
 +COMMENT=	Fast web frontend for Git repositories
  
  LICENSE=	GPLv2
  
 @@ -23,15 +23,15 @@ USES=		iconv shebangfix
  SHEBANG_FILES=	filters/html-converters/resources/markdown.pl
  USE_GMAKE=	yes
  USE_OPENSSL=	yes
 -CFLAGS+=	-I${LOCALBASE}/include -DNO_GETTEXT=1
 +CFLAGS+=	-I${LOCALBASE}/include
  MAKE_ARGS+=	CGIT_SCRIPT_PATH=${WWWDIR} \
 -		CGIT_CONFIG=${PREFIX}/etc/cgitrc
 +		CGIT_CONFIG=${PREFIX}/etc/cgitrc NO_GETTEXT=1
  LDFLAGS+=	-L${LOCALBASE}/lib
  MAKE_JOBS_SAFE=	yes
  
  SUB_FILES=	pkg-message
  SUB_LIST+=	PORTNAME=${PORTNAME}
 -PLIST_SUB+=	PORTNAME=${PORTNAME}
 +PLIST_SUB+=	PORTNAME=${PORTNAME} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
  
  .include <bsd.port.options.mk>
  
 
 Modified: head/devel/cgit/pkg-plist
 ==============================================================================
 --- head/devel/cgit/pkg-plist	Sun Jun 16 22:42:53 2013	(r321080)
 +++ head/devel/cgit/pkg-plist	Sun Jun 16 23:14:41 2013	(r321081)
 @@ -13,12 +13,11 @@ lib/cgit/filters/html-converters/rst2htm
  lib/cgit/filters/html-converters/txt2html
  lib/cgit/filters/syntax-highlighting.py
  lib/cgit/filters/syntax-highlighting.sh
 -lib/cgit/filters/about-formatting.sh
 -@dirrm lib/cgit/filters/html-converters/resources/
 -@dirrm lib/cgit/filters/html-converters/
 +@dirrm lib/cgit/filters/html-converters/resources
 +@dirrm lib/cgit/filters/html-converters
  @dirrm lib/cgit/filters
  @dirrm lib/cgit
  @dirrm %%WWWDIR%%
  @exec mkdir -p /var/cache/%%PORTNAME%%
 -@dirrmtry /var/cache/%%PORTNAME%%
 -@dirrmtry /var/cache
 +@exec chown %%WWWOWN%%:%%WWWGRP%% /var/cache/%%PORTNAME%%
 +@unexec rmdir /var/cache/%%PORTNAME%% 2>/dev/null || true
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
