Date: Thu, 21 Sep 2000 10:27:40 +0100 (BST) From: Orion Hodson <oh@btinternet.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/21445: Update for ports/mbone/rat to enable IPv6 Message-ID: <200009210927.KAA05155@adelie.btinternet.com>
next in thread | raw e-mail | index | archive | help
>Number: 21445 >Category: ports >Synopsis: Patch to enable IPv6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Sep 21 02:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Orion Hodson >Release: FreeBSD 4.1-RELEASE i386 >Organization: >Environment: >Description: Shirasaki Yashiro <yasuhiro@v6.ntt.net> supplied the patch below to enable IPv6 support. It works fine and we should definitely have it. >How-To-Repeat: >Fix: cd ports/mbone/rat; then apply the patch below. Thanks, Orion --- Makefile.orig Tue Sep 19 13:42:22 2000 +++ Makefile Thu Sep 21 10:36:18 2000 @@ -7,7 +7,7 @@ PORTNAME= rat PORTVERSION= 4.2.9 -CATEGORIES= mbone audio +CATEGORIES= mbone audio ipv6 MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.2.9/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= cpiazza @@ -25,6 +25,12 @@ RAT_BUILD_DIRS= common rat +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 400014 +ENABLE_IPv6= --enable-ipv6 +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rat/rat ${PREFIX}/bin/rat ${INSTALL_PROGRAM} ${WRKSRC}/rat/rat-ui ${PREFIX}/bin/rat-ui @@ -39,7 +45,7 @@ done do-configure: - cd ${WRKSRC}/common && ./configure - cd ${WRKSRC}/rat && autoconf && ./configure --with-tcl=${LOCALBASE} --with-tk=${LOCALBASE} + cd ${WRKSRC}/common && autoconf && ./configure ${ENABLE_IPv6} + cd ${WRKSRC}/rat && autoconf && ./configure --with-tcl=${LOCALBASE} --with-tk=${LOCALBASE} ${ENABLE_IPv6} -.include "bsd.port.mk" +.include "bsd.port.post.mk" --- patches/patch-aa Tue Sep 19 13:42:22 2000 +++ patches/patch-aa Thu Sep 21 10:34:39 2000 @@ -919,29 +919,23 @@ /* GSM related */ #undef SASR -diff -uPr rat/configure.in /home/oh/src/rat-newpcm/rat/configure.in ---- rat/configure.in Fri Sep 8 21:03:02 2000 -+++ /home/oh/src/rat-newpcm/rat/configure.in Sat Sep 16 20:34:08 2000 -@@ -1,5 +1,5 @@ - dnl UCL RAT configure script. --dnl $Header: /cs/research/mice/starship/src/local/CVS_repository/rat/configure.in,v 1.38 2000/03/23 10:00:53 ucacoxh Exp $ -+dnl $Header: /cs/research/mice/starship/src/local/CVS_repository/rat/configure.in,v 1.39 2000/09/16 17:43:25 ucacoxh Exp $ - dnl - dnl Process this file with GNU autoconf to generate a configure script. - -@@ -195,9 +195,12 @@ - AU_OBJ="$AU_OBJ auddev_pca.o" - AC_DEFINE(HAVE_PCA_AUDIO) - fi -- # Luigi's driver -- AU_OBJ="$AU_OBJ auddev_luigi.o" -- AC_DEFINE(HAVE_LUIGI_AUDIO) -+ # Note luigi and newpcm have compatible soundcard.h files but -+ # mixer behaves differently under both systems. During runtime -+ # only one of these modules will be used. -+ AU_OBJ="$AU_OBJ auddev_luigi.o auddev_newpcm.o" -+ AC_DEFINE(HAVE_LUIGI_AUDIO) -+ AC_DEFINE(HAVE_NEWPCM_AUDIO) - ;; - *netbsd*) - AU_OBJ="$AUDIOBJ auddev_netbsd.o" +diff -uPr common/configure.in /home/oh/src/rat-newpcm/common/configure.in +--- common/configure.in Sat Sep 9 05:02:27 2000 ++++ /home/oh/src/rat-newpcm/common/configure.in Thu Sep 21 10:15:12 2000 +@@ -179,7 +179,7 @@ + AC_DEFINE(HAVE_IPv6) + case "$host_os" in + # FreeBSD Kame uses seperate libinet6 +- freebsd*) ++ freebsd[23]*) + LIBS="$LIBS -L/usr/local/v6/lib -linet6" + ;; + *) ;; +@@ -216,6 +216,7 @@ + #ifdef HAVE_NETINET6_IN6_H + #include <netinet6/in6.h> + #else ++ #include <sys/types.h> + #include <netinet/in.h> + #endif /* HAVE_NETINET_IN6_H */ + ],[ --- patches/patch-ac Tue Sep 19 13:42:22 2000 +++ patches/patch-ac Thu Sep 21 10:51:59 2000 @@ -1,6 +1,29 @@ ---- rat/configure.in.pre Sun Sep 17 02:34:18 2000 -+++ rat/configure.in Sun Sep 17 02:36:23 2000 -@@ -280,12 +280,12 @@ +--- rat/configure.in.orig Thu Sep 21 10:50:51 2000 ++++ rat/configure.in Thu Sep 21 10:51:20 2000 +@@ -1,5 +1,5 @@ + dnl UCL RAT configure script. +-dnl $Header: /cs/research/mice/starship/src/local/CVS_repository/rat/configure.in,v 1.38 2000/03/23 10:00:53 ucacoxh Exp $ ++dnl $Header: /cs/research/mice/starship/src/local/CVS_repository/rat/configure.in,v 1.39 2000/09/16 17:43:25 ucacoxh Exp $ + dnl + dnl Process this file with GNU autoconf to generate a configure script. + +@@ -195,9 +195,12 @@ + AU_OBJ="$AU_OBJ auddev_pca.o" + AC_DEFINE(HAVE_PCA_AUDIO) + fi +- # Luigi's driver +- AU_OBJ="$AU_OBJ auddev_luigi.o" +- AC_DEFINE(HAVE_LUIGI_AUDIO) ++ # Note luigi and newpcm have compatible soundcard.h files but ++ # mixer behaves differently under both systems. During runtime ++ # only one of these modules will be used. ++ AU_OBJ="$AU_OBJ auddev_luigi.o auddev_newpcm.o" ++ AC_DEFINE(HAVE_LUIGI_AUDIO) ++ AC_DEFINE(HAVE_NEWPCM_AUDIO) + ;; + *netbsd*) + AU_OBJ="$AUDIOBJ auddev_netbsd.o" +@@ -277,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 @@ -16,7 +39,7 @@ AC_ARG_WITH(tcl, [ --with-tcl=DIR specify location of Tcl installation], -@@ -295,7 +295,7 @@ +@@ -292,7 +295,7 @@ #----------------------------------------------------------------------------- # Depending on config expect tcl.h to be tcl source dir or include path #----------------------------------------------------------------------------- @@ -25,7 +48,7 @@ do if test -d $i ; then TCL_INC=$i -@@ -330,7 +330,7 @@ +@@ -327,7 +330,7 @@ SAVED_LIBS=$LIBS LIBS="" FOUND_TCL_LIB=no @@ -34,7 +57,7 @@ FOUND_TCL_LIB=yes, , -L${TCL_LIB} ${SAVED_LIBS} -lm) -@@ -346,8 +346,8 @@ +@@ -343,8 +346,8 @@ exit fi @@ -45,7 +68,7 @@ AC_ARG_WITH(tk, [ --with-tk=DIR specify location of Tk installation], -@@ -359,7 +359,7 @@ +@@ -356,7 +359,7 @@ # include tcl.h, Xlib.h, Xutil.h before tk.h. #----------------------------------------------------------------------------- FOUND_TK_INC=0 @@ -54,7 +77,7 @@ do AC_MSG_CHECKING(for $i/tk.h) if test -r $i/tk.h ; then -@@ -391,7 +391,7 @@ +@@ -388,7 +391,7 @@ SAVED_LIBS=$LIBS LIBS="" FOUND_TK_LIB=no @@ -63,7 +86,16 @@ FOUND_TK_LIB=yes, , -L${TK_LIB} ${TCL_LIB} $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ${SAVED_LIBS} -lm) -@@ -466,20 +466,8 @@ +@@ -419,7 +422,7 @@ + AC_DEFINE(HAVE_IPv6) + case "$host_os" in + # FreeBSD Kame uses seperate libinet6 +- freebsd*) ++ freebsd[23]*) + LIBS="$LIBS -L/usr/local/v6/lib -linet6" + ;; + *) ;; +@@ -463,20 +466,8 @@ COMMON_LIB=${COMMON_LIB}/lib fi >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200009210927.KAA05155>