SF.net SVN: gar:[22647] csw/mgar/pkg/xfig/trunk

[cgrzemba at users.sourceforge.net]

Revision: 22647
          http://gar.svn.sourceforge.net/gar/?rev=22647&view=rev
Author:   cgrzemba
Date:     2013-12-06 07:57:12 +0000 (Fri, 06 Dec 2013)
Log Message:
-----------
xfig/trunk: update version 3.2.5c

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

Added Paths:
-----------
    csw/mgar/pkg/xfig/trunk/files/0002-set-csw-environment-and-reg_noerror.patch

Modified: csw/mgar/pkg/xfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xfig/trunk/Makefile	2013-12-05 15:43:21 UTC (rev 22646)
+++ csw/mgar/pkg/xfig/trunk/Makefile	2013-12-06 07:57:12 UTC (rev 22647)
@@ -1,6 +1,6 @@
 # : Makefile 9089 2010-03-11 08:34:46Z wahwah $
 NAME = xfig
-VERSION = 3.2.5b
+VERSION = 3.2.5c
 GARTYPE = v2
 
 DESCRIPTION = An interactive drawing tool
@@ -15,7 +15,7 @@
 DISTNAME = $(NAME).$(VERSION)
 DISTFILES  = $(DISTNAME).full.tar.gz
 
-PATCHFILES = 0001-Add-missing-define-for-REG_NOERROR.patch
+PATCHFILES += 0002-set-csw-environment-and-reg_noerror.patch
 
 # File name regex to get notifications about upstream software releases
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).full.tar.gz
@@ -25,9 +25,23 @@
 LICENSE = Libraries/GUI/LICENSE
 
 DEP_PKGS = CSWxpm CSWzlib CSWjpeg CSWpng CSWxaw3d
+GARCOMPILER = GCC4
 
-CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile
+REINPLACE_USRLOCAL += Imakefile
+EXTRA_CONFIGURE_ENV += PATH=$(PATH):/usr/openwin/bin
 
+RUNTIME_DEP_PKGS_CSWxfig += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWxfig += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWxfig += CSWlibxpm4
+RUNTIME_DEP_PKGS_CSWxfig += CSWxaw3d
+
+CONFIGURE_SCRIPTS = xmkmf
+configure-xmkmf:
+	(cd $(WORKSRC) && OPENWINHOME=/usr/openwin export OPENWINHOME && \
+	[ -f Makefile ] && mv -f Makefile Makefile.bak; \
+	imake -DUseInstalled -I/usr/openwin/lib/X11/config -DHasGcc2=YES)
+	$(MAKECOOKIE)
+
 BUILD_OVERRIDE_VARS  = PNGLIBDIR PNGINC ZLIBDIR
 BUILD_OVERRIDE_VARS += JPEGLIBDIR JPEGINC
 BUILD_OVERRIDE_VARS += XPMLIBDIR XPMINC

Modified: csw/mgar/pkg/xfig/trunk/checksums
===================================================================
--- csw/mgar/pkg/xfig/trunk/checksums	2013-12-05 15:43:21 UTC (rev 22646)
+++ csw/mgar/pkg/xfig/trunk/checksums	2013-12-06 07:57:12 UTC (rev 22647)
@@ -1,2 +1 @@
-f07c03aa2c8e449e8fce29b6b4d652c5  0001-Add-missing-define-for-REG_NOERROR.patch
-499b0ce103a6b353453bf7e327f9a3b9  xfig.3.2.5b.full.tar.gz
+210851330fa4bb3581bec1f8448a4db8  xfig.3.2.5c.full.tar.gz

Added: csw/mgar/pkg/xfig/trunk/files/0002-set-csw-environment-and-reg_noerror.patch
===================================================================
--- csw/mgar/pkg/xfig/trunk/files/0002-set-csw-environment-and-reg_noerror.patch	                        (rev 0)
+++ csw/mgar/pkg/xfig/trunk/files/0002-set-csw-environment-and-reg_noerror.patch	2013-12-06 07:57:12 UTC (rev 22647)
@@ -0,0 +1,54 @@
+From 3d9b3e1d426ba267256d4d753fe6c2e258f35b20 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Thu, 5 Dec 2013 11:52:34 +0100
+Subject: [PATCH] set csw environment and reg_noerror
+
+---
+ Imakefile    | 4 ++--
+ w_keyboard.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Imakefile b/Imakefile
+index e2f43b7..ac31bd6 100755
+--- a/Imakefile
++++ b/Imakefile
+@@ -30,9 +30,9 @@ XCOMM to the full path of the directory where you want xfig to be installed.
+ XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks
+ XCOMM for it relative to the BINDIR variable.
+ XCOMM
+-XCOMM BINDIR = /usr/bin
++BINDIR = /opt/csw/bin
+ XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
+-MKDIRHIER = mkdirhier 
++MKDIRHIER = mkdir -p
+ 
+ XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the
+ XCOMM app-defaults resource files to go.  You will have to use the environment
+diff --git a/w_keyboard.c b/w_keyboard.c
+index 427d60c..a3360fd 100755
+--- a/w_keyboard.c
++++ b/w_keyboard.c
+@@ -41,7 +41,7 @@
+ #define REG_NOERROR 0
+ #endif
+ 
+-#if defined(__FreeBSD__) && !defined(REG_NOERROR)
++#if (defined(__FreeBSD__) || defined(__sun)) && !defined(REG_NOERROR)
+ #define REG_NOERROR 0
+ #endif
+ 
+diff --git a/Imakefile b/Imakefile
+index ac31bd6..21471e0 100755
+--- a/Imakefile
++++ b/Imakefile
+@@ -428,7 +428,6 @@ install.rhtml::
+        echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
+        if [ -d $(DESTDIR)$(XFIGDOCDIR)/html ]; then set +x; \
+           else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html ); fi ; \
+-       $(INSTALL) -m 644 -c xfig_man.html $(DESTDIR)$(XFIGDOCDIR) ; \
+        $(INSTALL) -m 644 -c xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
+        $(INSTALL) -m 644 -c xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
+        if [ -d html ]; then \
+-- 
+1.8.4.1
+

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