[csw-devel] SF.net SVN: gar:[20310] csw/mgar/pkg/scm/trunk

[pfelecan at users.sourceforge.net]

Revision: 20310
          http://gar.svn.sourceforge.net/gar/?rev=20310&view=rev
Author:   pfelecan
Date:     2013-02-14 12:34:19 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
scm/trunk: fix prefix where needed

Modified Paths:
--------------
    csw/mgar/pkg/scm/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/scm/trunk/files/0005-Fix-prefix.patch

Modified: csw/mgar/pkg/scm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/scm/trunk/Makefile	2013-02-14 12:03:39 UTC (rev 20309)
+++ csw/mgar/pkg/scm/trunk/Makefile	2013-02-14 12:34:19 UTC (rev 20310)
@@ -22,11 +22,13 @@
 PATCHFILES		+=	0002-Fix-build-shebang.patch
 PATCHFILES		+=	0003-Fix-configure-prefix.patch
 PATCHFILES		+=	0004-Use-gcc-in-Makefile.patch
+PATCHFILES		+=	0005-Fix-prefix.patch
 
 PACKAGING_PLATFORMS	=	solaris10-sparc
 PACKAGING_PLATFORMS	+=	solaris10-i386
 
 BUILD_DEP_PKGS	+=	CSWguile-dev
+BUILD_DEP_PKGS	+=	CSWtetex
 
 GARCOMPILER			=	GNU
 EXTRA_CONFIGURE_ENV	=	PATH=$(prefix)/gnu:$(PATH)
@@ -54,6 +56,8 @@
 RUNTIME_DEP_PKGS_CSWscm-common		=	CSWguile
 CHECKPKG_OVERRIDES_CSWscm-common	+=	surplus-dependency|CSWguile
 ARCHALL_CSWscm-common				=	1
+CHECKPKG_OVERRIDES_CSWscm-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/doc/scm/ChangeLog
+CHECKPKG_OVERRIDES_CSWscm-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/scm.info
 
 PACKAGES							+=	CSWscm
 CATALOGNAME_CSWscm					=	scm

Added: csw/mgar/pkg/scm/trunk/files/0005-Fix-prefix.patch
===================================================================
--- csw/mgar/pkg/scm/trunk/files/0005-Fix-prefix.patch	                        (rev 0)
+++ csw/mgar/pkg/scm/trunk/files/0005-Fix-prefix.patch	2013-02-14 12:34:19 UTC (rev 20310)
@@ -0,0 +1,39 @@
+From c77d2e85052f07e2554ca0a1ce759780702a9462 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Thu, 14 Feb 2013 13:22:45 +0100
+Subject: [PATCH] Fix prefix
+
+---
+ Makefile   | 2 +-
+ findexec.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4aab1c4..510cab0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@ SCMLIT = ./scmlit
+ SCMEXE = ./scm
+ BUILD = ./build -hsystem
+ 
+-TEXI2HTML = /usr/local/bin/texi2html -split -verbose
++TEXI2HTML = /opt/csw/bin/texi2html -split -verbose
+ TEXI2PDF = texi2pdf
+ VIEWPDF = evince
+ MAKEDEV = $(MAKE) -f $(HOME)/makefile.dev
+diff --git a/findexec.c b/findexec.c
+index a562077..4bd77ce 100644
+--- a/findexec.c
++++ b/findexec.c
+@@ -127,7 +127,7 @@ Wed Feb 21 23:06:35 1996  Aubrey Jaffer
+ # endif
+ 
+ # ifndef DEFAULT_PATH
+-#  define DEFAULT_PATH ".:~/bin::/usr/local/bin:/usr/new:/usr/ucb:/usr/bin:/bin:/usr/hosts"
++#  define DEFAULT_PATH ".:~/bin::/opt/csw/bin:/usr/new:/usr/ucb:/usr/bin:/bin:/usr/hosts"
+ # endif
+ 
+ static char *copy_of(s)
+-- 
+1.8.1
+

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