Subject: pkg/18470: H.323 dissector plugin support for net/ethereal
To: None <gnats-bugs@gnats.netbsd.org>
From: None <svs+pr@grep.ru>
List: netbsd-bugs
Date: 09/29/2002 11:43:21
>Number: 18470
>Category: pkg
>Synopsis: H.323 dissector plugin support for net/ethereal
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Sep 29 11:44:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Sergey Svishchev
>Release: 1.6G
>Organization:
>Environment:
>Description:
There is a H.323 dissector plugin for ethereal -- http://www.voice2sniff.org/. However, it does not build from distributed source on anything but Win32. Fortunately, someone already taken care of this -- see http://sourceforge.net/tracker/index.php?func=detail&aid=535175&group_id=49311&atid=455778
>How-To-Repeat:
Try to interwork a Cisco ATA186 and a NSG NSGate 3804 (a.k.a. Welltech Wellgate 3804). Find it difficult without a protocol analyzer. Bang your head against tabletop repeatedly.
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/ethereal/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- Makefile 2002/09/24 00:13:13 1.65
+++ Makefile 2002/09/29 10:41:30
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.65 2002/09/24 00:13:13 jlam Exp $
DISTNAME= ethereal-0.9.6
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.ethereal.com/pub/ethereal/ \
ftp://ftp.sunet.se/pub/network/monitoring/ethereal/
@@ -22,6 +23,28 @@
CONFIGURE_ARGS+= --with-ucdsnmp=${BUILDLINK_PREFIX.ucd-snmp}
CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap}
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${ETHEREAL_PLUGIN_H323} == "YES"
+# see http://sourceforge.net/tracker/index.php?func=detail&aid=535175&group_id=49311&atid=455778
+MASTER_SITES+= http://pws.prserv.net/atinet.HromadkaJ/ethereal/
+H323DIST= ethereal-093-h323-plugin-src-Linux-003b.tgz
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${H323DIST}
+
+DEPENDS+= automake>=1.4:../../devel/automake
+PLIST_SRC+= PLIST.h323
+
+LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -Wl,-lgcc -Wl,--no-whole-archive
+MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
+
+post-extract:
+ (cd ${WRKSRC} && ${GTAR} -xzf ${_DISTDIR}/${H323DIST})
+
+pre-configure:
+ -(cd ${WRKSRC} && automake plugins/h323/Makefile \
+ plugins/h323/mini_ptlib/src/Makefile)
+.endif
.include "../../devel/zlib/buildlink2.mk"
.include "../../net/libpcap/buildlink2.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/ethereal/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 2002/08/22 00:30:07 1.13
+++ distinfo 2002/09/29 10:41:30
@@ -2,3 +2,13 @@
SHA1 (ethereal-0.9.6.tar.gz) = 00d1cbfc19cdb6259afcb36f493a7174d9d73367
Size (ethereal-0.9.6.tar.gz) = 3647226 bytes
+SHA1 (ethereal-093-h323-plugin-src-Linux-003b.tgz) = d6601464f8a4031ac3e74f86a45934901a77fc40
+Size (ethereal-093-h323-plugin-src-Linux-003b.tgz) = 738060 bytes
+SHA1 (patch-aa) = 39dd0903d3a00cb9948d6061b5c39d4fc2f70652
+SHA1 (patch-ab) = 047dac1d2d29f898b1dc8fd40090f2395d4512a2
+SHA1 (patch-ac) = 393a07943aac2da51ec28cc8a32fc23da2665867
+SHA1 (patch-ad) = 5e667433cead71304a770c55fca156974b99b00c
+SHA1 (patch-ae) = 49750f3c8e377a3974bb9c72159c4fe2e99f6029
+SHA1 (patch-af) = 01ad0d0de9c89fe3c3811c71133635047968d929
+SHA1 (patch-ag) = dd347e61a51c7a45d68ed35a8afbf0873e7b9d3a
+SHA1 (patch-ai) = 8127f9934bffb15a5a0d505d0642619e5631efdd
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# PLIST.h323
# patches/patch-aa
# patches/patch-ab
# patches/patch-ac
# patches/patch-ad
# patches/patch-ae
# patches/patch-af
# patches/patch-ag
# patches/patch-ai
#
echo x - PLIST.h323
sed 's/^X//' >PLIST.h323 << 'END-of-PLIST.h323'
Xlib/ethereal/plugins/${PKGVERSION}/h323.a
Xlib/ethereal/plugins/${PKGVERSION}/h323.la
Xlib/ethereal/plugins/${PKGVERSION}/h323.so
END-of-PLIST.h323
echo x - patches/patch-aa
sed 's/^X//' >patches/patch-aa << 'END-of-patches/patch-aa'
X$NetBSD$
X
X+++ Makefile.in
X@@ -85,6 +85,7 @@ host_triplet = @host@
X AS = @AS@
X CC = @CC@
X CPP = @CPP@
X+CXX = @CXX@
X DATAFILE_DIR = @DATAFILE_DIR@
X DLLTOOL = @DLLTOOL@
X ECHO = @ECHO@
X@@ -497,7 +498,27 @@ DISSECTOR_SRC = \
X @HAVE_PLUGINS_TRUE@ plugins/giop/packet-cosnaming.c \
X @HAVE_PLUGINS_TRUE@ plugins/giop/packet-coseventcomm.c \
X @HAVE_PLUGINS_TRUE@ plugins/gryphon/packet-gryphon.c \
X-@HAVE_PLUGINS_TRUE@ plugins/mgcp/packet-mgcp.c
X+@HAVE_PLUGINS_TRUE@ plugins/mgcp/packet-mgcp.c \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h225_container.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h225_container0.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h225_container1.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/packet-h225.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h235_container.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h235_container0.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h225.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h235.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h245_container.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h245_container0.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h245_container1.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h245_container2.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h245_container3.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/packet-h245.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h245.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h450_container.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h450_container0.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h450_container1.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/packet-h450.cxx \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h450.cxx
X @HAVE_PLUGINS_FALSE@plugin_src =
X
X @HAVE_PLUGINS_TRUE@plugin_static_ldadd = @HAVE_PLUGINS_TRUE@\
X@@ -535,7 +556,8 @@ DISSECTOR_SRC = \
X @HAVE_PLUGINS_TRUE@ plugins/giop/cosnaming.la \
X @HAVE_PLUGINS_TRUE@ plugins/giop/coseventcomm.la \
X @HAVE_PLUGINS_TRUE@ plugins/gryphon/gryphon.la \
X-@HAVE_PLUGINS_TRUE@ plugins/mgcp/mgcp.la
X+@HAVE_PLUGINS_TRUE@ plugins/mgcp/mgcp.la \
X+@HAVE_PLUGINS_TRUE@ plugins/h323/h323.la
X @HAVE_PLUGINS_FALSE@plugin_libs =
X
X @HAVE_PLUGINS_TRUE@plugin_ldadd = @HAVE_PLUGINS_TRUE@\
X@@ -544,7 +566,8 @@ DISSECTOR_SRC = \
X @HAVE_PLUGINS_TRUE@ "-dlopen" plugins/giop/cosnaming.la \
X @HAVE_PLUGINS_TRUE@ "-dlopen" plugins/giop/coseventcomm.la \
X @HAVE_PLUGINS_TRUE@ "-dlopen" plugins/gryphon/gryphon.la \
X-@HAVE_PLUGINS_TRUE@ "-dlopen" plugins/mgcp/mgcp.la
X+@HAVE_PLUGINS_TRUE@ "-dlopen" plugins/mgcp/mgcp.la \
X+@HAVE_PLUGINS_TRUE@ "-dlopen" plugins/h323/h323.la
X @HAVE_PLUGINS_FALSE@plugin_ldadd =
X
X noinst_HEADERS = \
X@@ -843,7 +866,7 @@ ethereal_static_LDADD = \
X @PCAP_LIBS@ @GTK_LIBS@
X
X
X-ethereal_LDFLAGS = -export-dynamic
X+ethereal_LDFLAGS = -export-dynamic $(LINK_LIBGCC_LDFLAGS)
X ethereal_static_LDFLAGS = -Wl,-static
X
X tethereal_SOURCES = \
X@@ -902,7 +925,7 @@ tethereal_static_LDADD = \
X @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
X
X
X-tethereal_LDFLAGS = -export-dynamic
X+tethereal_LDFLAGS = -export-dynamic $(LINK_LIBGCC_LDFLAGS)
X tethereal_static_LDFLAGS = -Wl,-static
X
X # Optional objects that I know how to build, and that are needed by
X@@ -965,7 +988,7 @@ dftest_LDADD = \
X @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
X
X
X-dftest_LDFLAGS = -export-dynamic
X+dftest_LDFLAGS = -export-dynamic $(LINK_LIBGCC_LDFLAGS)
X
X CLEANFILES = \
X idl2eth
END-of-patches/patch-aa
echo x - patches/patch-ab
sed 's/^X//' >patches/patch-ab << 'END-of-patches/patch-ab'
X$NetBSD$
X
X+++ Makefile.am
X@@ -367,7 +367,28 @@ plugin_src = \
X plugins/giop/packet-cosnaming.c \
X plugins/giop/packet-coseventcomm.c \
X plugins/gryphon/packet-gryphon.c \
X- plugins/mgcp/packet-mgcp.c
X+ plugins/mgcp/packet-mgcp.c \
X+ plugins/h323/h225_container.cxx \
X+ plugins/h323/h225_container0.cxx \
X+ plugins/h323/h225_container1.cxx \
X+ plugins/h323/packet-h225.cxx \
X+ plugins/h323/h235_container.cxx \
X+ plugins/h323/h235_container0.cxx \
X+ plugins/h323/h225.cxx \
X+ plugins/h323/h235.cxx \
X+ plugins/h323/h245_container.cxx \
X+ plugins/h323/h245_container0.cxx \
X+ plugins/h323/h245_container1.cxx \
X+ plugins/h323/h245_container2.cxx \
X+ plugins/h323/h245_container3.cxx \
X+ plugins/h323/packet-h245.cxx \
X+ plugins/h323/h245.cxx \
X+ plugins/h323/h450_container.cxx \
X+ plugins/h323/h450_container0.cxx \
X+ plugins/h323/h450_container1.cxx \
X+ plugins/h323/packet-h450.cxx \
X+ plugins/h323/h450.cxx
X+
X
X
X plugin_static_ldadd = \
X@@ -404,7 +425,8 @@ plugin_libs = \
X plugins/giop/cosnaming.la \
X plugins/giop/coseventcomm.la \
X plugins/gryphon/gryphon.la \
X- plugins/mgcp/mgcp.la
X+ plugins/mgcp/mgcp.la \
X+ plugins/h323/h323.la
X
X plugin_ldadd = \
X "-dlopen" self \
X@@ -412,7 +434,8 @@ plugin_ldadd = \
X "-dlopen" plugins/giop/cosnaming.la \
X "-dlopen" plugins/giop/coseventcomm.la \
X "-dlopen" plugins/gryphon/gryphon.la \
X- "-dlopen" plugins/mgcp/mgcp.la
X+ "-dlopen" plugins/mgcp/mgcp.la \
X+ "-dlopen" plugins/h323/h323.la
X else
X plugin_src =
X
X@@ -707,7 +730,7 @@ ethereal_static_LDADD = \
X @SNMP_LIBS@ @SSL_LIBS@ \
X @PCAP_LIBS@ @GTK_LIBS@
X
X-ethereal_LDFLAGS = -export-dynamic
X+ethereal_LDFLAGS = -export-dynamic $(LINK_LIBGCC_LDFLAGS)
X ethereal_static_LDFLAGS = -Wl,-static
X
X tethereal_SOURCES = \
X@@ -759,7 +782,7 @@ tethereal_static_LDADD = \
X @GLIB_LIBS@ -lm \
X @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
X
X-tethereal_LDFLAGS = -export-dynamic
X+tethereal_LDFLAGS = -export-dynamic $(LINK_LIBGCC_LDFLAGS)
X tethereal_static_LDFLAGS = -Wl,-static
X
X # Optional objects that I know how to build, and that are needed by
X@@ -872,7 +895,7 @@ dftest_LDADD = \
X @GLIB_LIBS@ -lm \
X @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
X
X-dftest_LDFLAGS = -export-dynamic
X+dftest_LDFLAGS = -export-dynamic $(LINK_LIBGCC_LDFLAGS)
X
X CLEANFILES = \
X idl2eth
END-of-patches/patch-ab
echo x - patches/patch-ac
sed 's/^X//' >patches/patch-ac << 'END-of-patches/patch-ac'
X$NetBSD$
X
X+++ configure.in
X@@ -21,6 +21,7 @@ AC_CANONICAL_HOST
X dnl Checks for programs.
X AC_PROG_CC
X AC_PROG_CPP
X+AC_PROG_CXX
X AC_LIBTOOL_DLOPEN
X AC_PROG_LIBTOOL
X AC_PROG_YACC
X@@ -697,6 +698,8 @@ AC_OUTPUT(
X plugins/giop/Makefile
X plugins/gryphon/Makefile
X plugins/mgcp/Makefile
X+ plugins/h323/mini_ptlib/src/Makefile
X+ plugins/h323/Makefile
X tools/Makefile
X tools/lemon/Makefile
X ,)
END-of-patches/patch-ac
echo x - patches/patch-ad
sed 's/^X//' >patches/patch-ad << 'END-of-patches/patch-ad'
X$NetBSD$
X
X+++ configure Fri Sep 27 17:13:53 2002
X@@ -1328,6 +1328,149 @@
X fi
X echo "$ac_t""$CPP" 1>&6
X
X+for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
X+do
X+# Extract the first word of "$ac_prog", so it can be a program name with args.
X+set dummy $ac_prog; ac_word=$2
X+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
X+echo "configure:1337: checking for $ac_word" >&5
X+if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
X+ echo $ac_n "(cached) $ac_c" 1>&6
X+else
X+ if test -n "$CXX"; then
X+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
X+else
X+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
X+ ac_dummy="$PATH"
X+ for ac_dir in $ac_dummy; do
X+ test -z "$ac_dir" && ac_dir=.
X+ if test -f $ac_dir/$ac_word; then
X+ ac_cv_prog_CXX="$ac_prog"
X+ break
X+ fi
X+ done
X+ IFS="$ac_save_ifs"
X+fi
X+fi
X+CXX="$ac_cv_prog_CXX"
X+if test -n "$CXX"; then
X+ echo "$ac_t""$CXX" 1>&6
X+else
X+ echo "$ac_t""no" 1>&6
X+fi
X+
X+test -n "$CXX" && break
X+done
X+test -n "$CXX" || CXX="gcc"
X+
X+
X+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
X+echo "configure:1369: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
X+
X+ac_ext=C
X+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
X+ac_cpp='$CXXCPP $CPPFLAGS'
X+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
X+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
X+cross_compiling=$ac_cv_prog_cxx_cross
X+
X+cat > conftest.$ac_ext << EOF
X+
X+#line 1380 "configure"
X+#include "confdefs.h"
X+
X+int main(){return(0);}
X+EOF
X+if { (eval echo configure:1385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
X+ ac_cv_prog_cxx_works=yes
X+ # If we can't run a trivial program, we are probably using a cross compiler.
X+ if (./conftest; exit) 2>/dev/null; then
X+ ac_cv_prog_cxx_cross=no
X+ else
X+ ac_cv_prog_cxx_cross=yes
X+ fi
X+else
X+ echo "configure: failed program was:" >&5
X+ cat conftest.$ac_ext >&5
X+ ac_cv_prog_cxx_works=no
X+fi
X+rm -fr conftest*
X+ac_ext=c
X+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
X+ac_cpp='$CPP $CPPFLAGS'
X+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
X+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
X+cross_compiling=$ac_cv_prog_cc_cross
X+
X+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
X+if test $ac_cv_prog_cxx_works = no; then
X+ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
X+fi
X+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
X+echo "configure:1411: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
X+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
X+cross_compiling=$ac_cv_prog_cxx_cross
X+
X+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
X+echo "configure:1416: checking whether we are using GNU C++" >&5
X+if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
X+ echo $ac_n "(cached) $ac_c" 1>&6
X+else
X+ cat > conftest.C <<EOF
X+#ifdef __GNUC__
X+ yes;
X+#endif
X+EOF
X+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
X+ ac_cv_prog_gxx=yes
X+else
X+ ac_cv_prog_gxx=no
X+fi
X+fi
X+
X+echo "$ac_t""$ac_cv_prog_gxx" 1>&6
X+
X+if test $ac_cv_prog_gxx = yes; then
X+ GXX=yes
X+else
X+ GXX=
X+fi
X+
X+ac_test_CXXFLAGS="${CXXFLAGS+set}"
X+ac_save_CXXFLAGS="$CXXFLAGS"
X+CXXFLAGS=
X+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
X+echo "configure:1444: checking whether ${CXX-g++} accepts -g" >&5
X+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
X+ echo $ac_n "(cached) $ac_c" 1>&6
X+else
X+ echo 'void f(){}' > conftest.cc
X+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
X+ ac_cv_prog_cxx_g=yes
X+else
X+ ac_cv_prog_cxx_g=no
X+fi
X+rm -f conftest*
X+
X+fi
X+
X+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
X+if test "$ac_test_CXXFLAGS" = set; then
X+ CXXFLAGS="$ac_save_CXXFLAGS"
X+elif test $ac_cv_prog_cxx_g = yes; then
X+ if test "$GXX" = yes; then
X+ CXXFLAGS="-g -O2"
X+ else
X+ CXXFLAGS="-g"
X+ fi
X+else
X+ if test "$GXX" = yes; then
X+ CXXFLAGS="-O2"
X+ else
X+ CXXFLAGS=
X+ fi
X+fi
X+
X
X # Find the correct PATH separator. Usually this is `:', but
X # DJGPP uses `;' like DOS.
X@@ -9551,6 +9694,8 @@
X plugins/giop/Makefile
X plugins/gryphon/Makefile
X plugins/mgcp/Makefile
X+ plugins/h323/mini_ptlib/src/Makefile
X+ plugins/h323/Makefile
X tools/Makefile
X tools/lemon/Makefile
X config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
X@@ -9603,6 +9747,7 @@
X s%@host_os@%$host_os%g
X s%@CC@%$CC%g
X s%@CPP@%$CPP%g
X+s%@CXX@%$CXX%g
X s%@build@%$build%g
X s%@build_alias@%$build_alias%g
X s%@build_cpu@%$build_cpu%g
X@@ -9732,6 +9877,8 @@
X plugins/giop/Makefile
X plugins/gryphon/Makefile
X plugins/mgcp/Makefile
X+ plugins/h323/mini_ptlib/src/Makefile
X+ plugins/h323/Makefile
X tools/Makefile
X tools/lemon/Makefile
X "}
END-of-patches/patch-ad
echo x - patches/patch-ae
sed 's/^X//' >patches/patch-ae << 'END-of-patches/patch-ae'
X$NetBSD$
X
X+++ plugins/Makefile.am
X@@ -21,7 +21,7 @@
X # along with this program; if not, write to the Free Software
X # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
X
X-SUBDIRS = docsis giop gryphon mgcp
X+SUBDIRS = docsis giop gryphon mgcp h323/mini_ptlib/src h323
X
X plugindir = @plugindir@
X
END-of-patches/patch-ae
echo x - patches/patch-af
sed 's/^X//' >patches/patch-af << 'END-of-patches/patch-af'
X$NetBSD$
X
X+++ plugins/Makefile.in
X@@ -85,6 +85,7 @@
X AS = @AS@
X CC = @CC@
X CPP = @CPP@
X+CXX = @CXX@
X DATAFILE_DIR = @DATAFILE_DIR@
X DLLTOOL = @DLLTOOL@
X ECHO = @ECHO@
X@@ -150,7 +151,7 @@
X text2pcap_bin = @text2pcap_bin@
X text2pcap_man = @text2pcap_man@
X
X-SUBDIRS = docsis giop gryphon mgcp
X+SUBDIRS = docsis giop gryphon mgcp h323/mini_ptlib/src h323
X
X plugindir = @plugindir@
X
END-of-patches/patch-af
echo x - patches/patch-ag
sed 's/^X//' >patches/patch-ag << 'END-of-patches/patch-ag'
X$NetBSD$
X
X+++ plugins/h323/Makefile.am
X@@ -23,7 +23,7 @@
X # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
X #
X
X-INCLUDES = -I$(top_srcdir) -I$(includedir) -I/usr/include/glib-1.2 -I./mini_ptlib/include -DUSE_FOR_ETHEREAL -DH323 -DMINI_PTLIB
X+INCLUDES = -I$(top_srcdir) -I$(includedir) $(GLIB_CFLAGS) -I./mini_ptlib/include -DUSE_FOR_ETHEREAL -DH323 -DMINI_PTLIB
X
X plugindir = @PLUGIN_DIR@
X
END-of-patches/patch-ag
echo x - patches/patch-ai
sed 's/^X//' >patches/patch-ai << 'END-of-patches/patch-ai'
X$NetBSD$
X
X+++ plugins/h323/mini_ptlib/src/Makefile.am
X@@ -25,7 +25,7 @@
X
X ACLOCAL_AMFLAGS = `../aclocal-flags`
X
X-INCLUDES = $(all_includes) -I/usr/include/glib-1.2 -I../.. -I../../../.. -DMINI_PTLIB -DHAVE_SYS_TIME_H -DUSE_FOR_ETHEREAL
X+INCLUDES = $(all_includes) $(GLIB_CFLAGS) -I../.. -I../../../.. -DMINI_PTLIB -DHAVE_SYS_TIME_H -DUSE_FOR_ETHEREAL
X
X #LDFLAGS = -shared -Wl,-soname,
X # gcc -shared -Wl,-soname,$(LIB_BASENAME).1 -o $(LIBDIR)/$(LIBNAME_PAT) $(OBJS)
END-of-patches/patch-ai
exit
>Release-Note:
>Audit-Trail:
>Unformatted: