[csw-devel] SF.net SVN: gar:[2651] csw/mgar/pkg/git/trunk

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Thu Dec 18 02:24:49 CET 2008


Revision: 2651
          http://gar.svn.sourceforge.net/gar/?rev=2651&view=rev
Author:   bdwalton
Date:     2008-12-18 01:24:49 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
- Reorged the package split (somewhat...and not fully tested)
- Build depend on pm_subversion now (so we can do git_svn)
- Actually install documentation
- Enable the git emacs contrib extra.

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2008-12-18 00:03:41 UTC (rev 2650)
+++ csw/mgar/pkg/git/trunk/Makefile	2008-12-18 01:24:49 UTC (rev 2651)
@@ -3,12 +3,18 @@
 CATEGORIES = devel
 
 PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl
-PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtcl CSWtk
+PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtcl CSWtk CSWexpat
+PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn
 
-REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurl CSWosslrt CSWpmgit
+REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt
+REQUIRED_PKGS_CSWgit += CSWossh CSWiconv CSWexpat CSWbash
+
 REQUIRED_PKGS_CSWgitk = CSWgit CSWtk
+
 REQUIRED_PKGS_CSWgitgui = CSWgit CSWtk
 
+REQUIRED_PKGS_CSWgitdoc = CSWgit
+
 DESCRIPTION = Fast Version Control System
 define BLURB
   Git is a popular version control system designed to handle
@@ -18,36 +24,39 @@
 
 MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += $(call admfiles,CSWgit,)
-DISTFILES += $(call admfiles,CSWgitdoc,)
-DISTFILES += $(call admfiles,CSWpmgit,)
 DISTFILES += $(call admfiles,CSWgitgui,)
 DISTFILES += $(call admfiles,CSWgitk,)
+DISTFILES += $(call admfiles,CSWgitemacs,)
+DISTFILES += $(call admfiles,CSWgitdoc,)
+DISTFILES += $(call admfiles,CSWgit,)
 
 PATCHFILES = doc-makefile.patch
 
+
 PKGFILES_CSWgitgui = $(bindir)/git-gui $(bindir)/git-citool \
 			$(mandir)/man1/git-gui.* $(mandir)/man1/git-citool.* \
 			$(datadir)/git-gui/.* $(datadir)/doc/git-gui.*
 PKGFILES_CSWgitk = $(bindir)/gitk $(datadir)/doc/gitk.* $(datadir)/gitk.* \
 			$(mandir)/man1/gitk.*
+PKGFILES_CSWgitemacs = $(datadir)/emacs/.*
 PKGFILES_CSWgitdoc = $(datadir)/doc/.*
 
-PKGFILES_CSWpmgit = 
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 GARCOMPILER = GNU
 
-CONFIGURE_ARGS = $(DIRPATHS) --with-shell=/opt/csw/bin/bash
-CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl
-CONFIGURE_ARGS += --with-tcltk=/opt/csw/bin/tclsh
-CONFIGURE_ARGS += --with-zlib=/opt/csw
+CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash
+CONFIGURE_ARGS += --with-perl=$(bindir)/perl
+CONFIGURE_ARGS += --with-tcltk=$(bindir)/tclsh
+CONFIGURE_ARGS += --with-zlib=$(prefix)
+CONFIGURE_ARGS += --with-iconv=$(prefix)
 
-BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash all doc
+BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \
+		ETC_CONFIG=$(sysconfdir)/gitconfig \
+		all doc
 
-INSTALL_ARGS = install install-doc
+INSTALL_ARGS = ETC_CONFIG=$(sysconfdir)/gitconfig install-doc
 
 include gar/category.mk
 
@@ -55,8 +64,24 @@
 # gnu must come first so xpg4/sed isn't found first.
 PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH)
 
+# force the elisp extension to be built too.
+post-build-modulated:
+	@echo Builing Emacs Git extension
+	@( cd $(WORKSRC); $(MAKE) -C contrib/emacs )
+
+post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME)-$(GARVERSION)
 post-install-modulated:
 	@echo Removing perllocal.pod
-	@rm -f ${DESTDIR}/opt/csw/lib/perl/5.8.8/perllocal.pod*
+	@rm -f ${DESTDIR}/$(perllib)/5.8.8/perllocal.pod*
 	@chmod 644 ${DESTDIR}/${libdir}/perl5/site_perl/*pm
+	@echo Installing Emacs Git extension
+	@( cd $(WORKSRC); $(MAKE) -C contrib/emacs install \
+		emacsdir=$(DESTDIR)/$(datadir)/emacs/site-lisp )
+	@echo Installing Documentation
+	@( cd $(WORKSRC); \
+		ginstall -c -m 0755 -d $(GD); \
+		cp -R Documentation/*.txt $(GD)/; \
+		cp -R contrib/hooks README COPYING $(GD)/; \
+		cp -R Documentation/*.html Documentation/docbook-xsl.css $(GD)/; \
+		cp -R Documentation/howto Documentation/technical $(GD)/; )
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2008-12-18 00:03:41 UTC (rev 2650)
+++ csw/mgar/pkg/git/trunk/checksums	2008-12-18 01:24:49 UTC (rev 2651)
@@ -1,7 +1,7 @@
 899172ebeac65f7a09a8e204d4f87d8c  download/git-1.6.0.5.tar.bz2
-57d2c46660773d3a1e87651447e3252a  download/CSWgit.gspec
-5c5f3cd7951602129a5283c0c242ed3d  download/CSWgitdoc.gspec
-9ca606aeacf21b081e425a539b848567  download/CSWpmgit.gspec
 c5210335743e17938bde6f922891b02a  download/CSWgitgui.gspec
 82bc03b73b73a6f4b251992a1c671aab  download/CSWgitk.gspec
+9cac3cac85cac148c423d18d8b40d9ee  download/CSWgitemacs.gspec
+5c5f3cd7951602129a5283c0c242ed3d  download/CSWgitdoc.gspec
+57d2c46660773d3a1e87651447e3252a  download/CSWgit.gspec
 369547e8222dcf8be214b5013f28afcc  download/doc-makefile.patch

Added: csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec
===================================================================
--- csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/CSWgitemacs.gspec	2008-12-18 01:24:49 UTC (rev 2651)
@@ -0,0 +1,5 @@
+%var            bitname gitemacs
+%var            pkgname CSWgitemacs
+%var		desc A Git VCS mode for Emacs
+%include        url file://%{PKGLIB}/csw_dyndepend.gspec
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Deleted: csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec
===================================================================
--- csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec	2008-12-18 00:03:41 UTC (rev 2650)
+++ csw/mgar/pkg/git/trunk/files/CSWpmgit.gspec	2008-12-18 01:24:49 UTC (rev 2651)
@@ -1,5 +0,0 @@
-%var            bitname pm_git
-%var            pkgname CSWpmgit
-%var		desc Perl interface to Git
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING


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