[csw-devel] SF.net SVN: gar:[9367] csw/mgar/pkg

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Thu Mar 25 23:05:02 CET 2010


Revision: 9367
          http://gar.svn.sourceforge.net/gar/?rev=9367&view=rev
Author:   wahwah
Date:     2010-03-25 22:04:59 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
ncsa-mosaic: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/ncsa-mosaic/trunk/Makefile
    csw/mgar/pkg/ncsa-mosaic/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/ncsa-mosaic/
    csw/mgar/pkg/ncsa-mosaic/trunk/files/0001-Copying-Makefile.linux-to-Makefile.sun.patch
    csw/mgar/pkg/ncsa-mosaic/trunk/files/0002-Got-it-to-build-with-gnulib-stuff.patch
    csw/mgar/pkg/ncsa-mosaic/trunk/files/0003-set-runtime-lib-search-path.patch

Modified: csw/mgar/pkg/ncsa-mosaic/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2010-03-10 12:18:39 UTC (rev 9077)
+++ csw/mgar/pkg/ncsa-mosaic/trunk/Makefile	2010-03-25 22:04:59 UTC (rev 9367)
@@ -2,184 +2,46 @@
 # 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
-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.
+GARNAME = ncsa-mosaic
+GARVERSION = 2.7b6
+PACKAGES = CSWncsa-mosaic
+CATALOGNAME_CSWncsa-mosaic = ncsa_mosaic
+CATEGORIES = apps
+GIT_REPOS = git://github.com/alandipert/ncsa-mosaic.git
+DESCRIPTION = The web browser credited with popularizing the World Wide Web
 define BLURB
-  <please fill in>
 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).
+SPKG_SOURCEURL = http://github.com/alandipert/ncsa-mosaic
 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
+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
+
 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
-##	cswinetd cswetcservices
-## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils,
-## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS.
-## SPKG_CLASSES = none
-## Simplified settings for classes:
-## PRESERVECONF =
-## SAMPLECONF =
-## INITSMF =
-## USERGROUP =
-## ETCSERVICES = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## A list of runtime package dependencies in the form of CSWfoo.
-## RUNTIME_DEP_PKGS =
-##
-## A list of packages necessary to build this package
-## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
-##
-## When using non-empty $(PACKAGES):
-## RUNTIME_DEP_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_SCRIPTS =
+BUILD_SCRIPTS = mosaic
+INSTALL_SCRIPTS = mosaic
+TEST_SCRIPTS =
 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
 
-#include gar/category.mk
+RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibice
+RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibsm
+RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibx11
+RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxext
+RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxmu
+RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxpm
+RUNTIME_DEP_PKGS_CSWncsa-mosaic += CSWlibxt
+
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWncsa-mosaic)
+LICENSE = COPYRIGHT
+
+include gar/category.mk
+
+build-mosaic:
+	(cd $(WORKSRC); gmake sun)
+	@$(MAKECOOKIE)
+
+install-mosaic:
+	ginstall -m 755 -d $(DESTDIR)$(bindir)
+	ginstall -m 755 $(WORKSRC)/src/Mosaic $(DESTDIR)$(bindir)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/ncsa-mosaic/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums	2010-03-10 12:18:39 UTC (rev 9077)
+++ csw/mgar/pkg/ncsa-mosaic/trunk/checksums	2010-03-25 22:04:59 UTC (rev 9367)
@@ -0,0 +1,3 @@
+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

Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0001-Copying-Makefile.linux-to-Makefile.sun.patch
===================================================================
--- csw/mgar/pkg/ncsa-mosaic/trunk/files/0001-Copying-Makefile.linux-to-Makefile.sun.patch	                        (rev 0)
+++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0001-Copying-Makefile.linux-to-Makefile.sun.patch	2010-03-25 22:04:59 UTC (rev 9367)
@@ -0,0 +1,362 @@
+From cf84264a0bf2653f9abee344239c12fcc5fc22a4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Thu, 25 Mar 2010 20:31:22 +0000
+Subject: [PATCH 1/3] Copying Makefile.linux to Makefile.sun
+
+---
+ makefiles/Makefile.sun |  343 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 343 insertions(+), 0 deletions(-)
+ create mode 100755 makefiles/Makefile.sun
+
+diff --git a/makefiles/Makefile.sun b/makefiles/Makefile.sun
+new file mode 100755
+index 0000000..2cea009
+--- /dev/null
++++ b/makefiles/Makefile.sun
+@@ -0,0 +1,343 @@
++# Toplevel Makefile for NCSA Mosaic.
++
++# You shouldn't need to touch any of the Makefiles in the various
++# subdirectories if you configure this Makefile correctly.
++
++# If you need to make serious changes to get Mosaic to compile on your
++# platform, send context diffs to mosaic-x at ncsa.uiuc.edu.
++
++# -------------------------- CUSTOMIZABLE OPTIONS ----------------------------
++
++#prereleaseflags = -DPRERELEASE
++prereleaseflags = -DPRERELEASE
++
++#RANLIB = /bin/true
++#### On non-SGI's, this should be ranlib.
++RANLIB = ranlib
++
++#CC = cc
++#### On Sun's, this should be gcc (ANSI required).
++CC = gcc
++
++#### Linker Flags 
++ldflags =
++
++#### For a few files in the source, some compilers may need to be kicked
++#### in K&R mode.  E.g., on SGI's, -cckr does this.
++#knrflag = -cckr
++#### On most systems, no flag is needed.
++knrflag =
++
++
++#### Random system configuration flags.
++#### --> *** For Motif 1.2 ON ANY PLATFORM, do -DMOTIF1_2 *** <--
++#### For IBM AIX 3.2, do -D_BSD
++#### For NeXT, do -DNEXT
++#### For HP/UX, do -Aa -D_HPUX_SOURCE
++#### For Dell SVR4, do -DSVR4
++#### For Solaris, do -DSVR4 
++#### For Esix 4.0.4 and Solaris x86 2.1, do -DSVR4
++#### For Convex whatever, do -DCONVEX
++#### For SCO ODT 3.0, do -DSCO -DSVR4 -DMOTIF1_2
++#### For Motorola SVR4, do -DSVR4 -DMOTOROLA -DMOTIF1_2
++sysconfigflags = -DMOTIF1_2 -DLINUX
++
++#### System libraries.
++# syslibs = -lPW -lsun -lmalloc
++#### For AIX 3.2
++# syslibs = -lPW -lbsd
++#### For most other Motif platforms:
++# syslibs = -lPW
++#### For Sun's and Ultrix and HP and BSD/386:
++# syslibs =
++#### For Sun's with no DNS:
++# syslibs = -lresolv
++#### For SCO ODT:
++# syslibs = -lPW -lsocket -lmalloc
++#### For Dell SVR4:
++# syslibs = -lnsl -lsocket -lc -lucb
++#### For Solaris (?)
++# syslibs = -lnsl -lsocket -lgen
++#### For Motorola SVR4:
++# syslibs = -lnsl -lsocket -lgen
++
++syslibs = -lc
++
++#### X include file locations -- if your platform puts the X include
++#### files in a strange place, set this variable appropriately.  Else
++#### don't worry about it.
++#### HP X11R4 version:
++# xinc = -I/usr/include/Motif1.1 -I/usr/include/X11R4
++#### HP X11R5 version:
++# xinc = -I/usr/include/Motif1.2 -I/usr/local/X11R5/include
++#### NeXT version:
++# xinc = -I/usr/include/X11
++#### BSD/386
++# xinc = -I/usr/X11/include
++
++xinc = -I/usr/X11R6/include
++
++#### X library locations.
++# xlibs = -lXm_s -lXmu -lXt_s -lX11_s
++#### For Sun's (at least running stock X/Motif as installed on our machines):
++# xlibs = /usr/lib/libXm.a /usr/lib/libXmu.a /usr/lib/libXt.a /usr/lib/libXext.a /usr/lib/libX11.a -lm #### For HP-UX 8.00:
++# xlibs = -L/usr/lib/Motif1.1 -lXm -L/usr/lib/X11R4 -lXmu -lXt -lX11
++#### For HP-UX 9.01: The X11R5 libraries are here on our systems
++# xlibs = -L/usr/lib/Motif1.2 -lXm -L/usr/lib/X11R5 -L/usr/lib/X11R4 -lXmu -lXt -lX11
++#### For NeXT:
++# xlibs = -L/usr/lib/X11 -lXm -lXmu -lXt -lX11
++#### For Dell SVR4:
++# xlibs = -L/usr/X5/lib -lXm -lXmu -lXt -lXext -lX11
++#### For Solaris (?)
++# xlibs = -lXm -lXmu -lXt -lXext -lX11 -lm
++#### For SCO ODT 3.0 (I'm told that -lXtXm_s is *not* a typo :-):
++# xlibs = -lXtXm_s -lXmu -lX11_s
++#### For nearly everyone else:
++# xlibs = -lXm -lXmu -lXt -lX11
++#### For Linux -- You must set "LD_LIBRARY_PATH" to include the path to
++####   your X libs, or some may not be found by the loader. Check the
++####   loader with "ldd Mosaic" after you build.
++xlibs = -L/usr/X11R6/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
++static_motif_xlibs = -L/usr/X11R6/lib -lXext -lXpm /usr/X11R6/lib/libXm.a -lXmu -lXt -lX11 -lICE -lSM
++static_xlibs = /usr/X11R6/lib/libXpm.a /usr/X11R6/lib/libXm.a /usr/X11R6/lib/libXmu.a /usr/X11R6/lib/libXt.a /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libX11.a /usr/X11R6/lib/libSM.a /usr/X11R6/lib/libICE.a
++#### For BSD/386:
++# xlibs = -L/usr/X11/lib -lXm -lXmu -lXt -lX11
++#### For Motorola SVR4:
++# xlibs = -lXm -lXmu -lXt -lXext -lX11 -lm
++
++
++#### DTM AND HDF SUPPORT; READ CAREFULLY
++
++#### If you want to compile with DTM and HDF support, you should leave
++#### the following lines uncommented and make sure you have a copy of
++#### HDF 3.3 (r1 or later) installed and ready.  You can find HDF on
++#### ftp.ncsa.uiuc.edu in /HDF.
++
++#### If you do not want to compile with DTM and HDF support, comment
++#### the following lines out.  (If you are compiling from source for
++#### the first time, you should probably not bother with HDF and DTM
++#### support.)
++
++#### dtmmachtype needs to be set to one of the following:
++####   sun, sgi, dec, ibm, next, cray, convex
++#### If your platform is not one of the above, then either do not compile
++#### with HDF/DTM support or try hacking libdtm/makefile.
++
++#dtmmachtype = sun
++#dtmdirs = libdtm libnet
++#dtmlibs = ../libnet/libnet.a ../libdtm/libdtm.a
++#dtmflags = -DHAVE_DTM -I.. -I../libnet
++#hdfdir = /hdf2/install/linux
++#hdflibs = $(hdfdir)/lib/libnetcdf.a $(hdfdir)/lib/libdf.a
++#hdfflags = -DHAVE_HDF -I$(hdfdir)/include
++
++#### PNG SUPPORT
++#### For inline PNG support, the following should be defined:
++#### The libraries currently used are PNGLIB 0.81 and ZLIB 0.95
++
++# SAM pngdir = /xdev/mosaic/libpng/linux
++# SAM pnglibdir = $(pngdir)/lib
++# 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
++pngflags = -DHAVE_PNG
++
++#### JPEG SUPPORT
++#### For inline JPEG support, the following should be defined:
++#### The library used is Independent JPEG Group (IJG's) 5.0a.
++
++# SAM jpegdir = /xdev/mosaic/libjpeg/linux
++# SAM jpeglibs = $(jpegdir)/lib/libjpeg.a
++ #SAM jpegflags = -I$(jpegdir)/include -DHAVE_JPEG
++jpeglibs = -ljpeg
++jpegflags = -DHAVE_JPEG
++
++
++#### KERBEROS SUPPORT
++####
++#### If you want Mosaic to support Kerberos authentication, set the 
++#### following flags appropriately.  You can support Kerberos V4 and/or V5,
++#### although it's most likely that your realm supports one or the other.
++#### To enable DES-encryption of HTTP messages via Kerberos key exchange, 
++#### define the KRB-ENCRYPT flag.
++
++##krb4dir   = /usr/athena
++#krb4dir   = /xdev/mosaic/libkrb4/linux
++#krb4libs  = $(krb4dir)/lib/libkrb.a $(krb4dir)/lib/libdes.a
++#krb4flags = -DKRB4 -I$(krb4dir)/include
++
++##krb5dir   = /krb5
++#krb5dir   = /xdev/mosaic/libkrb5/linux
++#krb5libs  = $(krb5dir)/lib/libkrb5.a $(krb5dir)/lib/libcrypto.a $(krb5dir)/util/et/libcom_err.a
++#krb5flags = -DKRB5 -I$(krb5dir)/include -I$(krb5dir)/include/krb5
++
++#Do not comment out.
++krbflags  = $(krb4flags) $(krb5flags)
++krblibs   = $(krb4libs) $(krb5libs) 
++
++
++#### DIRECT WAIS SUPPORT
++
++#### If you want to have Mosaic be able to communicate directly with
++#### WAIS servers, do set the following flags appropriately.  We
++#### recommend linking with CNIDR's freeWAIS 0.5 distribution; other
++#### WAIS distributions may work but we have not tested them with
++#### Mosaic.  freeWAIS 0.5 can currently (Sept.1995) be found at
++#### ftp://sunsite.unc.edu/pub/wais/servers/freeWAIS 
++
++#### If you do not wish to link to the WAIS libraries, then comment
++#### the following lines out.  Mosaic will then communicate with WAIS
++#### servers via a HTTP gateway.
++
++#### -lm is required for freeWAIS 0.5, as ceil() is used.
++
++#waisroot = /xdev/mosaic/freeWAIS/linux
++#waisflags = -DDIRECT_WAIS -I$(waisroot)/include
++#waislibdir = $(waisroot)/bin
++#waislibs = $(waislibdir)/inv.a $(waislibdir)/wais.a $(waislibdir)/libftw.a -lm
++
++
++#### Customization flags:
++#### . If you want Mosaic to come up with monochrome colors by default,
++####   use -DMONO_DEFAULT
++#### . If you want to define the default Mosaic home page, set
++####   -DHOME_PAGE_DEFAULT=\\\"url\\\"
++#### . If you want to define the default Mosaic documentation directory
++####   (should be a URL), set -DDOCS_DIRECTORY_DEFAULT=\\\"url\\\"
++#### . Other things you can define are spelled out in src/mosaic.h.
++customflags =
++
++
++
++
++########
++########
++####      NOTE! If you get errors because of the following line, it means
++####      you are NOT using GNUs Make program. The following line is basically
++####      for the developers at NCSA to customize the build process without
++####      modifying the Makefiles, so you may comment it out without harm.
++########
++########
++-include local-defines/$(DEV_ARCH)
++
++
++
++# ---------------------- END OF CUSTOMIZABLE OPTIONS -------------------------
++
++CFLAGS = -g $(sysconfigflags) $(prereleaseflags)
++
++# Don't worry about these -- for development purposes only.
++PURIFY = purify
++QUANTIFY = quantify
++
++default: $(dtmdirs) libwww2 libXmx libhtmlw libnut src
++	@echo \*\*\* Welcome to NCSA Mosaic.
++purifyd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-purifyd
++	@echo \*\*\* Welcome to Purify'd NCSA Mosaic.
++quantifyd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-quantifyd
++	@echo \*\*\* Welcome to Quantify'd NCSA Mosaic.
++staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static
++	@echo \*\*\* Welcome to NCSA Mosaic linked static.
++static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif
++	@echo \*\*\* Welcome to NCSA Mosaic linked static for motif.
++p_staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-purifyd
++	@echo \*\*\* Welcome to Purify'd NCSA Mosaic linked static.
++p_static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif-purifyd
++	@echo \*\*\* Welcome to Purify'd NCSA Mosaic linked static for motif.
++q_staticd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-quantifyd
++	@echo \*\*\* Welcome to Quantify'd NCSA Mosaic linked static.
++q_static_motifd: $(dtmdirs) libwww2 libXmx libhtmlw libnut src-static-motif-quantifyd
++	@echo \*\*\* Welcome to Quantify'd NCSA Mosaic linked static for motif.
++
++libXmx::
++	@echo --- Building libXmx
++	cd libXmx; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(xinc)"
++
++libhtmlw::
++	@echo --- Building libhtmlw
++	cd libhtmlw; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag) $(xinc) -DMOTIF -DXMOSAIC"
++
++libwww2::
++	@echo --- Building libwww2
++	cd libwww2; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag) $(waisflags) $(krbflags) $(xinc)"
++
++libnut::
++	@echo --- Building libnut
++	cd libnut; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(knrflag)"
++
++src::
++	@echo --- Building src
++	cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
++
++src-purifyd::
++	@echo --- Building Purify'd src
++	cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p"
++
++src-quantifyd::
++	@echo --- Building Quantify'd src
++	cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q"
++
++src-static::
++	@echo --- Building src-static
++	cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
++
++src-static-motif::
++	@echo --- Building src-static-motif
++	cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic"
++
++src-static-purifyd::
++	@echo --- Building src-static-purifyd
++	cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p"
++
++src-static-motif-purifyd::
++	@echo --- Building src-static-motif-purifyd
++	cd src; $(MAKE) PURIFY=$(PURIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-p"
++
++src-static-quantifyd::
++	@echo --- Building src-static-quantifyd
++	cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags) -static" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q"
++
++src-static-motif-quantifyd::
++	@echo --- Building src-static-motif-quantifyd
++	cd src; $(MAKE) PURIFY=$(QUANTIFY) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(static_motif_xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic-q"
++
++libnet::
++	@echo --- Building libnet
++	cd libnet; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(dtmflags)"
++
++libdtm::
++	@echo --- Building libdtm
++	cd libdtm; $(MAKE) $(dtmmachtype) CC=$(CC) RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) $(dtmflags)"
++
++clean:
++	cd libXmx; $(MAKE) $@
++	cd libhtmlw; $(MAKE) $@
++	cd libwww2; $(MAKE) $@
++	cd src; $(MAKE) MOSAIC="Mosaic" $@
++	cd libnet; $(MAKE) $@
++	cd libdtm; $(MAKE) $@
++	cd libnut; $(MAKE) $@
++
++wclean:
++	cd libhtmlw; $(MAKE) $@
++	cd src; $(MAKE) MOSAIC="Mosaic" $@
++
++commit:
++	cvs commit
++update:
++	cvs update
++countlines:
++	wc libdtm/*.[ch] libnet/*.[ch] libXmx/*.[ch] libhtmlw/*.[ch] libwww2/*.[ch] src/*.[ch]
++replicate:
++	cp Makefile Makefile.sun
++	cp Makefile Makefile.ibm
++	cp Makefile Makefile.dec
++	cp Makefile Makefile.alpha
++	cp Makefile Makefile.hp
++prune:
++	mv Makefile.sun Makefile.sun.old
++	mv Makefile.ibm Makefile.ibm.old
++	mv Makefile.dec Makefile.dec.old
++	mv Makefile.alpha Makefile.alpha.old
++	mv Makefile.hp Makefile.hp.old
+-- 
+1.6.5.1
+

Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0002-Got-it-to-build-with-gnulib-stuff.patch
===================================================================
--- csw/mgar/pkg/ncsa-mosaic/trunk/files/0002-Got-it-to-build-with-gnulib-stuff.patch	                        (rev 0)
+++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0002-Got-it-to-build-with-gnulib-stuff.patch	2010-03-25 22:04:59 UTC (rev 9367)
@@ -0,0 +1,319 @@
+From dad464664df6bd6c80bccfe89c6ebefec09d141d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Thu, 25 Mar 2010 21:36:28 +0000
+Subject: [PATCH 2/3] Got it to build with gnulib stuff.
+
+---
+ libwww2/HTUtils.h      |    5 ++
+ makefiles/Makefile.sun |   21 +++++---
+ src/Makefile           |    7 ++-
+ src/accept.h           |    3 +-
+ src/getdelim.c         |  137 ++++++++++++++++++++++++++++++++++++++++++++++++
+ src/getline.c          |   30 +++++++++++
+ 6 files changed, 194 insertions(+), 9 deletions(-)
+ create mode 100644 src/getdelim.c
+ create mode 100644 src/getline.c
+
+diff --git a/libwww2/HTUtils.h b/libwww2/HTUtils.h
+index 74f0e5f..a3c05a6 100644
+--- a/libwww2/HTUtils.h
++++ b/libwww2/HTUtils.h
+@@ -28,6 +28,11 @@ Debug message control.
+ #define STDIO_H
+ #endif
+ 
++/* 
++ * for FIONBIO on Solaris
++ */
++#include <sys/filio.h>
++
+ /*
+  * Tracing now works as a boolean from a resource. No, there are no
+  *   more if's than before...
+diff --git a/makefiles/Makefile.sun b/makefiles/Makefile.sun
+index 2cea009..287c54e 100755
+--- a/makefiles/Makefile.sun
++++ b/makefiles/Makefile.sun
+@@ -8,6 +8,8 @@
+ 
+ # -------------------------- CUSTOMIZABLE OPTIONS ----------------------------
+ 
++PATH := /opt/studio/SOS12/SUNWspro/bin:$(PATH)
++
+ #prereleaseflags = -DPRERELEASE
+ prereleaseflags = -DPRERELEASE
+ 
+@@ -17,7 +19,7 @@ RANLIB = ranlib
+ 
+ #CC = cc
+ #### On Sun's, this should be gcc (ANSI required).
+-CC = gcc
++CC = cc
+ 
+ #### Linker Flags 
+ ldflags =
+@@ -40,7 +42,7 @@ knrflag =
+ #### For Convex whatever, do -DCONVEX
+ #### For SCO ODT 3.0, do -DSCO -DSVR4 -DMOTIF1_2
+ #### For Motorola SVR4, do -DSVR4 -DMOTOROLA -DMOTIF1_2
+-sysconfigflags = -DMOTIF1_2 -DLINUX
++sysconfigflags = -DMOTIF1_2 -DLINUX -DUSE_DIRENT
+ 
+ #### System libraries.
+ # syslibs = -lPW -lsun -lmalloc
+@@ -61,7 +63,7 @@ sysconfigflags = -DMOTIF1_2 -DLINUX
+ #### For Motorola SVR4:
+ # syslibs = -lnsl -lsocket -lgen
+ 
+-syslibs = -lc
++syslibs = -lc -lsocket -lnsl
+ 
+ #### X include file locations -- if your platform puts the X include
+ #### files in a strange place, set this variable appropriately.  Else
+@@ -74,8 +76,10 @@ syslibs = -lc
+ # xinc = -I/usr/include/X11
+ #### BSD/386
+ # xinc = -I/usr/X11/include
++#### Solaris
++xing = -I/opt/csw/X11/include
+ 
+-xinc = -I/usr/X11R6/include
++# xinc = -I/usr/X11R6/include
+ 
+ #### X library locations.
+ # xlibs = -lXm_s -lXmu -lXt_s -lX11_s
+@@ -97,9 +101,12 @@ xinc = -I/usr/X11R6/include
+ #### For Linux -- You must set "LD_LIBRARY_PATH" to include the path to
+ ####   your X libs, or some may not be found by the loader. Check the
+ ####   loader with "ldd Mosaic" after you build.
+-xlibs = -L/usr/X11R6/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
+-static_motif_xlibs = -L/usr/X11R6/lib -lXext -lXpm /usr/X11R6/lib/libXm.a -lXmu -lXt -lX11 -lICE -lSM
+-static_xlibs = /usr/X11R6/lib/libXpm.a /usr/X11R6/lib/libXm.a /usr/X11R6/lib/libXmu.a /usr/X11R6/lib/libXt.a /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libX11.a /usr/X11R6/lib/libSM.a /usr/X11R6/lib/libICE.a
++# xlibs = -L/usr/X11R6/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
++
++# Solaris
++xlibs = -L/opt/csw/X11/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
++static_motif_xlibs = -L/opt/csw/X11/lib -lXext -lXpm /opt/csw/X11/lib/libXm.a -lXmu -lXt -lX11 -lICE -lSM
++static_xlibs = /opt/csw/X11/lib/libXpm.a /opt/csw/X11/lib/libXm.a /opt/csw/X11/lib/libXmu.a /opt/csw/X11/lib/libXt.a /opt/csw/X11/lib/libXext.a /opt/csw/X11/lib/libX11.a /opt/csw/X11/lib/libSM.a /opt/csw/X11/lib/libICE.a
+ #### For BSD/386:
+ # xlibs = -L/usr/X11/lib -lXm -lXmu -lXt -lX11
+ #### For Motorola SVR4:
+diff --git a/src/Makefile b/src/Makefile
+index 04ab35b..7d461b0 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -26,7 +26,9 @@ OBJS = main.o gui.o gui-dialogs.o gui-menubar.o gui-documents.o gui-news.o\
+   medcut.o mo-hdf.o hotfile.o child.o mailto.o readJPEG.o readPNG.o\
+   accept.o cciServer.o cciBindings.o cciBindings2.o support.o bla.o\
+   kcms.o md5.o proxy-dialogs.o proxy-misc.o gui-popup.o gui-ftp.o\
+-  prefs.o
++  prefs.o \
++  getline.o \
++  getdelim.o
+ 
+ AUXCFILES = hdf-browse.c
+ AUXOBJS = hdf-browse.o
+@@ -226,3 +228,6 @@ gui-ftp.o: prefs.h prefs_defs.h gui.h gui-ftp.h gui-popup.h
+ gui-ftp.o: ../libhtmlw/HTML.h hotlist.h ../libnut/system.h
+ 
+ prefs.o: mosaic.h ../libXmx/Xmx.h toolbar.h prefs.h prefs_defs.h
++
++getline.o: getline.c
++getdelim.o: getdelim.c
+diff --git a/src/accept.h b/src/accept.h
+index 6470b5f..4db5725 100644
+--- a/src/accept.h
++++ b/src/accept.h
+@@ -1,3 +1,5 @@
++#include <sys/filio.h>
++
+ typedef int	ListenAddress;
+ 
+ extern ListenAddress NetServerInitSocket();
+@@ -6,4 +8,3 @@ extern int NetRead();
+ extern int NetServerWrite();
+ extern int NetCloseConnection();
+ extern int NetIsThereInput();
+-
+diff --git a/src/getdelim.c b/src/getdelim.c
+new file mode 100644
+index 0000000..c024090
+--- /dev/null
++++ b/src/getdelim.c
+@@ -0,0 +1,137 @@
++/* getdelim.c --- Implementation of replacement getdelim function.
++   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006, 2007, 2008,
++   2009, 2010 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++   02110-1301, USA.  */
++
++/* Ported from glibc by Simon Josefsson. */
++
++#include <config.h>
++
++/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
++   optimizes away the lineptr == NULL || n == NULL || fp == NULL tests below.  */
++#define _GL_ARG_NONNULL(params)
++
++#include <stdio.h>
++
++#include <limits.h>
++#include <stdint.h>
++#include <stdlib.h>
++#include <errno.h>
++
++#ifndef SSIZE_MAX
++# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
++#endif
++
++#if USE_UNLOCKED_IO
++# include "unlocked-io.h"
++# define getc_maybe_unlocked(fp)        getc(fp)
++#elif !HAVE_FLOCKFILE || !HAVE_FUNLOCKFILE || !HAVE_DECL_GETC_UNLOCKED
++# undef flockfile
++# undef funlockfile
++# define flockfile(x) ((void) 0)
++# define funlockfile(x) ((void) 0)
++# define getc_maybe_unlocked(fp)        getc(fp)
++#else
++# define getc_maybe_unlocked(fp)        getc_unlocked(fp)
++#endif
++
++/* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
++   NUL-terminate it).  *LINEPTR is a pointer returned from malloc (or
++   NULL), pointing to *N characters of space.  It is realloc'ed as
++   necessary.  Returns the number of characters read (not including
++   the null terminator), or -1 on error or EOF.  */
++
++ssize_t
++getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
++{
++  ssize_t result;
++  size_t cur_len = 0;
++
++  if (lineptr == NULL || n == NULL || fp == NULL)
++    {
++      errno = EINVAL;
++      return -1;
++    }
++
++  flockfile (fp);
++
++  if (*lineptr == NULL || *n == 0)
++    {
++      char *new_lineptr;
++      *n = 120;
++      new_lineptr = (char *) realloc (*lineptr, *n);
++      if (new_lineptr == NULL)
++        {
++          result = -1;
++          goto unlock_return;
++        }
++      *lineptr = new_lineptr;
++    }
++
++  for (;;)
++    {
++      int i;
++
++      i = getc_maybe_unlocked (fp);
++      if (i == EOF)
++        {
++          result = -1;
++          break;
++        }
++
++      /* Make enough space for len+1 (for final NUL) bytes.  */
++      if (cur_len + 1 >= *n)
++        {
++          size_t needed_max =
++            SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
++          size_t needed = 2 * *n + 1;   /* Be generous. */
++          char *new_lineptr;
++
++          if (needed_max < needed)
++            needed = needed_max;
++          if (cur_len + 1 >= needed)
++            {
++              result = -1;
++              errno = EOVERFLOW;
++              goto unlock_return;
++            }
++
++          new_lineptr = (char *) realloc (*lineptr, needed);
++          if (new_lineptr == NULL)
++            {
++              result = -1;
++              goto unlock_return;
++            }
++
++          *lineptr = new_lineptr;
++          *n = needed;
++        }
++
++      (*lineptr)[cur_len] = i;
++      cur_len++;
++
++      if (i == delimiter)
++        break;
++    }
++  (*lineptr)[cur_len] = '\0';
++  result = cur_len ? cur_len : result;
++
++ unlock_return:
++  funlockfile (fp); /* doesn't set errno */
++
++  return result;
++}
+diff --git a/src/getline.c b/src/getline.c
+new file mode 100644
+index 0000000..e9a87db
+--- /dev/null
++++ b/src/getline.c
+@@ -0,0 +1,30 @@
++/* getline.c --- Implementation of replacement getline function.
++   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
++
++   This program is free software; you can redistribute it and/or
++   modify it under the terms of the GNU General Public License as
++   published by the Free Software Foundation; either version 2, or (at
++   your option) any later version.
++
++   This program is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++   02110-1301, USA.  */
++
++/* Written by Simon Josefsson. */
++
++#include <config.h>
++
++#include <stdio.h>
++#include <stdlib.h>
++
++ssize_t
++getline (char **lineptr, size_t *n, FILE *stream)
++{
++  return getdelim (lineptr, n, '\n', stream);
++}
+-- 
+1.6.5.1
+

Added: csw/mgar/pkg/ncsa-mosaic/trunk/files/0003-set-runtime-lib-search-path.patch
===================================================================
--- csw/mgar/pkg/ncsa-mosaic/trunk/files/0003-set-runtime-lib-search-path.patch	                        (rev 0)
+++ csw/mgar/pkg/ncsa-mosaic/trunk/files/0003-set-runtime-lib-search-path.patch	2010-03-25 22:04:59 UTC (rev 9367)
@@ -0,0 +1,25 @@
+From d4d9ab253882c1fe3ca58f60cefc45f2947f9493 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Thu, 25 Mar 2010 21:54:35 +0000
+Subject: [PATCH 3/3] set runtime lib search path
+
+---
+ makefiles/Makefile.sun |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/makefiles/Makefile.sun b/makefiles/Makefile.sun
+index 287c54e..363e050 100755
+--- a/makefiles/Makefile.sun
++++ b/makefiles/Makefile.sun
+@@ -104,7 +104,7 @@ xing = -I/opt/csw/X11/include
+ # xlibs = -L/usr/X11R6/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
+ 
+ # Solaris
+-xlibs = -L/opt/csw/X11/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
++xlibs = -L/opt/csw/X11/lib -R/opt/csw/X11/lib -lXext -lXpm -lXm -lXmu -lXt -lX11 -lICE -lSM
+ static_motif_xlibs = -L/opt/csw/X11/lib -lXext -lXpm /opt/csw/X11/lib/libXm.a -lXmu -lXt -lX11 -lICE -lSM
+ static_xlibs = /opt/csw/X11/lib/libXpm.a /opt/csw/X11/lib/libXm.a /opt/csw/X11/lib/libXmu.a /opt/csw/X11/lib/libXt.a /opt/csw/X11/lib/libXext.a /opt/csw/X11/lib/libX11.a /opt/csw/X11/lib/libSM.a /opt/csw/X11/lib/libICE.a
+ #### For BSD/386:
+-- 
+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