Fix build on FreeBSD 7 by using one OS dependant Makefile for all versions

of FreeBSD
This commit is contained in:
Tilman Keskinoz 2007-03-17 17:21:18 +00:00
parent b2a1c34d60
commit a5bec496c6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=187584
8 changed files with 22 additions and 48 deletions

View File

@ -27,10 +27,6 @@ LATEST_LINK= rat30
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700000
BROKEN= Does not compile on FreeBSD 7.X
.endif
do-build:
(cd ${WRKSRC};${SETENV} ${MAKE_ENV} MAKE=${GMAKE} ${SH} ./Build rat)

View File

@ -1,5 +1,5 @@
--- Makefile.orig Tue Sep 14 03:39:00 1999
+++ Makefile Sun Oct 20 14:06:27 2002
--- Makefile.orig Tue Sep 14 12:39:00 1999
+++ Makefile Sat Mar 17 18:16:04 2007
@@ -10,8 +10,8 @@
# -DDEBUG_RTP -DREPEAT
@ -11,6 +11,15 @@
LDFLAGS=
LDLIBS= $(LDLIBS) -lm
RANLIB = ranlib
@@ -19,7 +19,7 @@
GSMFLAGS = -DSASR -DFAST -DUSE_FLOAT_MUL
-include Makefile_$(OSTYPE)_$(OSMVER)
+include Makefile_$(OSTYPE)_4
BINDIR = bin/$(USER)
SRCDIR = src
@@ -82,6 +82,7 @@
$(BINDIR)/rat-$(OSTYPE)-$(OSVERS): $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(RATOBJS)
rm -f $(BINDIR)/rat-$(OSTYPE)-$(OSVERS)

View File

@ -1,9 +0,0 @@
--- Makefile_FreeBSD_5.orig Sun Oct 20 14:03:11 2002
+++ Makefile_FreeBSD_5 Sun Oct 20 14:03:06 2002
@@ -0,0 +1,6 @@
+TCL_INC = ${LOCALBASE}/include/tcl8.2
+TK_INC = ${LOCALBASE}/include/tk8.2
+INCS = -I${X11BASE}/include \
+ -I$(TCL_INC)/generic -I$(TK_INC)/generic
+LDLIBS = -L${LOCALBASE}/lib \
+ -L${X11BASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm

View File

@ -1,9 +0,0 @@
--- /dev/null Thu Nov 30 19:11:00 2006
+++ Makefile_FreeBSD_6 Thu Nov 30 19:12:50 2006
@@ -0,0 +1,6 @@
+TCL_INC = ${LOCALBASE}/include/tcl8.2
+TK_INC = ${LOCALBASE}/include/tk8.2
+INCS = -I${X11BASE}/include \
+ -I$(TCL_INC)/generic -I$(TK_INC)/generic
+LDLIBS = -L${LOCALBASE}/lib \
+ -L${X11BASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm

View File

@ -27,10 +27,6 @@ LATEST_LINK= rat30
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700000
BROKEN= Does not compile on FreeBSD 7.X
.endif
do-build:
(cd ${WRKSRC};${SETENV} ${MAKE_ENV} MAKE=${GMAKE} ${SH} ./Build rat)

View File

@ -1,5 +1,5 @@
--- Makefile.orig Tue Sep 14 03:39:00 1999
+++ Makefile Sun Oct 20 14:06:27 2002
--- Makefile.orig Tue Sep 14 12:39:00 1999
+++ Makefile Sat Mar 17 18:16:04 2007
@@ -10,8 +10,8 @@
# -DDEBUG_RTP -DREPEAT
@ -11,6 +11,15 @@
LDFLAGS=
LDLIBS= $(LDLIBS) -lm
RANLIB = ranlib
@@ -19,7 +19,7 @@
GSMFLAGS = -DSASR -DFAST -DUSE_FLOAT_MUL
-include Makefile_$(OSTYPE)_$(OSMVER)
+include Makefile_$(OSTYPE)_4
BINDIR = bin/$(USER)
SRCDIR = src
@@ -82,6 +82,7 @@
$(BINDIR)/rat-$(OSTYPE)-$(OSVERS): $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(RATOBJS)
rm -f $(BINDIR)/rat-$(OSTYPE)-$(OSVERS)

View File

@ -1,9 +0,0 @@
--- Makefile_FreeBSD_5.orig Sun Oct 20 14:03:11 2002
+++ Makefile_FreeBSD_5 Sun Oct 20 14:03:06 2002
@@ -0,0 +1,6 @@
+TCL_INC = ${LOCALBASE}/include/tcl8.2
+TK_INC = ${LOCALBASE}/include/tk8.2
+INCS = -I${X11BASE}/include \
+ -I$(TCL_INC)/generic -I$(TK_INC)/generic
+LDLIBS = -L${LOCALBASE}/lib \
+ -L${X11BASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm

View File

@ -1,9 +0,0 @@
--- /dev/null Thu Nov 30 19:11:00 2006
+++ Makefile_FreeBSD_6 Thu Nov 30 19:12:50 2006
@@ -0,0 +1,6 @@
+TCL_INC = ${LOCALBASE}/include/tcl8.2
+TK_INC = ${LOCALBASE}/include/tk8.2
+INCS = -I${X11BASE}/include \
+ -I$(TCL_INC)/generic -I$(TK_INC)/generic
+LDLIBS = -L${LOCALBASE}/lib \
+ -L${X11BASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm