[csw-devel] SF.net SVN: gar:[13849] csw/mgar/pkg/tig/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Mar 17 14:02:15 CET 2011


Revision: 13849
          http://gar.svn.sourceforge.net/gar/?rev=13849&view=rev
Author:   dmichelsen
Date:     2011-03-17 13:02:14 +0000 (Thu, 17 Mar 2011)

Log Message:
-----------
tig: Update to 0.17

Modified Paths:
--------------
    csw/mgar/pkg/tig/trunk/Makefile
    csw/mgar/pkg/tig/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch

Modified: csw/mgar/pkg/tig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tig/trunk/Makefile	2011-03-17 08:59:34 UTC (rev 13848)
+++ csw/mgar/pkg/tig/trunk/Makefile	2011-03-17 13:02:14 UTC (rev 13849)
@@ -1,10 +1,7 @@
 NAME = tig
-VERSION = 0.14.1
+VERSION = 0.17
 CATEGORIES = utils
-PATCHLEVEL = 1e69632
 
-VENDOR_URL = http://jonas.nitro.dk/tig/
-
 DESCRIPTION = A git repository browser
 define BLURB
 Tig is a git repository browser that additionally can act as a pager
@@ -17,19 +14,28 @@
 Using it as a pager, it will display input from stdin and colorize it.
 endef
 
-GARCOMPILER = GNU
+MASTER_SITES = http://jonas.nitro.dk/tig/releases/
+DISTFILES = $(NAME)-$(VERSION).tar.gz
 
-BUILD_DEP_PKGS = CSWncurses CSWasciidoc CSWxmlto CSWiconv
+VENDOR_URL = http://jonas.nitro.dk/tig/
 
-RUNTIME_DEP_PKGS = CSWncurses CSWiconv CSWgit
+BUILD_DEP_PKGS += CSWncurses
+BUILD_DEP_PKGS += CSWasciidoc
+BUILD_DEP_PKGS += CSWxmlto
+BUILD_DEP_PKGS += CSWiconv
 
-GIT_REPOS = http://jonas.nitro.dk/tig/tig.git
-GIT_TREEISH_tig.git = $(PATCHLEVEL)
+RUNTIME_DEP_PKGS += CSWncurses
+RUNTIME_DEP_PKGS += CSWiconv
+RUNTIME_DEP_PKGS += CSWgit
+# Yes, we do need git
+CHECKPKG_OVERRIDES_CSWtig += surplus-dependency|CSWgit
 
-PATCHFILES = 0001-add-install-detection-to-the-autoconf-setup.patch
+GARCOMPILER = GNU
 
 sysconfdir = /etc/opt/csw
 
+EXTRA_CPPFLAGS = -I$(includedir)/ncursesw
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv=$(prefix)
 
@@ -39,11 +45,5 @@
 
 include gar/category.mk
 
-# Set a slightly altered revstamp to indicate that we're not using a
-# pressed release.
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(PATCHLEVEL)
-
-# automake isn't used, but we want install-sh.  automake exits 1, so
-# we run true after to keep gmake happy
-pre-configure-modulated:
-	@(cd $(WORKSRC); autoreconf; automake --add-missing; true)
\ No newline at end of file
+# For GNU install to be available as "install"
+PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/tig/trunk/checksums
===================================================================
--- csw/mgar/pkg/tig/trunk/checksums	2011-03-17 08:59:34 UTC (rev 13848)
+++ csw/mgar/pkg/tig/trunk/checksums	2011-03-17 13:02:14 UTC (rev 13849)
@@ -1 +1 @@
-5fe966f3db6c641cc10dbef40913dddf  0001-add-install-detection-to-the-autoconf-setup.patch
+f373343199422c59518776db448dec0e  tig-0.17.tar.gz

Deleted: csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch
===================================================================
--- csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch	2011-03-17 08:59:34 UTC (rev 13848)
+++ csw/mgar/pkg/tig/trunk/files/0001-add-install-detection-to-the-autoconf-setup.patch	2011-03-17 13:02:14 UTC (rev 13849)
@@ -1,73 +0,0 @@
-From d12d5d6f186ac25d83324c6cd87eaef87d6df6bb Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Mon, 12 Oct 2009 02:03:17 +0200
-Subject: [PATCH] add install detection to the autoconf setup
-
----
- Makefile       |    8 ++++----
- config.make.in |    2 ++
- configure.ac   |    2 ++
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d764644..cf0771b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -68,7 +68,7 @@ doc-html: $(HTMLDOC)
- install: all
- 	mkdir -p $(DESTDIR)$(bindir) && \
- 	for prog in $(PROGS); do \
--		install -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \
-+		$(INSTALL) -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \
- 	done
- 
- install-doc-man: doc-man
-@@ -77,8 +77,8 @@ install-doc-man: doc-man
- 	for doc in $(MANDOC); do \
- 		sed 's#++SYSCONFDIR++#$(sysconfdir)#' < "$$doc" > "$$doc+"; \
- 		case "$$doc" in \
--		*.1) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man1/$$doc" ;; \
--		*.5) install -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man5/$$doc" ;; \
-+		*.1) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man1/$$doc" ;; \
-+		*.5) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(mandir)/man5/$$doc" ;; \
- 		esac; \
- 		$(RM) "$$doc+"; \
- 	done
-@@ -88,7 +88,7 @@ install-doc-html: doc-html
- 	for doc in $(HTMLDOC); do \
- 		sed 's#++SYSCONFDIR++#$(sysconfdir)#' < "$$doc" > "$$doc+"; \
- 		case "$$doc" in \
--		*.html) install -p -m 0644 "$$doc+" "$(DESTDIR)$(docdir)/tig/$$doc" ;; \
-+		*.html) $(INSTALL) -p -m 0644 "$$doc+" "$(DESTDIR)$(docdir)/tig/$$doc" ;; \
- 		esac; \
- 		$(RM) "$$doc+"; \
- 	done
-diff --git a/config.make.in b/config.make.in
-index 3962050..a5621e9 100644
---- a/config.make.in
-+++ b/config.make.in
-@@ -12,6 +12,8 @@ CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H
- LDFLAGS = @LDFLAGS@
- LDLIBS = @LIBS@
- 
-+INSTALL = @INSTALL@
-+
- ASCIIDOC = @ASCIIDOC@
- XMLTO = @XMLTO@
- DOCBOOK2PDF = @DOCBOOK2PDF@
-diff --git a/configure.ac b/configure.ac
-index b179389..5225c7c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,6 +23,8 @@ AM_ICONV
- 
- AC_PROG_CC
- 
-+AC_PROG_INSTALL
-+
- AC_CHECK_PROG(GIT, [git], [git], [AC_ERROR([git not found])])
- AC_MSG_CHECKING([which config subcommand git supports])
- GIT_CONFIG="repo-config"
--- 
-1.6.3.2
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list