1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

Prepare for xforms update. Remove hardcoded XPM depend.

This commit is contained in:
Mike Heffner 2002-07-01 06:20:05 +00:00
parent 46b365a42d
commit e67eb9e2eb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=62250
2 changed files with 12 additions and 7 deletions

View File

@ -14,8 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \
Xpm.4:${PORTSDIR}/graphics/xpm
LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= yes

View File

@ -1,6 +1,6 @@
--- Makefile.orig Wed Feb 26 21:21:57 1997
+++ Makefile Thu Mar 15 23:12:59 2001
@@ -8,16 +8,16 @@
--- Makefile.orig Wed Feb 26 15:21:57 1997
+++ Makefile Mon Jul 1 02:13:27 2002
@@ -8,16 +8,19 @@
# Flags that might be overriden by top makefile
#=================================================================
@ -14,6 +14,9 @@
-XINCLUDE= -I/usr/X11R6/include
-XLIB = -L/usr/X11R6/lib
+XINCLUDE= -I$(X11BASE)/include
+.if exists(${X11BASE}/include/X11/forms.h)
+XFORMSINC= -I${X11BASE}/include/X11
+.endif
+XLIB = -L$(X11BASE)/lib
-INSTDIR = /usr/local
@ -24,9 +27,12 @@
INSTALL = install
INFODIR_DEFINE = -DINFO_TXT_FILE=\"$(INFODIR)/\"
@@ -28,7 +28,7 @@
@@ -26,9 +29,9 @@
# Flags the compiler will see
#=================================================================
CFLAGS = $(CCFLAG) $(XINCLUDE)
-CFLAGS = $(CCFLAG) $(XINCLUDE)
+CFLAGS = $(CCFLAG) $(XINCLUDE) $(XFORMSINC)
LDFLAGS = $(LDFLAG)
-LIBS = -lforms $(SYSLIB) $(XLIB)
+LIBS = -lforms $(SYSLIB) $(XLIB) -lXpm