[csw-devel] SF.net SVN: gar:[6896] csw/mgar/pkg
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sun Oct 18 20:00:54 CEST 2009
Revision: 6896
http://gar.svn.sourceforge.net/gar/?rev=6896&view=rev
Author: wahwah
Date: 2009-10-18 18:00:53 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
shunit2: Initial commit
Modified Paths:
--------------
csw/mgar/pkg/shunit2/trunk/Makefile
csw/mgar/pkg/shunit2/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/shunit2/
csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch
csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch
Modified: csw/mgar/pkg/shunit2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile 2009-09-24 17:03:41 UTC (rev 6443)
+++ csw/mgar/pkg/shunit2/trunk/Makefile 2009-10-18 18:00:53 UTC (rev 6896)
@@ -2,181 +2,38 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-## This file contains comments to guide you through various GAR settings.
-## Please remove unnecessary comments before committing your code to the code
-## repository. The comments to remove are marked with double hashes.
-## If you want to remove them all in-place, use:
-## gsed -i -e '/^##/d' Makefile
-##
-## For more information about GAR variables, please see:
-## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference
-##
-GARNAME = mypkg
-GARVERSION = 1.0
-##
-## The category that your software fits in. This is not a descriptive field, but
-## influences the build process. Depending on the CATEGORIES setting, different
-## Makefiles are included from gar/categories/ in your trunk directory, which
-## adjust the build settings for the respective category.
-##
-## Possible settings are:
-## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server,
-## utils, x11, xfce, xorg, xtra
+GARNAME = shunit2
+GARVERSION = 2.1.5
CATEGORIES = lib
-##
-## A one-line description of the package, which will appear in the pkginfo.
-DESCRIPTION = <please fill in>
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
+DESCRIPTION = a xUnit unit test framework for Bourne based shell scripts
define BLURB
- <please fill in>
+
+ shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and it
+ is designed to work in a similar manner to JUnit, PyUnit, etc. If you have
+ ever had the desire to write a unit test for a shell script, shUnit2 can do
+ the job.
+
endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
-SPKG_SOURCEURL =
-##
-## Whitespace-separated list of URLs to download the source package from.
-## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR).
-MASTER_SITES =
-##
-## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
-## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge
-## project name of the software you wish to download.
-## SF_PROJ =
-##
-## A list of space separated patch filenames from files/ that are to be applied
-## to the extracted software before the ./configure stage. Patches need to be
-## included in the DISTFILES variable as well.
-## PATCHFILES =
-##
-## Whitespace-separated list of files which comprise this build. mGAR will look
-## for the files in the $(FILEDIR) (trunk/files) directory and on the
-## $(MASTER_SITES).
-DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## It is different from the system package name, which by convention is CSWpkgname.
-## CATALOGNAME =
-##
-## Set to 1 to mark the package as architecture-independent.
-## ARCHALL = 0
-##
-## A list of files / patterns that should be excluded from the package. Amends
-## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which
-## contains things like libtool .la files and files with a leading ~.
-## EXTRA_MERGE_EXCLUDE_FILES =
-##
-## A list of space separated package names that should be marked as
-## incompatible with the current package. This will go into the depend file.
-## When a user has one of the incompatible packages installed and installs
-## your package, he will be prompted that the incompatible package must be
-## removed. He will however not be prevented to install your package without
-## removing the conflicting package first.
-## INCOMPATIBLE_PKGS =
-##
-## The name of the license file that should be included in your package. Defaults
-## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details
-## on including and displaying licenses.
-## LICENSE =
-##
-## A list of space separated package names that should be produced from your
-## Makefile. This is used when a software has different components that can be
-## packaged and used individually (think runtime libraries, client tools, server
-## files, development headers). You don't need to set this when you just want to
-## produce one package.
-##
-## When you set this variable to include more than one package, you also need to
-## set PKGFILES_CSWpkgname for each package (except for the first one in your
-## $(PACKAGES) list) to define which files go into each package. The first
-## package from $(PACKAGES) one will hold all files that are not matched by
-## PKGFILES_ for other packages.
-## PACKAGES =
-##
-## If specified, GAR feeds the almost-final package prototype file to
-## $(PROTOTYPE_FILTER) and reads the final package prototype file from it.
-## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used
-## to prepare the prototype file for use with cswclassutils (see
-## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils,
-## you will rarely have to use this. A still valid use case would be to change
-## the file permissions of a file to be set-UID.
-## See http://wiki.opencsw.org/cswclassutils-package for common usage information
-## PROTOTYPE_FILTER =
-##
-## cswclassutils settings
-##
-## A list of action classes. Possible values are:
-## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf
-## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils,
-## you need to add CSWcswclassutils to REQUIRED_PKGS.
-## SPKG_CLASSES = none
-## Simplified settings for classes:
-## PRESERVECONF =
-## SAMPLECONF =
-## INITSMF =
-## USERGROUP =
-## A list of runtime package dependencies in the form of CSWfoo.
-## REQUIRED_PKGS =
-##
-## A list of packages necessary to build this package
-## PREREQUISITE_PKGS = $(REQUIRED_PKGS)
-##
-## When using non-empty $(PACKAGES):
-## REQUIRED_PKGS_CSWpkgname =
-## SPKG_DESC_CSWpkgname =
-## PKGFILES_CSWpkgname =
-## CATALOGNAME_CSWpkgname =
-##
-## A list of space separated directories where objects should be stripped in
-## addition to the bin/ and sbin/ directories.
-## STRIP_DIRS =
-##
-## Define a custom target for the configure phase. When you set this, the target
-## that will be used instead of configure: target, is named
-## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile
-## after including gar/gar.include.mk. If you want to skip the configure phase
-## completely (for example when your software doesn't need to be compiled) assign
-## this variable an empty value. The procedure works for configure, build,
-## install and test steps.
-## CONFIGURE_SCRIPTS =
-## BUILD_SCRIPTS =
-## INSTALL_SCRIPTS =
-## TEST_SCRIPTS =
-##
-## Compilation settings
-##
-## The build directory.
-## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
-##
-## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this
-## for example, if you need to override Makefile variables.
-## BUILD_ARGS =
-##
-## Arguments passed to the ./configure script.
-CONFIGURE_ARGS = $(DIRPATHS)
-##
-## BUILD64 =
-## CONFIGURE_ENV =
-## EXTRA_CFLAGS =
-## EXTRA_LDFLAGS =
-## EXTRA_INC =
-## EXTRA_LIB =
-## GARFLAVOR =
-## INSTALL_ARGS =
-## OPT_FLAGS_SOS = -xO3
-## OPT_FLAGS_GCC = -O2 -pipe
-##
-## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4.
-## GARCOMPILER = SOS11
-##
-# Remove the following rules and uncomment the
-# include before building.
-all: .DEFAULT
-.DEFAULT:
- @true
+SPKG_SOURCEURL = http://code.google.com/p/shunit2/
+MASTER_SITES = $(GOOGLE_MIRROR)
+PATCHFILES = 0001-fix-shlib-path-in-docbookPrep.sh.patch
+PATCHFILES += 0002-abspath-instead-of-PWD.patch
+DISTFILES = $(GARNAME)-$(GARVERSION).tgz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
+ARCHALL = 1
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = shunit2
+INSTALL_SCRIPTS = shunit2
+TEST_SCRIPTS =
+include gar/category.mk
-#include gar/category.mk
+build-shunit2:
+ (cd $(WORKSRC) && $(BUILD_ENV) gmake)
+ @$(MAKECOOKIE)
+
+install-shunit2:
+ ginstall -m 755 -d $(DESTDIR)$(libdir)/shunit2
+ ginstall -m 755 -d $(DESTDIR)$(datadir)/doc/shunit2
+ ginstall -m 644 $(WORKSRC)/build/shunit2 $(DESTDIR)$(libdir)/shunit2
+ ginstall -m 644 $(WORKSRC)/build/shunit2.html $(DESTDIR)$(datadir)/doc/shunit2
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/shunit2/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums 2009-09-24 17:03:41 UTC (rev 6443)
+++ csw/mgar/pkg/shunit2/trunk/checksums 2009-10-18 18:00:53 UTC (rev 6896)
@@ -0,0 +1,3 @@
+b35832f18a1557c0f5d4b58dcc2c32d3 download/0001-fix-shlib-path-in-docbookPrep.sh.patch
+3d422c3b03478a37280e08d98a7c14aa download/0002-abspath-instead-of-PWD.patch
+f434f0095f7ca9a698ade330feae356a download/shunit2-2.1.5.tgz
Added: csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch
===================================================================
--- csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch (rev 0)
+++ csw/mgar/pkg/shunit2/trunk/files/0001-fix-shlib-path-in-docbookPrep.sh.patch 2009-10-18 18:00:53 UTC (rev 6896)
@@ -0,0 +1,25 @@
+From ed54daa547e0bc6c3b69bd45c565b58142ccd49e Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 18 Oct 2009 19:10:42 +0200
+Subject: [PATCH] fix shlib path in docbookPrep.sh
+
+---
+ bin/docbookPrep.sh | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bin/docbookPrep.sh b/bin/docbookPrep.sh
+index ab3172a..0d46ba9 100755
+--- a/bin/docbookPrep.sh
++++ b/bin/docbookPrep.sh
+@@ -21,7 +21,7 @@ MY_BASE=`basename "$0"`
+ MY_DIR=`dirname "$0"`
+
+ # load shlib
+-. "${MY_DIR}/../lib/sh/shlib"
++. "${MY_DIR}/../lib/shlib"
+
+ BASE_DIR=`shlib_relToAbsPath "${MY_DIR}/.."`
+ DL_DIR="${BASE_DIR}/tmp"
+--
+1.6.3.2
+
Added: csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch
===================================================================
--- csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch (rev 0)
+++ csw/mgar/pkg/shunit2/trunk/files/0002-abspath-instead-of-PWD.patch 2009-10-18 18:00:53 UTC (rev 6896)
@@ -0,0 +1,37 @@
+From 5a5f760453cec85e4f3f1c6d19448c4e16020fdd Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 18 Oct 2009 19:56:54 +0200
+Subject: [PATCH] abspath instead of PWD
+
+---
+ Makefile | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 080ba0c..0b88336 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,13 +9,13 @@
+
+ PROG=shunit2
+
+-BIN_DIR=$(PWD)/bin
+-BUILD_DIR=$(PWD)/build
+-DIST_DIR=$(PWD)/dist
+-LIB_DIR=$(PWD)/lib
+-SHARE_DIR=$(PWD)/share
+-SRC_DIR=$(PWD)/src
+-TMP_DIR=$(PWD)/tmp
++BIN_DIR=$(abspath bin)
++BUILD_DIR=$(abspath build)
++DIST_DIR=$(abspath dist)
++LIB_DIR=$(abspath lib)
++SHARE_DIR=$(abspath share)
++SRC_DIR=$(abspath src)
++TMP_DIR=$(abspath tmp)
+
+ DOCBOOK_BUILD_DIR=$(BUILD_DIR)/docbook
+ DOCBOOK_SHARE_DIR=$(SHARE_DIR)/docbook
+--
+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