Date: 11 Nov 1997 16:46:33 -0000 From: vanilla@MinJe.com.TW To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/5013: Update xmorph to 97.09.11 Message-ID: <19971111164633.376.qmail@MinJe.com.TW> Resent-Message-ID: <199711111700.JAA05173@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 5013
>Category: ports
>Synopsis: Update xmorph to current version
>Confidential: yes
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 11 09:00:00 PST 1997
>Last-Modified:
>Originator: Vanill I. Shu
>Organization:
Cray running FreeBSD
>Release: FreeBSD 3.0-CURRENT i386
>Environment:
>Description:
Update xmorph to 97.09.11
>How-To-Repeat:
>Fix:
diff -ruN xmorph.orig/Makefile xmorph/Makefile
--- xmorph.orig/Makefile Fri Mar 28 23:11:10 1997
+++ xmorph/Makefile Tue Nov 11 10:03:49 1997
@@ -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.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 -ruN xmorph.orig/files/md5 xmorph/files/md5
--- xmorph.orig/files/md5 Fri Mar 28 23:11:11 1997
+++ xmorph/files/md5 Tue Nov 11 10:04:05 1997
@@ -1 +1 @@
-MD5 (xmorph-17jan97.tar.gz) = 8ebe792f3b96e8e80ad7e6b15cc46b99
+MD5 (xmorph-11sep97.tar.gz) = f70b3ec20c7ea65578750af3b170affd
diff -ruN xmorph.orig/patches/patch-aa xmorph/patches/patch-aa
--- xmorph.orig/patches/patch-aa Fri Mar 28 23:11:12 1997
+++ xmorph/patches/patch-aa Tue Nov 11 10:08:51 1997
@@ -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 ""
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19971111164633.376.qmail>