Date: Fri, 4 Aug 2000 16:49:29 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/20424: Update port: graphics/xmorph to 2000.04.28 Message-ID: <20000804234929.5FD3737B807@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 20424
>Category: ports
>Synopsis: Update port: graphics/xmorph to 2000.04.28
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 04 16:50:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2000.04.28
- Add WWW: line into pkg/DESCR
New file:
patches/patch-ab
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/xmorph/Makefile graphics/xmorph/Makefile
--- /usr/ports/graphics/xmorph/Makefile Mon Apr 24 18:58:23 2000
+++ graphics/xmorph/Makefile Sat Aug 5 04:33:37 2000
@@ -6,20 +6,16 @@
#
PORTNAME= xmorph
-PORTVERSION= 97.09.11
+PORTVERSION= 2000.04.28
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= graphics
-DISTNAME= xmorph-11sep97
+MASTER_SITES= http://www.colorado-research.com/~gourlay/software/Graphics/Xmorph/pub/
+DISTNAME= ${PORTNAME}-2000apr28
MAINTAINER= ports@FreeBSD.org
-MAN1= xmorph.1
-MANCOMPRESSED= yes
-
USE_X_PREFIX= yes
+INSTALLS_SHLIB= yes
-post-patch:
- (cd ${WRKSRC}; makedepend)
+MAN1= xmorph.1
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/xmorph/files/md5 graphics/xmorph/files/md5
--- /usr/ports/graphics/xmorph/files/md5 Fri May 8 01:18:53 1998
+++ graphics/xmorph/files/md5 Sat Aug 5 03:43:14 2000
@@ -1 +1 @@
-MD5 (xmorph-11sep97.tar.gz) = f70b3ec20c7ea65578750af3b170affd
+MD5 (xmorph-2000apr28.tar.gz) = ce6e238e9a509fe38d3d270b6e6dd320
diff -urN /usr/ports/graphics/xmorph/patches/patch-aa graphics/xmorph/patches/patch-aa
--- /usr/ports/graphics/xmorph/patches/patch-aa Mon Oct 5 12:07:12 1998
+++ graphics/xmorph/patches/patch-aa Sat Aug 5 05:04:17 2000
@@ -1,24 +1,75 @@
---- Makefile.orig Thu Sep 11 20:37:55 1997
-+++ Makefile Sat Oct 3 23:33:33 1998
-@@ -132,7 +132,7 @@
+--- Makefile.orig Sat Apr 29 08:26:30 2000
++++ Makefile Sat Aug 5 04:52:50 2000
+@@ -121,7 +121,6 @@
+ #CC=gcc
+ #CC=/bin/cc
+ #CC=cc
+-CC=cc
+
+
+
+@@ -142,7 +141,7 @@
#
#INCLUDE=-I/usr/local/include -I/usr/openwin/include
-INCLUDE=-I/usr/local/include
-+INCLUDE=-I/usr/local/include -I$(X11BASE)/include
++INCLUDE=-I${X11BASE}/include
+
+
+
+@@ -179,7 +178,7 @@
+ #DEBUG=-O -g -Wall -DVERBOSE -DDEBUG
+ #DEBUG=-O
+ #DEBUG=-g3 -O -fullwarn -DVERBOSE -DDEBUG
+-DEBUG=-g3 -O -fullwarn
++#DEBUG=-g3 -O -fullwarn
+
+
+
+@@ -268,7 +267,10 @@
+ #XLIBS=-L/usr/X11R6/lib -lXaw -lXmu -lXext -lXt -lX11
+
+ # SGI IRIX:
+-XLIBS= -lXaw -lXmu -lXext -lXt -lcvt -lX11
++#XLIBS= -lXaw -lXmu -lXext -lXt -lcvt -lX11
++
++# FreeBSD:
++XLIBS=-L${X11BASE}/lib -lXaw -lXmu -lXext -lXt -lX11
-@@ -167,7 +167,7 @@
+@@ -313,10 +315,10 @@
#
+ # -lmalloc_cv has more robust memory checking
- #DEBUG=-O
--DEBUG=-O -g -Wall -DDEBUG
-+#DEBUG=-O -g -Wall -DDEBUG
- #DEBUG=-g3 -O -fullwarn -woff 1233 -DVERBOSE -DDEBUG
+-#NON_GUI_LIBS = -lm
++NON_GUI_LIBS = -lm
+ #NON_GUI_LIBS = -lm -ldl
+ #NON_GUI_LIBS = -lm /usr/lib/debug/malloc.o
+-NON_GUI_LIBS = -lm -lmalloc
++#NON_GUI_LIBS = -lm -lmalloc
+
+
+
+@@ -344,7 +346,7 @@
+
+ # SHLIB_EXT: filename extension for shared libraries
+ # --------------------------------------------------
+-SHLIB_EXT=so
++SHLIB_EXT=so.1
+
+
+
+@@ -353,7 +355,7 @@
+ ## -----------------------
+ #
+
+-LDFLAGS=-L/usr/local/lib
++LDFLAGS=
-@@ -225,7 +225,7 @@
+
+@@ -378,14 +380,14 @@
#CFLAGS=$(DEBUG) $(DEFINES) $(INCLUDE) -DSUNOS
@@ -27,36 +78,73 @@
-@@ -248,7 +248,10 @@
- # 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$(X11BASE)/lib -lXaw -lXmu -lXext -lXt -lX11
-+.if $(PORTOBJFORMAT) == "elf"
-+XLIBS+=-Wl,-rpath,$(X11BASE)/lib
-+.endif
- #XLIBS= -lXaw -lXmu -lXext -lXt -lcvt -lX11
-
-
-@@ -289,7 +292,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
+ ## INSTALL_BASE: Directory base to install files
+ ## ---------------------------------------------
+-INSTALL_BASE=/usr/local
++INSTALL_BASE=${PREFIX}
+
-@@ -370,6 +373,11 @@
- #all: morph.$(SHLIB_EXT)
- all: xmorph xmorph.man
-+install:
-+ install -cs xmorph ${PREFIX}/bin
-+ install -c -m 644 xmorph ${PREFIX}/man/man1/xmorph.1
-+ gzip -9nf ${PREFIX}/man/man1/xmorph.1
+@@ -450,15 +452,19 @@
+ xmorph.o
+
+ #all: morph.$(SHLIB_EXT)
+-all: xmorph morph xmorph.man xmorph.info
++#all: xmorph morph xmorph.man xmorph.info
++all: libmorph.a libmorph.so xmorph
+
+ libmorph.a: $(LIB_OBJS)
+ ar cr $@ $(LIB_OBJS)
+
+ libmorph.$(SHLIB_EXT): $(LIB_OBJS)
+- ld $(SHLIB_FLAG) $(LDFLAGS) $(LIB_OBJS) -o $@
++ $(CC) $(SHLIB_FLAG) -Wl,-soname,$@ $(LDFLAGS) $(LIB_OBJS) -o $@
+
- xmorph: $(OBJS)
++libmorph.so: libmorph.$(SHLIB_EXT)
++ ln -sf libmorph.$(SHLIB_EXT) libmorph.so
+
+-xmorph: main-x.o libmorph.a $(GUI_OBJS)
++xmorph: main-x.o libmorph.so $(GUI_OBJS)
@echo ""
@echo ""
+ @echo ""
+@@ -471,14 +477,17 @@
+ @echo ""
+ @echo ""
+ @echo ""
+- $(CC) $(CFLAGS) -o $@ main-x.o $(GUI_OBJS) libmorph.a $(LIBS)
++ $(CC) $(CFLAGS) -o $@ main-x.o $(GUI_OBJS) -L. -lmorph $(LIBS)
+
+-morph: main-cl.o libmorph.a
+- $(CC) $(CFLAGS) -o $@ main-cl.o libmorph.a $(NON_GUI_LIBS)
++morph: main-cl.o libmorph.so
++ $(CC) $(CFLAGS) -o $@ main-cl.o -L. -lmorph $(NON_GUI_LIBS)
+
+ .c$(OBJ): $(SRCS) Makefile
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
++$(LIB_OBJS): $(LIB_OBJS:.o=.c) Makefile
++ $(CC) $(CFLAGS) $(CPPFLAGS) -fpic -DPIC -c $<
++
+ main-x.o: main.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -DX_GUI main.c -o $@
+
+@@ -498,11 +507,12 @@
+
+
+
+-install: xmorph xmorph.man libmorph.a libmorph.$(SHLIB_EXT)
+- cp xmorph $(INSTALL_BASE)/bin
+- cp xmorph.1 $(INSTALL_BASE)/man/man1
+- cp libmorph.a $(INSTALL_BASE)/lib
+- cp libmorph.$(SHLIB_EXT) $(INSTALL_BASE)/lib
++install: xmorph xmorph.man libmorph.a libmorph.so
++ ${BSD_INSTALL_PROGRAM} xmorph $(INSTALL_BASE)/bin
++ ${BSD_INSTALL_MAN} xmorph.1 $(INSTALL_BASE)/man/man1
++ ${BSD_INSTALL_DATA} libmorph.a $(INSTALL_BASE)/lib
++ ${BSD_INSTALL_DATA} libmorph.$(SHLIB_EXT) $(INSTALL_BASE)/lib
++ ln -sf libmorph.$(SHLIB_EXT) $(INSTALL_BASE)/lib/libmorph.so
+
+
+
diff -urN /usr/ports/graphics/xmorph/patches/patch-ab graphics/xmorph/patches/patch-ab
--- /usr/ports/graphics/xmorph/patches/patch-ab Thu Jan 1 09:00:00 1970
+++ graphics/xmorph/patches/patch-ab Sat Aug 5 04:13:44 2000
@@ -0,0 +1,11 @@
+--- my_malloc.c.orig Wed Apr 26 05:12:54 2000
++++ my_malloc.c Sat Aug 5 04:07:53 2000
+@@ -32,7 +32,7 @@
+ // Thanks to Geoff Lawler.
+ */
+
+-#if defined(apollo) || defined(__CYGWIN32__)
++#if defined(apollo) || defined(__CYGWIN32__) || defined(__STDC__)
+ #else
+ #include <malloc.h>
+ #endif
diff -urN /usr/ports/graphics/xmorph/pkg/DESCR graphics/xmorph/pkg/DESCR
--- /usr/ports/graphics/xmorph/pkg/DESCR Fri Aug 2 05:31:17 1996
+++ graphics/xmorph/pkg/DESCR Sat Aug 5 03:39:15 2000
@@ -16,5 +16,7 @@
Xmorph has help pages built into it, so no external documentation is
necessary.
+WWW: http://www.colorado-research.com/~gourlay/software/Graphics/Xmorph/
+
eric.
erich@FreeBSD.org
diff -urN /usr/ports/graphics/xmorph/pkg/PLIST graphics/xmorph/pkg/PLIST
--- /usr/ports/graphics/xmorph/pkg/PLIST Sun Aug 23 16:34:43 1998
+++ graphics/xmorph/pkg/PLIST Sat Aug 5 04:08:19 2000
@@ -1 +1,4 @@
bin/xmorph
+lib/libmorph.a
+lib/libmorph.so
+lib/libmorph.so.1
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000804234929.5FD3737B807>