1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

Fix build

This commit is contained in:
Michael Haro 2001-04-06 02:26:09 +00:00
parent 37fdb9d224
commit 09ea07bb8d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=40924
4 changed files with 118 additions and 20 deletions

View File

@ -7,7 +7,6 @@
PORTNAME= rat
PORTVERSION= 4.2.13
PORTREVISION= 0
CATEGORIES= mbone audio ipv6
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.2.13/ \
@ -23,8 +22,6 @@ USE_GMAKE= yes
MAN1= rat.1
MANCOMPRESSED= no
PATCH_DEBUG= yes
RAT_BUILD_DIRS= common rat
.include <bsd.port.pre.mk>
@ -42,12 +39,12 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/rat/sdr2.plugin.S02.audio.rtp.*.rat ${LOCALBASE}/etc/sdr/plugins
do-build:
for d in ${RAT_BUILD_DIRS}; do \
cd ${WRKSRC}/$$d && ${GMAKE}; \
done
.for d in ${RAT_BUILD_DIRS}
cd ${WRKSRC}/${d} && ${GMAKE}
.endfor
do-configure:
cd ${WRKSRC}/common && autoconf && ./configure ${ENABLE_IPv6}
cd ${WRKSRC}/rat && autoconf && ./configure --with-tcl=${LOCALBASE} --with-tk=${LOCALBASE} ${ENABLE_IPv6}
cd ${WRKSRC}/common && autoconf && ./configure ${CONFIGURE_ARGS} ${ENABLE_IPv6}
cd ${WRKSRC}/rat && autoconf && ./configure ${CONFIGURE_ARGS} --with-tcl=${LOCALBASE} --with-tk=${LOCALBASE} ${ENABLE_IPv6}
.include "bsd.port.post.mk"

View File

@ -1,5 +1,57 @@
--- ../../../work-pre-patch/rat-4.2.13/rat/configure.in Sun Mar 4 12:00:33 2001
+++ rat/configure.in Sun Mar 4 13:13:29 2001
--- rat/configure.in.orig Fri Mar 2 12:49:10 2001
+++ rat/configure.in Thu Apr 5 19:13:17 2001
@@ -280,12 +280,12 @@
# We could be dealing with a source installation or a full installation.
# Expect a source installation to have headers in TCL8_HOME/generic and libs in
# TCL8_HOME/unix. A full installation should have headers in
-# INSTDIR/include/tcl8.0, or INSTDIR/include, and have libraries be in
+# INSTDIR/include/tcl8.2, or INSTDIR/include, and have libraries be in
# INSTDIR/lib.
#------------------------------------------------------------------------------
PARENT=`echo $PWD | sed -e 's%/[[^/]]*$%%'`
-TCL_INC=${PARENT}/tcl-8.0
-TCL_LIB=${PARENT}/tcl-8.0
+TCL_INC=${PARENT}/tcl-8.2
+TCL_LIB=${PARENT}/tcl-8.2
AC_ARG_WITH(tcl,
[ --with-tcl=DIR specify location of Tcl installation],
@@ -295,7 +295,7 @@
#-----------------------------------------------------------------------------
# Depending on config expect tcl.h to be tcl source dir or include path
#-----------------------------------------------------------------------------
-for i in $TCL_INC/generic $TCL_INC/include/tcl8.0 $TCL_INC/include $TCL_INC
+for i in $TCL_INC/generic $TCL_INC/include/tcl8.2 $TCL_INC/include $TCL_INC
do
if test -d $i ; then
TCL_INC=$i
@@ -330,7 +330,7 @@
SAVED_LIBS=$LIBS
LIBS=""
FOUND_TCL_LIB=no
-AC_SEARCH_LIBS(Tcl_Init, tcl8.0 tcl80,
+AC_SEARCH_LIBS(Tcl_Init, tcl8.2 tcl82,
FOUND_TCL_LIB=yes,
,
-L${TCL_LIB} ${SAVED_LIBS} -lm)
@@ -359,7 +359,7 @@
# include tcl.h, Xlib.h, Xutil.h before tk.h.
#-----------------------------------------------------------------------------
FOUND_TK_INC=0
-for i in $TK_INC/generic $TK_INC/include/tk8.0 $TK_INC/include $TK_INC
+for i in $TK_INC/generic $TK_INC/include/tk8.2 $TK_INC/include $TK_INC
do
AC_MSG_CHECKING(for $i/tk.h)
if test -r $i/tk.h ; then
@@ -391,7 +391,7 @@
SAVED_LIBS=$LIBS
LIBS=""
FOUND_TK_LIB=no
-AC_SEARCH_LIBS(Tk_Init, tk8.0 tk80,
+AC_SEARCH_LIBS(Tk_Init, tk8.2 tk82,
FOUND_TK_LIB=yes,
,
-L${TK_LIB} ${TCL_LIB} $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ${SAVED_LIBS} -lm)
@@ -464,20 +464,8 @@
COMMON_LIB=${COMMON_LIB}/lib
fi

View File

@ -7,7 +7,6 @@
PORTNAME= rat
PORTVERSION= 4.2.13
PORTREVISION= 0
CATEGORIES= mbone audio ipv6
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.2.13/ \
@ -23,8 +22,6 @@ USE_GMAKE= yes
MAN1= rat.1
MANCOMPRESSED= no
PATCH_DEBUG= yes
RAT_BUILD_DIRS= common rat
.include <bsd.port.pre.mk>
@ -42,12 +39,12 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/rat/sdr2.plugin.S02.audio.rtp.*.rat ${LOCALBASE}/etc/sdr/plugins
do-build:
for d in ${RAT_BUILD_DIRS}; do \
cd ${WRKSRC}/$$d && ${GMAKE}; \
done
.for d in ${RAT_BUILD_DIRS}
cd ${WRKSRC}/${d} && ${GMAKE}
.endfor
do-configure:
cd ${WRKSRC}/common && autoconf && ./configure ${ENABLE_IPv6}
cd ${WRKSRC}/rat && autoconf && ./configure --with-tcl=${LOCALBASE} --with-tk=${LOCALBASE} ${ENABLE_IPv6}
cd ${WRKSRC}/common && autoconf && ./configure ${CONFIGURE_ARGS} ${ENABLE_IPv6}
cd ${WRKSRC}/rat && autoconf && ./configure ${CONFIGURE_ARGS} --with-tcl=${LOCALBASE} --with-tk=${LOCALBASE} ${ENABLE_IPv6}
.include "bsd.port.post.mk"

View File

@ -1,5 +1,57 @@
--- ../../../work-pre-patch/rat-4.2.13/rat/configure.in Sun Mar 4 12:00:33 2001
+++ rat/configure.in Sun Mar 4 13:13:29 2001
--- rat/configure.in.orig Fri Mar 2 12:49:10 2001
+++ rat/configure.in Thu Apr 5 19:13:17 2001
@@ -280,12 +280,12 @@
# We could be dealing with a source installation or a full installation.
# Expect a source installation to have headers in TCL8_HOME/generic and libs in
# TCL8_HOME/unix. A full installation should have headers in
-# INSTDIR/include/tcl8.0, or INSTDIR/include, and have libraries be in
+# INSTDIR/include/tcl8.2, or INSTDIR/include, and have libraries be in
# INSTDIR/lib.
#------------------------------------------------------------------------------
PARENT=`echo $PWD | sed -e 's%/[[^/]]*$%%'`
-TCL_INC=${PARENT}/tcl-8.0
-TCL_LIB=${PARENT}/tcl-8.0
+TCL_INC=${PARENT}/tcl-8.2
+TCL_LIB=${PARENT}/tcl-8.2
AC_ARG_WITH(tcl,
[ --with-tcl=DIR specify location of Tcl installation],
@@ -295,7 +295,7 @@
#-----------------------------------------------------------------------------
# Depending on config expect tcl.h to be tcl source dir or include path
#-----------------------------------------------------------------------------
-for i in $TCL_INC/generic $TCL_INC/include/tcl8.0 $TCL_INC/include $TCL_INC
+for i in $TCL_INC/generic $TCL_INC/include/tcl8.2 $TCL_INC/include $TCL_INC
do
if test -d $i ; then
TCL_INC=$i
@@ -330,7 +330,7 @@
SAVED_LIBS=$LIBS
LIBS=""
FOUND_TCL_LIB=no
-AC_SEARCH_LIBS(Tcl_Init, tcl8.0 tcl80,
+AC_SEARCH_LIBS(Tcl_Init, tcl8.2 tcl82,
FOUND_TCL_LIB=yes,
,
-L${TCL_LIB} ${SAVED_LIBS} -lm)
@@ -359,7 +359,7 @@
# include tcl.h, Xlib.h, Xutil.h before tk.h.
#-----------------------------------------------------------------------------
FOUND_TK_INC=0
-for i in $TK_INC/generic $TK_INC/include/tk8.0 $TK_INC/include $TK_INC
+for i in $TK_INC/generic $TK_INC/include/tk8.2 $TK_INC/include $TK_INC
do
AC_MSG_CHECKING(for $i/tk.h)
if test -r $i/tk.h ; then
@@ -391,7 +391,7 @@
SAVED_LIBS=$LIBS
LIBS=""
FOUND_TK_LIB=no
-AC_SEARCH_LIBS(Tk_Init, tk8.0 tk80,
+AC_SEARCH_LIBS(Tk_Init, tk8.2 tk82,
FOUND_TK_LIB=yes,
,
-L${TK_LIB} ${TCL_LIB} $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ${SAVED_LIBS} -lm)
@@ -464,20 +464,8 @@
COMMON_LIB=${COMMON_LIB}/lib
fi