Don't patch the Makefile unconditionally for NetBSD, giving this a

fighting chance on a few other platforms. Addresses PR pkg/26932.

3 files changed, 31 insertions, 20 deletions

diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile
index bbf39e090ae..80ad4836438 100644
--- a/www/mMosaic/Makefile
+++ b/www/mMosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:26 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/03/06 16:56:17 fredb Exp $
 #
 
 DISTNAME=	mMosaic-3.7.2
@@ -22,4 +22,20 @@ do-install:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+MAKEFLAGS+=	sysconfigflags='-DNETBSD -DMOTIF1_2'
+
+.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+MAKEFLAGS+=	sysconfigflags='-DFreeBSD -DMOTIF1_2'
+
+.elif ${OPSYS} == "Linux"
+MAKEFLAGS+=	sysconfigflags='-DLINUX -Dlinux -DMOTIF1_2'
+
+.elif ${OPSYS:MIRIX*} != ""
+MAKEFLAGS+=	sysconfigflags='-DSVR4 -DIRIX -DMOTIF1_2'
+
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/mMosaic/distinfo b/www/mMosaic/distinfo
index a35a54ad75f..eaaf417a788 100644
--- a/www/mMosaic/distinfo
+++ b/www/mMosaic/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:08:33 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/03/06 16:56:17 fredb Exp $
 
 SHA1 (mMosaic-3.7.2.tar.gz) = f26d4fd115a0fb7fc09947506b59e1a3790b6ac7
 RMD160 (mMosaic-3.7.2.tar.gz) = 9c7f2e2f00beaef474e53e25a91aeb604584dd06
 Size (mMosaic-3.7.2.tar.gz) = 507612 bytes
-SHA1 (patch-aa) = 028e9836c6994ab58e9d9e425d74022dd0c1adec
+SHA1 (patch-aa) = c18e1cc90ea3a3843c514944c8c597d660555387
 SHA1 (patch-ab) = 64cb25fda5e4100251072184dec9f50e8de4be97
 SHA1 (patch-ac) = 98479482a48a19b3f64ce4ed7a33cec04c90d070
 SHA1 (patch-ad) = d0da529ed866a9295010419882a004997bba17a7
diff --git a/www/mMosaic/patches/patch-aa b/www/mMosaic/patches/patch-aa
index ad6ba47a863..c72d78da389 100644
--- a/www/mMosaic/patches/patch-aa
+++ b/www/mMosaic/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2005/03/06 16:56:17 fredb Exp $
 
---- Makefile.orig	Thu Feb  1 07:27:30 2001
+--- Makefile.orig	2001-02-01 07:27:30.000000000 -0600
 +++ Makefile
-@@ -45,13 +45,13 @@
+@@ -45,13 +45,13 @@ CC = cc
  # GCC : Linux Intel optimised 
  #prereleaseflags = -Wall -pipe  -O2 -g  -march=pentium -mcpu=pentium
  # GCC : Linux, FreeBSD, NetBSD compiler flags (recommended)
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $
  # Sun Workshop C++ Compiler
  #prereleaseflags = +w -g
  
-@@ -63,9 +63,9 @@
+@@ -63,9 +63,9 @@ prereleaseflags = -v -g -xstrconst
  ##
  
  # Linux, NetBSD, FreeBSD, BSDI, OSF1, SunOS4this 
@@ -30,12 +30,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $
  
  ##
  ## System configuration flags
-@@ -88,11 +88,11 @@
- # FreeBSD
- #sysconfigflags = -DFreeBSD
- # NetBSD
--#sysconfigflags = -DNETBSD
-+sysconfigflags = -DNETBSD
+@@ -92,7 +92,7 @@ RANLIB = /bin/true
  # Irix
  #sysconfigflags = -DSVR4 -DIRIX
  # Solaris2.5 & 2.5.1
@@ -44,7 +39,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $
  
  # Use Motif 1.2.x
  sysconfigflags += -DMOTIF1_2
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ sysconfigflags += -DMOTIF1_2
  # Irix
  #syslibs = -lPW
  # Solaris 2.x, Motorola SVR4
@@ -53,7 +48,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $
  
  ##
  ## X11 includes
-@@ -141,7 +141,8 @@
+@@ -141,7 +141,8 @@ syslibs = -lsocket -lnsl -ldl
  # Solaris 2.x
  #xinc	= -I/usr/openwin/include -I/usr/dt/include 
  #solaris8
@@ -63,7 +58,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $
  
  
  ##
-@@ -168,9 +169,12 @@
+@@ -168,9 +169,12 @@ xinc	= -I/usr/openwin/include -I/usr/dt/
  # Irix
  #xlibs	= -L/usr/lib32 -lXm -lXmu -lXt -lXext -lX11 -lm 
  # Solaris 2.x
@@ -78,7 +73,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $
  
  #
  # private
-@@ -190,8 +194,10 @@
+@@ -190,8 +194,10 @@ xlibs	+= -lXm12 -lXmu -lXt -lXext -lX11 
  #pnginc  = /usr/local/include
  #pnglibs = /usr/local/lib/libpng.a /usr/lib/libz.a
  # Solaris
@@ -91,7 +86,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $
  
  # To disable PNG support comment this.
  
-@@ -208,8 +214,10 @@
+@@ -208,8 +214,10 @@ pngflags =  -I$(pnginc) -DHAVE_PNG
  #jpeginc   = /usr/include
  #jpeglibs  = /usr/lib32/libjpeg.so
  # Solaris FreeBSD
@@ -104,7 +99,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $
  
  # To disable JPEG support (not recommended) comment this.
  
-@@ -259,12 +267,12 @@
+@@ -259,12 +267,12 @@ PLUGINC = -I$(PLUGINCDIR)
  INSTALL_PLUG_DIR = /usr/local/mMosaic/plugins
  explugdir = $(PWD)/plugins/examples
  # for gcc
@@ -121,7 +116,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/08 12:51:58 jlam Exp $
  
  ##
  ## Customization flags
-@@ -290,7 +298,7 @@
+@@ -290,7 +298,7 @@ explugldflag = -G
  #
  # Common