Upgrade to 97.09.11.

3 files changed, 50 insertions, 35 deletions

diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index fe9e142f89f3..900a4b531427 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    xmorph
-# Version required:     17jan97
+# Version required:     11sep97
 # Date created:         Thu Aug  1 09:10:22 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1996/11/26 15:58:34 erich Exp $
+# $Id: Makefile,v 1.6 1997/03/28 15:11:10 erich Exp $
 #
 
-DISTNAME=	xmorph-17jan97
-PKGNAME=	xmorph-97.01.17
+DISTNAME=	xmorph-11sep97
+PKGNAME=	xmorph-97.09.11
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	graphics
diff --git a/graphics/xmorph/distinfo b/graphics/xmorph/distinfo
index 46cfef06ccf9..52fc339250b4 100644
--- a/graphics/xmorph/distinfo
+++ b/graphics/xmorph/distinfo
@@ -1 +1 @@
-MD5 (xmorph-17jan97.tar.gz) = 8ebe792f3b96e8e80ad7e6b15cc46b99
+MD5 (xmorph-11sep97.tar.gz) = f70b3ec20c7ea65578750af3b170affd
diff --git a/graphics/xmorph/files/patch-aa b/graphics/xmorph/files/patch-aa
index e6f82c6165e5..98932412e812 100644
--- a/graphics/xmorph/files/patch-aa
+++ b/graphics/xmorph/files/patch-aa
@@ -1,44 +1,59 @@
---- Makefile.orig	Wed Oct  2 11:28:18 1996
-+++ Makefile	Thu Nov  7 15:26:58 1996
-@@ -96,10 +96,10 @@
+--- Makefile.orig	Fri Sep 12 09:37:55 1997
++++ Makefile	Tue Nov 11 10:08:40 1997
+@@ -132,7 +132,7 @@
  #
- #CFLAGS=-g +Ns4000 $(DREAL)
  
--CFLAGS=-O $(DREAL)
--CFLAGS=-g -O -I/usr/openwin/include -DSUNOS $(DREAL)
--CFLAGS=-g -O -I/usr/openwin/include $(DREAL)
--CFLAGS=-g $(DREAL)
-+CFLAGS=-O $(DREAL) -I/usr/X11R6/include
-+#CFLAGS=-g -O -I/usr/openwin/include -DSUNOS $(DREAL)
-+#CFLAGS=-g -O -I/usr/openwin/include $(DREAL)
-+#CFLAGS=-g $(DREAL)
+ #INCLUDE=-I/usr/local/include -I/usr/openwin/include
+-INCLUDE=-I/usr/local/include
++INCLUDE=-I/usr/local/include -I/usr/X11R6/include
  
  
- ##
-@@ -126,10 +126,10 @@
- #
- # SOLARIS: To link to openwin libraries, add -L/usr/openwin/lib
+ 
+@@ -167,7 +167,7 @@
  #
--LIBS=-L/usr/openwin/lib -lXaw -lXmu -lXext -lXt -lX11 -lm /usr/lib/debug/malloc.o
--LIBS=-L/usr/openwin/lib -lXaw -lXmu -lXext -lXt -lX11 -lm
--LIBS=-lXaw -lXmu -lXext -lXt -lX11 -lm
--LIBS=-L/usr/X11/lib -lXaw -lXmu -lXext -lXt -lX11 -lm
-+#LIBS=-L/usr/openwin/lib -lXaw -lXmu -lXext -lXt -lX11 -lm /usr/lib/debug/malloc.o
-+#LIBS=-L/usr/openwin/lib -lXaw -lXmu -lXext -lXt -lX11 -lm
-+#LIBS=-lXaw -lXmu -lXext -lXt -lX11 -lm
-+LIBS=-L/usr/X11R6/lib -lXaw -lXmu -lXext -lXt -lX11 -lm
  
+ #DEBUG=-O
+-DEBUG=-O -g -Wall -DDEBUG
++#DEBUG=-O -g -Wall -DDEBUG
+ #DEBUG=-g3 -O -fullwarn -woff 1233 -DVERBOSE -DDEBUG
+ 
+ 
+@@ -225,7 +225,7 @@
+ 
+ #CFLAGS=$(DEBUG) $(DEFINES) $(INCLUDE) -DSUNOS
+ 
+-CFLAGS=$(DEBUG) $(DEFINES) $(INCLUDE)
++CFLAGS+=$(DEBUG) $(DEFINES) $(INCLUDE)
+ 
+ 
+ 
+@@ -248,7 +248,7 @@
+ #   The cvt library is available in the goldengate.sw.goldengate package
+ 
+ #XLIBS=-L/usr/openwin/lib -lXaw -lXmu -lXext -lXt -lX11
+-XLIBS=-L/usr/X11/lib -lXaw -lXmu -lXext -lXt -lX11
++XLIBS=-L/usr/X11R6/lib -lXaw -lXmu -lXext -lXt -lX11
+ #XLIBS=              -lXaw -lXmu -lXext -lXt -lcvt -lX11
+ 
+ 
+@@ -289,7 +289,7 @@
+ 
+ #LIBS = -lm
+ #LIBS = $(XLIBS) -lm
+-LIBS = $(XLIBS) -lm -ldl
++LIBS = $(XLIBS) -lm
+ #LIBS = $(XLIBS) -lm /usr/lib/debug/malloc.o
+ #LIBS = $(XLIBS) -lm -lmalloc
  
- #### ===========================
-@@ -180,6 +180,11 @@
-      *.[ch] *.xbm xmorph.man warp.param
+@@ -369,6 +369,11 @@
  
- all: xmorph
+ #all: morph.$(SHLIB_EXT)
+ all: xmorph xmorph.man
 +
 +install:
 +	install -cs xmorph ${PREFIX}/bin
-+	install -c -m 644 xmorph.man ${PREFIX}/man/man1/xmorph.1
++	install -c -m 644 xmorph ${PREFIX}/man/man1/xmorph.1
 +	gzip -9nf ${PREFIX}/man/man1/xmorph.1
  
  xmorph:   $(OBJS)
- 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
+ 	@echo ""