[csw-devel] SF.net SVN: gar:[9368] csw/mgar/pkg/ncsa-mosaic/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Fri Mar 26 00:28:39 CET 2010
Revision: 9368
http://gar.svn.sourceforge.net/gar/?rev=9368&view=rev
Author: wahwah
Date: 2010-03-25 23:28:38 +0000 (Thu, 25 Mar 2010)
Log Message:
-----------
ncsa-mosaic: Builds on the buildfarm now.
Modified Paths:
--------------
csw/mgar/pkg/ncsa-mosaic/trunk/Makefile
csw/mgar/pkg/ncsa-mosaic/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ncsa-mosaic/trunk/files/0005-Adding-opt-csw-include-lib-for-png.h.patch
csw/mgar/pkg/ncsa-mosaic/trunk/files/0006-sys-inttypes.h-instead-of-stdint.h.patch
csw/mgar/pkg/ncsa-mosaic/trunk/files/0007-Adding-opt-csw-include-for-png.patch
Modified: csw/mgar/pkg/ncsa-mosaic/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ncsa-mosaic/trunk/Makefile 2010-03-25 22:04:59 UTC (rev 9367)
+++ csw/mgar/pkg/ncsa-mosaic/trunk/Makefile 2010-03-25 23:28:38 UTC (rev 9368)
@@ -9,6 +9,7 @@
CATEGORIES = apps
GIT_REPOS = git://github.com/alandipert/ncsa-mosaic.git
DESCRIPTION = The web browser credited with popularizing the World Wide Web
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
define BLURB
endef
SPKG_SOURCEURL = http://github.com/alandipert/ncsa-mosaic
@@ -16,6 +17,9 @@
PATCHFILES += 0001-Copying-Makefile.linux-to-Makefile.sun.patch
PATCHFILES += 0002-Got-it-to-build-with-gnulib-stuff.patch
PATCHFILES += 0003-set-runtime-lib-search-path.patch
+PATCHFILES += 0005-Adding-opt-csw-include-lib-for-png.h.patch
+PATCHFILES += 0006-sys-inttypes.h-instead-of-stdint.h.patch
+PATCHFILES += 0007-Adding-opt-csw-include-for-png.patch
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
CONFIGURE_SCRIPTS =
@@ -31,6 +35,9 @@
RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxmu
RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxpm
RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxt
+RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWjpeg
+RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWpng
+RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWzlib
BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWncsa-mosaic)
LICENSE = COPYRIGHT
Modified: csw/mgar/pkg/ncsa-mosaic/trunk/checksums
===================================================================
--- csw/mgar/pkg/ncsa-mosaic/trunk/checksums 2010-03-25 22:04:59 UTC (rev 9367)
+++ csw/mgar/pkg/ncsa-mosaic/trunk/checksums 2010-03-25 23:28:38 UTC (rev 9368)
@@ -1,3 +1,6 @@
04606d65883504febd6a014b4a7ad953 0001-Copying-Makefile.linux-to-Makefile.sun.patch
6cf4ba26d7380243062e0592aadc4ff5 0002-Got-it-to-build-with-gnulib-stuff.patch
7321d5ef003731325e6e2b4d5f8003d4 0003-set-runtime-lib-search-path.patch
+0db9261981aecbb3bc66a67a2173b62b 0005-Adding-opt-csw-include-lib-for-png.h.patch
+852e7506b0029270fb29c9104e871dec 0006-sys-inttypes.h-instead-of-stdint.h.patch
+fdca926326cc4afe632a10d6f666a0fb 0007-Adding-opt-csw-include-for-png.patch
Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0005-Adding-opt-csw-include-lib-for-png.h.patch
===================================================================
--- csw/mgar/pkg/ncsa-mosaic/trunk/files/0005-Adding-opt-csw-include-lib-for-png.h.patch (rev 0)
+++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0005-Adding-opt-csw-include-lib-for-png.h.patch 2010-03-25 23:28:38 UTC (rev 9368)
@@ -0,0 +1,25 @@
+From 21b0b966b2aeb5b01de5bbe942eec7a84ce1c9c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Thu, 25 Mar 2010 22:38:56 +0000
+Subject: [PATCH 5/6] Adding /opt/csw/{include,lib} for png.h.
+
+---
+ makefiles/Makefile.sun | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/makefiles/Makefile.sun b/makefiles/Makefile.sun
+index 6b4018e..71e9e85 100755
+--- a/makefiles/Makefile.sun
++++ b/makefiles/Makefile.sun
+@@ -148,7 +148,7 @@ static_xlibs = /opt/csw/X11/lib/libXpm.a /opt/csw/X11/lib/libXm.a /opt/csw/X11/l
+ # SAM pngincludedir = $(pngdir)/include
+ # SAM pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a /usr/lib/libm.a
+ # SAM pngflags = -I$(pngincludedir) -DHAVE_PNG
+-pnglibs = -lpng -lz -lm
++pnglibs = -L/opt/csw/lib -R/opt/csw/lib -lpng -lz -lm
+ pngflags = -DHAVE_PNG
+
+ #### JPEG SUPPORT
+--
+1.6.5.1
+
Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0006-sys-inttypes.h-instead-of-stdint.h.patch
===================================================================
--- csw/mgar/pkg/ncsa-mosaic/trunk/files/0006-sys-inttypes.h-instead-of-stdint.h.patch (rev 0)
+++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0006-sys-inttypes.h-instead-of-stdint.h.patch 2010-03-25 23:28:38 UTC (rev 9368)
@@ -0,0 +1,25 @@
+From 5e86e2da62182be4bcf794961e5ba5ea42b340c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Thu, 25 Mar 2010 22:49:31 +0000
+Subject: [PATCH 6/6] sys/inttypes.h instead of stdint.h
+
+---
+ src/getdelim.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/getdelim.c b/src/getdelim.c
+index c024090..a20b6be 100644
+--- a/src/getdelim.c
++++ b/src/getdelim.c
+@@ -28,7 +28,7 @@
+ #include <stdio.h>
+
+ #include <limits.h>
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #include <stdlib.h>
+ #include <errno.h>
+
+--
+1.6.5.1
+
Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0007-Adding-opt-csw-include-for-png.patch
===================================================================
--- csw/mgar/pkg/ncsa-mosaic/trunk/files/0007-Adding-opt-csw-include-for-png.patch (rev 0)
+++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0007-Adding-opt-csw-include-for-png.patch 2010-03-25 23:28:38 UTC (rev 9368)
@@ -0,0 +1,25 @@
+From 404a6dec66c2370877644b17ce3091fffffad306 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Thu, 25 Mar 2010 22:58:56 +0000
+Subject: [PATCH 7/7] Adding /opt/csw/include for png
+
+---
+ makefiles/Makefile.sun | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/makefiles/Makefile.sun b/makefiles/Makefile.sun
+index 71e9e85..c7a7fc5 100755
+--- a/makefiles/Makefile.sun
++++ b/makefiles/Makefile.sun
+@@ -149,7 +149,7 @@ static_xlibs = /opt/csw/X11/lib/libXpm.a /opt/csw/X11/lib/libXm.a /opt/csw/X11/l
+ # SAM pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a /usr/lib/libm.a
+ # SAM pngflags = -I$(pngincludedir) -DHAVE_PNG
+ pnglibs = -L/opt/csw/lib -R/opt/csw/lib -lpng -lz -lm
+-pngflags = -DHAVE_PNG
++pngflags = -DHAVE_PNG -I/opt/csw/include
+
+ #### JPEG SUPPORT
+ #### For inline JPEG support, the following should be defined:
+--
+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