From 1769999c1b9856a50c9c7ef15c809cd95839f0a6 Mon Sep 17 00:00:00 2001
From: mikeh <mikeh@FreeBSD.org>
Date: Thu, 4 Jul 2002 08:09:05 +0000
Subject: Prepare for xforms update.

---
 math/apc/Makefile       |  2 +-
 math/apc/files/patch-aa | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'math/apc')

diff --git a/math/apc/Makefile b/math/apc/Makefile
index 7bc1ff049b6d..2b0a1fd2246d 100644
--- a/math/apc/Makefile
+++ b/math/apc/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= 	http://members.global2000.net/~eagriff/
 
 MAINTAINER=	eagriff@global2000.net
 
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	forms.0:${PORTSDIR}/x11-toolkits/xforms
 
 USE_X_PREFIX=	yes
 MAN1=		apc.1
diff --git a/math/apc/files/patch-aa b/math/apc/files/patch-aa
index 7fe0dcbbfc50..9d55486bc273 100644
--- a/math/apc/files/patch-aa
+++ b/math/apc/files/patch-aa
@@ -1,11 +1,16 @@
---- Makefile.orig	Fri Aug 31 23:39:56 2001
-+++ Makefile	Fri Aug 31 23:40:02 2001
-@@ -2,7 +2,7 @@
+--- Makefile.orig	Mon Oct 13 15:25:38 1997
++++ Makefile	Tue Jul  2 01:04:00 2002
+@@ -1,8 +1,11 @@
+ # New Makefile for apc (13 October 1997)
  #
- CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include
+-CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include
++.if exists(${X11BASE}/include/X11/forms.h)
++XFORMSINC=-I${X11BASE}/include/X11
++.endif
++CFLAGS+=-DOS=\"$(OSTYPE)\" -I${X11BASE}/include ${XFORMSINC}
  LDFLAGS+=-L${X11BASE}/lib
 -LDADD+=-lxforms -lX11 -lm
-+LDADD+=-lxforms -lX11 -lm -lXpm
++LDADD+=-lforms -lX11 -lm -lXpm
  BINDIR=${X11BASE}/bin
  MANDIR=${X11BASE}/man/man
  PROG=	apc
-- 
cgit