From 0d970499bc4cb4ec4072d5475479cf1ee11e2cc7 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Wed, 24 Mar 1999 17:43:08 +0000 Subject: Use our port of Xpm instead of the included version. PR: 10463 Submitted by: Tom Hukins --- math/abs/Makefile | 4 +++- math/abs/files/patch-aa | 16 +++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'math') diff --git a/math/abs/Makefile b/math/abs/Makefile index 4f6e7249f05a..cb43a58a6814 100644 --- a/math/abs/Makefile +++ b/math/abs/Makefile @@ -3,7 +3,7 @@ # Date created: 20 January 1999 # Whom: gmarco # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/01/26 03:43:37 steve Exp $ # DISTNAME= abs-src-0.5 @@ -13,6 +13,8 @@ MASTER_SITES= http://www.ping.be/bertin/ MAINTAINER= freebsd@scotty.masternet.it +LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm + USE_XLIB= yes do-install: diff --git a/math/abs/files/patch-aa b/math/abs/files/patch-aa index b36b27ad7800..09890135c6bd 100644 --- a/math/abs/files/patch-aa +++ b/math/abs/files/patch-aa @@ -1,19 +1,25 @@ ---- Makefile.orig Mon Jan 25 00:36:03 1999 -+++ Makefile Mon Jan 25 00:37:42 1999 -@@ -4,6 +4,7 @@ +--- Makefile.orig Sun Dec 20 11:56:29 1998 ++++ Makefile Mon Mar 22 20:05:40 1999 +@@ -1,10 +1,11 @@ + CURRENT_DIR = . + +-SUBDIRS = Xpm TextField-1.0 ++SUBDIRS = TextField-1.0 MAKE = make +-LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext +CFLAGS+=-I$(X11BASE)/include - LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext ++LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext -lXpm SRCS = \ + applic.c \ @@ -105,7 +106,7 @@ $(MAKE) all); \ fi \ done - cc -o abs ./TextField-1.0/*.o $(OBJS) ./Xpm/libxpm.a $(LIBS) -+ $(CC) $(CFLAGS) -o abs ./TextField-1.0/*.o $(OBJS) ./Xpm/libxpm.a $(LIBS) ++ $(CC) $(CFLAGS) -o abs ./TextField-1.0/*.o $(OBJS) $(LIBS) clean:: rm -f *.o */*.o */*.a -- cgit v1.2.3