freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. Respect CFLAGS

Browse Source 
2. Respect X11BASE

3. Reduce Makefile patching by specifying ALL-TARGET
This commit is contained in:
Nick Sayer
2001-03-09 18:25:08 +00:00
parent 394b6b3d6a
commit 9ba7436d59
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
math/calctool/Makefile
View File

@@ -17,4 +17,6 @@ MAINTAINER= nsayer@freebsd.org
USE_X_PREFIX= yes
MAN1= calctool.1
ALL_TARGET= x11
.include <bsd.port.mk>

34
math/calctool/files/patch-ab
View File

@@ -1,17 +1,17 @@
--- Makefile.orig Sat May 29 11:35:43 1993
+++ Makefile Sun Aug 16 10:37:31 1998
--- Makefile.orig Sat May 29 09:35:43 1993
+++ Makefile Fri Mar 9 10:17:33 2001
@@ -116,8 +116,8 @@
# library files are not in a standard place, then the following
# two lines should be uncommented, and set appropriately.
#
-#X11INCDIR = -I$(OPENWINHOME)/include
-#X11LIBDIR = -L$(OPENWINHOME)/lib
+X11INCDIR = -I/usr/X11R6/include
+X11LIBDIR = -L/usr/X11R6/lib
+X11INCDIR = -I${X11BASE}/include
+X11LIBDIR = -L${X11BASE}/lib
#-------------------------------------------------------------------------
# If you are compiling the XView version, then the following two lines
# should be uncommented.
@@ -130,10 +130,10 @@
@@ -130,14 +130,14 @@
# Default locations where calctool files will be installed.
# You might wish to alter these values.
#
@@ -26,19 +26,21 @@
#
# Compilation flags and standard macro definitions.
#
@@ -144,8 +144,9 @@
#
#=========================================================================
-CFLAGS = -g $(HELPNAME) $(NEWSFILE) $(STUPID_FPE) $(NOIEEE) \
+CFLAGS += $(HELPNAME) $(NEWSFILE) $(STUPID_FPE) $(NOIEEE) \
$(NOINDEX) $(RCNAME) $(SELTYPE) $(SHLIB) $(SIGRET) \
$(SUN4_KEYBOARD) $(TTEXT) $(MGRPARAM) $(MGRINCDIR) \
$(X11INCDIR) $(XVIEWINCDIR)
@@ -147,7 +147,7 @@
BINARIES = mgr_calctool ps_calctool sv_calctool \
tty_calctool xcalctool xv_calctool
-BINARIES = mgr_calctool ps_calctool sv_calctool \
- tty_calctool xcalctool xv_calctool
+#BINARIES = mgr_calctool ps_calctool sv_calctool \
+# tty_calctool xcalctool xv_calctool
+BINARIES = x11
-CC = cc
+#CC = cc
CC = cc
@@ -233,8 +234,7 @@
LIBSRCS = graphics.c display.c functions.c get.c
LIBOBJS = graphics.o display.o functions.o get.o
@@ -233,8 +233,7 @@
ld -o libcalctool.so.1.1 -assert pure-text $?
install: