SF.net SVN: gar:[26318] csw/mgar/pkg/colormake/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Jan 15 13:57:12 CET 2018 

Revision: 26318
          http://sourceforge.net/p/gar/code/26318
Author:   dmichelsen
Date:     2018-01-15 12:57:11 +0000 (Mon, 15 Jan 2018)
Log Message:
-----------
colormake/trunk: Update to 0.9

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

Removed Paths:
-------------
    csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch

Modified: csw/mgar/pkg/colormake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/colormake/trunk/Makefile	2018-01-14 22:33:55 UTC (rev 26317)
+++ csw/mgar/pkg/colormake/trunk/Makefile	2018-01-15 12:57:11 UTC (rev 26318)
@@ -1,5 +1,5 @@
 NAME = colormake
-VERSION = 0.2
+VERSION = 0.9
 GARTYPE = v2
 
 DESCRIPTION = A colorizer for make
@@ -8,28 +8,27 @@
 endef
 
 MASTER_SITES = http://bre.klaki.net/programs/$(NAME)/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-PATCHFILES = 0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch
+DISTFILES += $(DISTNAME).tar.gz
 
-DISTNAME = $(NAME)
+PACKAGES += CSWcolormake
+SPKG_DESC_CSWcolormake = A colorizer for make
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWcolormake += CSWgmake
+RUNTIME_DEP_PKGS_CSWcolormake += CSWcoreutils
+RUNTIME_DEP_PKGS_CSWcolormake += CSWperl
+RUNTIME_DEP_PKGS_CSWcolormake += CSWless
+ARCHALL_CSWcolormake = 1
 
-ARCHALL = 1
-
-RUNTIME_DEP_PKGS = CSWgmake CSWcoreutils CSWperl CSWless
-
-CHECKPKG_OVERRIDES_CSWcolormake += unidentified-dependency|CSWcoreutils
 CHECKPKG_OVERRIDES_CSWcolormake += surplus-dependency|CSWgmake
 CHECKPKG_OVERRIDES_CSWcolormake += surplus-dependency|CSWcoreutils
 CHECKPKG_OVERRIDES_CSWcolormake += surplus-dependency|CSWless
 
-# We define upstream file regex so we can be notifed of new upstream
-# software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+REINPLACE_USRSHARE += colormake.pl
 
-# If the url used to check for software update is different of
-# MASTER_SITES, then uncomment the next line. Otherwise it is set by
-# default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES = 
+REINPLACEMENTS += stty
+REINPLACE_MATCH_stty = stty
+REINPLACE_WITH_stty = $(bindir)/gstty
+REINPLACE_FILES_stty += colormake
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS =
@@ -38,11 +37,13 @@
 
 include gar/category.mk
 
-install-custom: CMDD=$(docdir)/$(NAME)
 install-custom:
-	@(cd $(WORKSRC); \
-		ginstall -d -m 0755 $(DESTDIR)$(bindir) $(DESTDIR)$(CMDD); \
-		ginstall -m 0755 colormake.pl clmake $(DESTDIR)$(bindir); \
-		ginstall -m 0755 cmake $(DESTDIR)$(bindir)/colormake; \
-		ginstall -m 0644 AUTHORS README $(DESTDIR)$(CMDD) )
+	ginstall -D -m 0755 $(WORKSRC)/clmake $(DESTDIR)$(bindir)/clmake
+	ln $(DESTDIR)$(bindir)/clmake $(DESTDIR)$(bindir)/clmake-short
+	ln $(DESTDIR)$(bindir)/clmake $(DESTDIR)$(bindir)/colormake
+	ln $(DESTDIR)$(bindir)/clmake $(DESTDIR)$(bindir)/colormake-short
+	ginstall -D -m 0755 $(WORKSRC)/colormake.pl $(DESTDIR)$(bindir)/colormake.pl
+	ginstall -D -m 0644 $(WORKSRC)/colormake.1 $(DESTDIR)$(mandir)/man1/colormake.1
+	ginstall -D -m 0644 $(WORKSRC)/AUTHORS $(DESTDIR)$(docdir)/$(NAME)/AUTHORS
+	ginstall -D -m 0644 $(WORKSRC)/README $(DESTDIR)$(docdir)/$(NAME)/README
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/colormake/trunk/checksums
===================================================================
--- csw/mgar/pkg/colormake/trunk/checksums	2018-01-14 22:33:55 UTC (rev 26317)
+++ csw/mgar/pkg/colormake/trunk/checksums	2018-01-15 12:57:11 UTC (rev 26318)
@@ -1,2 +1 @@
-db4549af77dc9f9583a3fd8b5ede602b  0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch
-1029dae70e7a23cff0f6a11f3ceffbe1  colormake-0.2.tar.gz
+fe157507ddef9b80154c77bd41380f6d  colormake-0.9.tar.gz

Deleted: csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch
===================================================================
--- csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch	2018-01-14 22:33:55 UTC (rev 26317)
+++ csw/mgar/pkg/colormake/trunk/files/0001-Update-Paths-and-Binary-Tool-Names-for-CSW.patch	2018-01-15 12:57:11 UTC (rev 26318)
@@ -1,61 +0,0 @@
-From d228a89afe97da43e3f03cd9c29509497b06336f Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Fri, 27 Nov 2009 03:22:18 +0100
-Subject: [PATCH] Update Paths and Binary Tool Names for CSW
-
-/usr/bin/perl -> /opt/csw/bin/perl
-export PATH=/opt/csw/bin:$PATH
-make -> gmake
-stty -> gstty
-
-misc scripting cleanups.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- clmake       |    6 +++++-
- cmake        |    7 ++++++-
- colormake.pl |    2 +-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/clmake b/clmake
-index c091e23..18c8758 100755
---- a/clmake
-+++ b/clmake
-@@ -4,4 +4,8 @@
- # Jumps to the first gcc error that occurs during the build process.
- #
- 
--make $* 2>&1 | colormake.pl `stty size` | less -r -pError
-+export PATH=/opt/csw/bin:$PATH
-+
-+size=$(gstty size)
-+
-+gmake $* 2>&1 | colormake.pl $size | less -r -pError
-diff --git a/cmake b/cmake
-index 303e91e..6d3a674 100755
---- a/cmake
-+++ b/cmake
-@@ -4,4 +4,9 @@
- # Jumps to the first gcc error that occurs during the build process.
- #
- 
--make $* 2>&1 | colormake.pl `stty size`
-+export PATH=/opt/csw/bin:$PATH
-+
-+size=$(gstty size)
-+
-+gmake $* 2>&1 | colormake.pl $size
-+
-diff --git a/colormake.pl b/colormake.pl
-index 1d9edb2..7d7b7d2 100755
---- a/colormake.pl
-+++ b/colormake.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/opt/csw/bin/perl
- #
- # colormake.pl 0.3
- #
--- 
-1.6.5.1
-

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