From e4e6431d1eadc6060af0e0762bf80028107b5d5f Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Tue, 13 Mar 2001 15:20:58 +0000 Subject: Fix xforms dependency PR: 25742 Submitted by: maintainer --- graphics/xmrm/Makefile | 3 ++- graphics/xmrm/files/patch-aa | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/graphics/xmrm/Makefile b/graphics/xmrm/Makefile index e75ce3eedda7..863af7bb972b 100644 --- a/graphics/xmrm/Makefile +++ b/graphics/xmrm/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmrm PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.cg.tuwien.ac.at/pub/linux/xmrm/ \ ftp://ftp.uni-passau.de/mount/common.lib.archive.unix/Graphic/xmrm/ @@ -16,7 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= treif@mayn.de RUN_DEPENDS= mpeg:${PORTSDIR}/graphics/mpeg -LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ +LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms \ tiff.4:${PORTSDIR}/graphics/tiff USE_XPM= yes diff --git a/graphics/xmrm/files/patch-aa b/graphics/xmrm/files/patch-aa index 87ffe0fe4db0..7b1f38b31bc0 100644 --- a/graphics/xmrm/files/patch-aa +++ b/graphics/xmrm/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Mon Mar 9 17:00:00 1998 -+++ Makefile Tue Mar 28 15:23:34 2000 +--- Makefile.orig Tue Mar 10 00:00:00 1998 ++++ Makefile Sun Mar 11 15:48:25 2001 @@ -16,8 +16,8 @@ # ############################################################################## @@ -26,7 +26,7 @@ -SYSLIB = -L/usr/X11R6/lib -lX11 -lm -LIBS = -L/usr/lib -ltiff -ljpeg -lgz -lforms -lXpm $(SYSLIB) +SYSLIB = -L${X11BASE}/lib -lX11 -lm -+LIBS = -L${PREFIX}/lib -ltiff -ljpeg -lz -lxforms -lXpm $(SYSLIB) ++LIBS = -L${PREFIX}/lib -ltiff -ljpeg -lz -lforms -lXpm $(SYSLIB) OBJECTS = xmrm.o xmrm_cb.o io.o morphvec.o init.o wavemorph.o wave_rts.o wave.o\ areas.o xmrm_main.o -- cgit