diff options
author | Eric L. Hernes <erich@FreeBSD.org> | 1997-03-28 15:11:12 +0000 |
---|---|---|
committer | Eric L. Hernes <erich@FreeBSD.org> | 1997-03-28 15:11:12 +0000 |
commit | 3a3bd81f8a763504dd2a69161412c15d6b70587b (patch) | |
tree | 5f5d67ae1236e19ab9c8afdf455bfa1bc36cde8b | |
parent | patches that should have been committed yesterday (diff) |
upgrade
Notes
Notes:
svn path=/head/; revision=6050
-rw-r--r-- | graphics/xmorph/Makefile | 8 | ||||
-rw-r--r-- | graphics/xmorph/distinfo | 2 | ||||
-rw-r--r-- | graphics/xmorph/files/patch-aa | 43 |
3 files changed, 18 insertions, 35 deletions
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile index b6e22e626198..fe9e142f89f3 100644 --- a/graphics/xmorph/Makefile +++ b/graphics/xmorph/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: xmorph -# Version required: 13nov96 +# Version required: 17jan97 # Date created: Thu Aug 1 09:10:22 CDT 1996 # Whom: erich@FreeBSD.org # -# $Id: Makefile,v 1.4 1996/11/16 09:15:10 asami Exp $ +# $Id: Makefile,v 1.5 1996/11/26 15:58:34 erich Exp $ # -DISTNAME= xmorph-13nov96 -PKGNAME= xmorph-96.11.13 +DISTNAME= xmorph-17jan97 +PKGNAME= xmorph-97.01.17 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= graphics diff --git a/graphics/xmorph/distinfo b/graphics/xmorph/distinfo index 45da1b793123..46cfef06ccf9 100644 --- a/graphics/xmorph/distinfo +++ b/graphics/xmorph/distinfo @@ -1 +1 @@ -MD5 (xmorph-13nov96.tar.gz) = c97eebe826c9b197518f91659e71d1b5 +MD5 (xmorph-17jan97.tar.gz) = 8ebe792f3b96e8e80ad7e6b15cc46b99 diff --git a/graphics/xmorph/files/patch-aa b/graphics/xmorph/files/patch-aa index bd9e24434f2a..e6f82c6165e5 100644 --- a/graphics/xmorph/files/patch-aa +++ b/graphics/xmorph/files/patch-aa @@ -1,48 +1,31 @@ --- Makefile.orig Wed Oct 2 11:28:18 1996 +++ Makefile Thu Nov 7 15:26:58 1996 -@@ -64,12 +64,12 @@ - # You must use an ANSI C compiler. +@@ -96,10 +96,10 @@ # + #CFLAGS=-g +Ns4000 $(DREAL) --CC=ucbcc --CC=apcc -DANSI --CC=gcc -W -Wunused -Wuninitialized -Wshadow -DANSI --CC=gcc -DANSI --CC=cc --CC=cc -DANSI -fullwarn -+#CC=ucbcc -+#CC=apcc -DANSI -+#CC=gcc -W -Wunused -Wuninitialized -Wshadow -DANSI -+#CC=gcc -DANSI -+#CC=cc -+#CC=cc -DANSI -fullwarn +-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) ## -@@ -89,10 +89,10 @@ - # - #CFLAGS=-g +Ns4000 - --CFLAGS=-O --CFLAGS=-g -O -I/usr/openwin/include -DSUNOS --CFLAGS=-g -O -I/usr/openwin/include --CFLAGS=-g -+CFLAGS+=-O -I/usr/X11R6/include -+#CFLAGS=-g -O -I/usr/openwin/include -DSUNOS -+#CFLAGS=-g -O -I/usr/openwin/include -+#CFLAGS=-g - - - ## -@@ -117,9 +117,9 @@ +@@ -126,10 +126,10 @@ # # SOLARIS: To link to openwin libraries, add -L/usr/openwin/lib # -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 |