diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2011-03-07 12:15:16 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2011-03-07 12:15:16 +0000 |
| commit | 4ee7c7a2e2bfaaff7732628fbe6ebd655a4e7e53 (patch) | |
| tree | a149393cdb7321fa61b3dc0ba60faca60b3cec22 /devel/cgit | |
| parent | 53507088e9877bf1fc59fe19610e3520af573256 (diff) | |
| download | ports-4ee7c7a2e2bfaaff7732628fbe6ebd655a4e7e53.tar.gz ports-4ee7c7a2e2bfaaff7732628fbe6ebd655a4e7e53.zip | |
Notes
Diffstat (limited to 'devel/cgit')
| -rw-r--r-- | devel/cgit/Makefile | 7 | ||||
| -rw-r--r-- | devel/cgit/distinfo | 8 | ||||
| -rw-r--r-- | devel/cgit/files/patch-Makefile | 30 |
3 files changed, 22 insertions, 23 deletions
diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile index 3a292d9f2acb..95e6aba39b7d 100644 --- a/devel/cgit/Makefile +++ b/devel/cgit/Makefile @@ -6,14 +6,14 @@ # PORTNAME= cgit -PORTVERSION= 0.8.3.4 +PORTVERSION= 0.9 CATEGORIES= devel www MASTER_SITES= http://hjemli.net/git/cgit/snapshot/:cgit \ ${MASTER_SITE_KERNEL_ORG:S/$/:git/g} MASTER_SITE_SUBDIR= software/scm/git/:git DISTFILES= cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \ git-${GIT_VERSION}.tar.bz2:git -GIT_VERSION= 1.7.3 +GIT_VERSION= 1.7.4 MAINTAINER= bapt@FreeBSD.org COMMENT= A fast webinterface for git @@ -31,7 +31,8 @@ USE_OPENSSL= yes CFLAGS+= -I${LOCALBASE}/include MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \ CGIT_SCRIPT_PATH=${WWWDIR} \ - CGIT_CONFIG=${PREFIX}/etc/cgitrc + CGIT_CONFIG=${PREFIX}/etc/cgitrc \ + NEEDS_LIBICONV=yes SUB_FILES= pkg-message diff --git a/devel/cgit/distinfo b/devel/cgit/distinfo index 738c55f929d4..b0c4b8ac3ed0 100644 --- a/devel/cgit/distinfo +++ b/devel/cgit/distinfo @@ -1,4 +1,4 @@ -SHA256 (cgit-0.8.3.4.tar.bz2) = 9df3a84b40cefc468d41937a930635960ffb5fa12b88099c7a6b24ee4124e8a0 -SIZE (cgit-0.8.3.4.tar.bz2) = 54832 -SHA256 (git-1.7.3.tar.bz2) = 0035a4a7906f65812072457b65c609f24c66f31593d0ad372b7c18894a26b07d -SIZE (git-1.7.3.tar.bz2) = 2629734 +SHA256 (cgit-0.9.tar.bz2) = 530eaf702b8ca0a44750f5ed1f27b1d74b317441cce9d2d4bb340c7dbea8a48f +SIZE (cgit-0.9.tar.bz2) = 63580 +SHA256 (git-1.7.4.tar.bz2) = 8e260b9e5dfb46a35f26e3db450c2dabb4d1df254bfb2820779945a1ecbcef51 +SIZE (git-1.7.4.tar.bz2) = 2703735 diff --git a/devel/cgit/files/patch-Makefile b/devel/cgit/files/patch-Makefile index 7941f298fd79..06dde653813d 100644 --- a/devel/cgit/files/patch-Makefile +++ b/devel/cgit/files/patch-Makefile @@ -1,25 +1,23 @@ ---- ./Makefile.orig 2010-09-27 08:00:47.000000000 +0200 -+++ ./Makefile 2010-09-29 08:08:53.348328439 +0200 -@@ -1,9 +1,9 @@ - CGIT_VERSION = v0.8.3.4 +--- ./Makefile.orig 2011-03-05 14:23:12.000000000 +0100 ++++ ./Makefile 2011-03-07 13:03:16.000000000 +0100 +@@ -1,8 +1,8 @@ + CGIT_VERSION = v0.9 CGIT_SCRIPT_NAME = cgit.cgi -CGIT_SCRIPT_PATH = /var/www/htdocs/cgit -CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) -CGIT_CONFIG = /etc/cgitrc --CACHE_ROOT = /var/cache/cgit +CGIT_SCRIPT_PATH ?= /var/www/htdocs/cgit +CGIT_DATA_PATH ?= $(CGIT_SCRIPT_PATH) +CGIT_CONFIG ?= /etc/cgitrc -+CACHE_ROOT ?= /var/cache/cgit - SHA1_HEADER = <openssl/sha.h> - GIT_VER = 1.7.3 - GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 -@@ -68,7 +68,7 @@ - $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< + CACHE_ROOT = /var/cache/cgit + prefix = /usr + libdir = $(prefix)/lib +@@ -118,7 +118,7 @@ + OBJECTS += vector.o + + ifdef NEEDS_LIBICONV +- EXTLIBS += -liconv ++ EXTLIBS += -L$(LOCALBASE)/lib -liconv + endif --EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread -+EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread -L${LOCALBASE}/lib -liconv - OBJECTS = - OBJECTS += cache.o - OBJECTS += cgit.o |