diff options
| author | bapt <bapt@FreeBSD.org> | 2013-06-03 18:49:00 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-06-03 18:49:00 +0800 |
| commit | 69fc63c9f284dadeeb7c87c624a21ef44e0df3ba (patch) | |
| tree | 5ee497fa33af5b7a4c7e7551ec61b9385f0b2a2c | |
| parent | b2183f34e021dbf5598ac44c772e743f5a101881 (diff) | |
| download | freebsd-ports-gnome-69fc63c9f284dadeeb7c87c624a21ef44e0df3ba.tar.gz freebsd-ports-gnome-69fc63c9f284dadeeb7c87c624a21ef44e0df3ba.tar.zst freebsd-ports-gnome-69fc63c9f284dadeeb7c87c624a21ef44e0df3ba.zip | |
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@marino.st>
| -rw-r--r-- | devel/cgit/Makefile | 8 | ||||
| -rw-r--r-- | devel/cgit/pkg-plist | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile index aab92c1da230..5448c561f7e1 100644 --- a/devel/cgit/Makefile +++ b/devel/cgit/Makefile @@ -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 diff --git a/devel/cgit/pkg-plist b/devel/cgit/pkg-plist index d3e486d2d414..7b6283cdc481 100644 --- a/devel/cgit/pkg-plist +++ b/devel/cgit/pkg-plist @@ -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 -@dirrm lib/cgit/html-converters/resources/ -@dirrm lib/cgit/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/ +@dirrmtry /var/cache |