svn commit: r319767 - head/devel/cgit

[Baptiste Daroussin]

Author: bapt
Date: Mon Jun  3 10:49:00 2013
New Revision: 319767
URL: http://svnweb.freebsd.org/changeset/ports/319767

Log:
  Make bundle git respect CFLAGS/LDFLAGS
  Alway build the bundle git without gettext
  fix plist
  sort plist
  
  PR:		ports/179257
  Submitted by:	John Marino <draco at marino.st>

Modified:
  head/devel/cgit/Makefile
  head/devel/cgit/pkg-plist

Modified: head/devel/cgit/Makefile
==============================================================================
--- head/devel/cgit/Makefile	Mon Jun  3 10:34:44 2013	(r319766)
+++ head/devel/cgit/Makefile	Mon Jun  3 10:49:00 2013	(r319767)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cgit
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www
 MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
 		GOOGLE_CODE:git
@@ -23,7 +23,7 @@ USES=		iconv shebangfix
 SHEBANG_FILES=	filters/html-converters/resources/markdown.pl
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-CFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include -DNO_GETTEXT=1
 MAKE_ARGS+=	CGIT_SCRIPT_PATH=${WWWDIR} \
 		CGIT_CONFIG=${PREFIX}/etc/cgitrc
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -40,7 +40,9 @@ post-extract:
 	@${MV} ${WRKDIR}/git-${GIT_VERSION} ${WRKSRC}/git
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^CC =/d' ${WRKSRC}/git/Makefile
+	@${REINPLACE_CMD} -e '/^CC =/d' -e '/^CFLAGS =/d' \
+		-e '/^LDFLAGS =/d' ${WRKSRC}/git/Makefile \
+		${WRKSRC}/git/Makefile
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \
 		-e 's,-Igit,-I.,g' ${WRKSRC}/Makefile
 

Modified: head/devel/cgit/pkg-plist
==============================================================================
--- head/devel/cgit/pkg-plist	Mon Jun  3 10:34:44 2013	(r319766)
+++ head/devel/cgit/pkg-plist	Mon Jun  3 10:49:00 2013	(r319767)
@@ -3,21 +3,22 @@
 %%WWWDIR%%/cgit.png
 %%PORTDOCS%%%%DOCSDIR%%/cgitrc.5.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+lib/cgit/filters/about-formatting.sh
 lib/cgit/filters/commit-links.sh
-lib/cgit/filters/syntax-highlighting.sh
-lib/cgit/filters/html-converters/resources/markdown.pl
-lib/cgit/filters/html-converters/resources/rst-template.txt
 lib/cgit/filters/html-converters/man2html
 lib/cgit/filters/html-converters/md2html
+lib/cgit/filters/html-converters/resources/markdown.pl
+lib/cgit/filters/html-converters/resources/rst-template.txt
 lib/cgit/filters/html-converters/rst2html
 lib/cgit/filters/html-converters/txt2html
 lib/cgit/filters/syntax-highlighting.py
+lib/cgit/filters/syntax-highlighting.sh
 lib/cgit/filters/about-formatting.sh
- at dirrm lib/cgit/html-converters/resources/
- at dirrm lib/cgit/html-converters/
+ at dirrm lib/cgit/filters/html-converters/resources/
+ at 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%%
- at dirrmtry /var/cache/
+ at dirrmtry /var/cache