diff options
Diffstat (limited to 'mbone')
-rw-r--r-- | mbone/Makefile | 17 | ||||
-rw-r--r-- | mbone/sdr/Makefile | 12 | ||||
-rw-r--r-- | mbone/sdr/files/Makefile.netbsd | 15 | ||||
-rw-r--r-- | mbone/sdr/files/Makefile.work | 2 | ||||
-rw-r--r-- | mbone/sdr/patches/patch-aa | 133 | ||||
-rw-r--r-- | mbone/sdr/patches/patch-ab | 41 | ||||
-rw-r--r-- | mbone/sdr/patches/patch-ac | 40 | ||||
-rw-r--r-- | mbone/sdr/patches/patch-ad | 19 | ||||
-rw-r--r-- | mbone/sdr/patches/patch-ae | 19 | ||||
-rw-r--r-- | mbone/sdr/pkg/PLIST | 1 | ||||
-rw-r--r-- | mbone/sdr/scripts/configure | 3 |
11 files changed, 189 insertions, 113 deletions
diff --git a/mbone/Makefile b/mbone/Makefile index 579be64e8f5..5cd4de4472b 100644 --- a/mbone/Makefile +++ b/mbone/Makefile @@ -1,14 +1,15 @@ +# $NetBSD: Makefile,v 1.2 1997/11/18 17:21:25 is Exp $ # Id: Makefile,v 1.5 1996/12/03 10:41:49 asami Exp # - SUBDIR += imm - SUBDIR += mbone_vcr - SUBDIR += nte - SUBDIR += rtpmon +# SUBDIR += imm +# SUBDIR += mbone_vcr +# SUBDIR += nte +# SUBDIR += rtpmon SUBDIR += sdr - SUBDIR += speak_freely - SUBDIR += vat - SUBDIR += vic - SUBDIR += wb +# SUBDIR += speak_freely +# SUBDIR += vat +# SUBDIR += vic +# SUBDIR += wb .include <bsd.port.subdir.mk> diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile index 7c4fb48fcdc..e6806be676d 100644 --- a/mbone/sdr/Makefile +++ b/mbone/sdr/Makefile @@ -1,9 +1,17 @@ +# $NetBSD: Makefile,v 1.2 1997/11/18 17:21:26 is Exp $ +# +# Packages collection makefile for: sdr +# Version required: 2.3a1 +# Date created: 18 November 1997 +# By: Ignatios Souvatzis <is@netbsd.org> +# +# Based on: # New ports collection makefile for: sdr # Version required: 2.3a1 # Date created: 5 September 1996 # Whom: Bill Fenner <fenner@FreeBSD.ORG> # -# Id: Makefile,v 1.6 1997/10/15 20:35:20 fenner Exp +# Id: Makefile,v 1.6 1997/10/15 20:35:20 fenner Exp # DISTNAME= sdr.V2.3a1 @@ -11,7 +19,7 @@ PKGNAME= sdr-2.3a1 CATEGORIES= mbone tk80 MASTER_SITES= ftp://cs.ucl.ac.uk/mice/sdr/ -MAINTAINER= fenner@FreeBSD.org +MAINTAINER= is@netbsd.org LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80 diff --git a/mbone/sdr/files/Makefile.netbsd b/mbone/sdr/files/Makefile.netbsd new file mode 100644 index 00000000000..3cb29fcf93c --- /dev/null +++ b/mbone/sdr/files/Makefile.netbsd @@ -0,0 +1,15 @@ +CC=cc +INCLUDES=-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tcl8.0 -I${X11BASE}/include +LIB_DIR=${LOCALBASE}/lib +LIBS=-L${LIB_DIR} -ltk80 -ltcl80 -lm -L${X11BASE}/lib -lX11 +CFLAGS+=-ggdb $(INCLUDES) -DNORANDPROTO -DUSE_PERROR -Werror +LIBRARY_TCL = ${LIB_DIR}/tcl8.0 +LIBRARY_TK = ${LIB_DIR}/tk8.0 + +all: sdr + +install: sdr + install -c -s -m 555 -o bin -g bin sdr ${PREFIX}/bin + +clean: + rm *.o *.tcl *.ehtml tcl2c diff --git a/mbone/sdr/files/Makefile.work b/mbone/sdr/files/Makefile.work index 6b6d1019205..c40e0ee3260 100644 --- a/mbone/sdr/files/Makefile.work +++ b/mbone/sdr/files/Makefile.work @@ -1,2 +1,2 @@ all install clean: - cd freebsd; $(MAKE) $@ + cd netbsd; $(MAKE) $@ diff --git a/mbone/sdr/patches/patch-aa b/mbone/sdr/patches/patch-aa index b972507313e..add248cf4c7 100644 --- a/mbone/sdr/patches/patch-aa +++ b/mbone/sdr/patches/patch-aa @@ -1,12 +1,121 @@ -*** src/sdr.h.orig Thu Sep 5 14:28:29 1996 ---- src/sdr.h Thu Sep 5 14:28:35 1996 -*************** -*** 21,27 **** - #endif - #include <tcl.h> - #include <tk.h> -- #include <malloc.h> - #include <string.h> - #include <fcntl.h> - #include <errno.h> ---- 21,26 ---- +diff -ru ../original/src/Makefile.template ./src/Makefile.template +--- ../original/src/Makefile.template Tue Oct 1 16:53:30 1996 ++++ ./src/Makefile.template Tue Nov 18 15:06:29 1997 +@@ -97,7 +97,7 @@ + $(SDR_UI_FILES): tcl2c + + parsed_plugins.tcl: ../src/plugin2tcl.tcl +- tclsh7.5 ../src/plugin2tcl.tcl ++ tclsh8.0 ../src/plugin2tcl.tcl + + libs.tcl: $(TK_LIBRARY_FILES) + cat $(TK_LIBRARY_FILES) | sed '/^[ ]*source[ ]/d' > libs.tcl +diff -ru ../original/src/iohandler.c ./src/iohandler.c +--- ../original/src/iohandler.c Tue Oct 29 15:52:25 1996 ++++ ./src/iohandler.c Tue Nov 18 15:06:30 1997 +@@ -131,7 +131,7 @@ + } + sockproc[fd] = callback; + #else +- Tcl_CreateFileHandler(Tcl_GetFile((ClientData)fd, TCL_UNIX_FD), ++ Tcl_CreateFileHandler(fd, + mask, callback, (ClientData)fd); + #endif + } +@@ -144,6 +144,6 @@ + (void) WSAAsyncSelect(fd, sockwin, 0, 0); + } + #else +- Tcl_DeleteFileHandler(Tcl_GetFile((ClientData)fd, TCL_UNIX_FD)); ++ Tcl_DeleteFileHandler(fd); + #endif + } +diff -ru ../original/src/qfdes/qfDES-memory.c ./src/qfdes/qfDES-memory.c +--- ../original/src/qfdes/qfDES-memory.c Fri Sep 27 17:23:28 1996 ++++ ./src/qfdes/qfDES-memory.c Tue Nov 18 16:50:44 1997 +@@ -12,23 +12,34 @@ + + #include <stdio.h> + #include <memory.h> +-#include <malloc.h> ++#include <stdlib.h> + #include <ctype.h> + #include "qfDES.h" + ++#if defined(USE_PERROR) ++#include <errno.h> ++#else + #ifndef DEFINED_ERRLIST + extern int sys_nerr; + extern char *sys_errlist[]; + #endif + extern int errno; ++#endif + +- ++#if defined(USE_PERROR) ++#if defined(DEBUG) ++#define ERROR(s_) perror(s_ ", file " __FILE__ ", line " __LINE__) ++#else ++#define ERROR(s_) perror(s_) ++#endif ++#else + #if defined(DEBUG) + #define ERROR(s_) \ + fprintf(stderr, "%s: errno %d - %s [%s line %d]\n", s_, errno, errno < sys_nerr ? sys_errlist[errno] : "???", __FILE__, __LINE__) + #else + #define ERROR(s_) \ + fprintf(stderr, "%s: errno %d - %s\n", s_, errno, errno < sys_nerr ? sys_errlist[errno] : "???") ++#endif + #endif + + extern +diff -ru ../original/src/sdr.h ./src/sdr.h +--- ../original/src/sdr.h Fri Nov 1 10:57:45 1996 ++++ ./src/sdr.h Tue Nov 18 15:06:29 1997 +@@ -8,9 +8,6 @@ + #include <winsock.h> + #else + #include <sys/socket.h> +-#include <netinet/in.h> +-#include <arpa/inet.h> +-#include <net/if.h> + #include <sys/ioctl.h> + #include <netdb.h> + #include <pwd.h> +@@ -18,6 +15,9 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <ctype.h> ++#include <netinet/in.h> ++#include <net/if.h> ++#include <arpa/inet.h> + #include <arpa/nameser.h> + #include <resolv.h> + #ifdef AIX41 +@@ -26,7 +26,6 @@ + #endif + #include <tcl.h> + #include <tk.h> +-#include <malloc.h> + #include <string.h> + #include <fcntl.h> + #include <errno.h> +@@ -147,10 +146,17 @@ + }; + + struct sap_header { ++#if BYTE_ORDER == BIG_ENDIAN + u_int version:3; + u_int type:3; + u_int enc:1; + u_int compress:1; ++#else ++ u_int compress:1; ++ u_int enc:1; ++ u_int type:3; ++ u_int version:3; ++#endif + u_int authlen:8; + u_int msgid:16; + u_int src; diff --git a/mbone/sdr/patches/patch-ab b/mbone/sdr/patches/patch-ab index 270999c42e0..426691b680f 100644 --- a/mbone/sdr/patches/patch-ab +++ b/mbone/sdr/patches/patch-ab @@ -1,11 +1,30 @@ ---- src/qfdes/qfDES-memory.c.orig Thu Oct 31 14:39:50 1996 -+++ src/qfdes/qfDES-memory.c Thu Oct 31 14:41:52 1996 -@@ -12,7 +12,7 @@ - - #include <stdio.h> - #include <memory.h> --#include <malloc.h> -+#include <stdlib.h> - #include <ctype.h> - #include "qfDES.h" - +--- ../../original/src/sip.c Tue Oct 29 16:37:28 1996 ++++ src/sip.c Tue Nov 18 17:41:31 1997 +@@ -213,7 +213,7 @@ + #ifndef WIN32 + { + char buf[200]; +- int ans[500]; ++ u_int32_t ans[500]; + int ctr; + char *tstr, *resstr; + struct dnshdr *dnsa; +@@ -222,7 +222,7 @@ + len=res_mkquery(QUERY, hostname, C_IN, T_MX, NULL, NULL, + NULL, buf, 200); + if (len==-1) perror("res_mkquery"); +- len=res_send(buf, len, ans, 2000); ++ len=res_send(buf, len, (u_char *)ans, 2000); + if (len==-1) perror("res_send"); + ans[0]=htonl(ans[0]); + ans[1]=htonl(ans[1]); +@@ -294,7 +294,8 @@ + } else { + /*it's compressed*/ + if(*tstr==0) tstr+=2; +- resstr+=dn_expand(ans, ans+len, tstr-1, resstr, 200-strlen(resstr)); ++ resstr+=dn_expand((u_char *)ans, (u_char *)(ans+len), ++ tstr-1, resstr, 200-strlen(resstr)); + tstr+=1; + ctr=0; + } diff --git a/mbone/sdr/patches/patch-ac b/mbone/sdr/patches/patch-ac deleted file mode 100644 index 3d7ce87d727..00000000000 --- a/mbone/sdr/patches/patch-ac +++ /dev/null @@ -1,40 +0,0 @@ ---- src/sdr.h.orig Wed May 21 22:06:02 1997 -+++ src/sdr.h Wed May 21 22:10:05 1997 -@@ -8,9 +8,6 @@ - #include <winsock.h> - #else - #include <sys/socket.h> --#include <netinet/in.h> --#include <arpa/inet.h> --#include <net/if.h> - #include <sys/ioctl.h> - #include <netdb.h> - #include <pwd.h> -@@ -18,6 +15,9 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <ctype.h> -+#include <netinet/in.h> -+#include <net/if.h> -+#include <arpa/inet.h> - #include <arpa/nameser.h> - #include <resolv.h> - #ifdef AIX41 -@@ -146,10 +146,17 @@ - }; - - struct sap_header { -+#if BYTE_ORDER == BIG_ENDIAN - u_int version:3; - u_int type:3; - u_int enc:1; - u_int compress:1; -+#else -+ u_int compress:1; -+ u_int enc:1; -+ u_int type:3; -+ u_int version:3; -+#endif - u_int authlen:8; - u_int msgid:16; - u_int src; diff --git a/mbone/sdr/patches/patch-ad b/mbone/sdr/patches/patch-ad deleted file mode 100644 index 968741876fe..00000000000 --- a/mbone/sdr/patches/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ -*** src/Makefile.template.orig Sat Nov 23 16:41:26 1996 ---- src/Makefile.template Sat Nov 23 16:41:35 1996 -*************** -*** 97,103 **** - $(SDR_UI_FILES): tcl2c - - parsed_plugins.tcl: ../src/plugin2tcl.tcl -! tclsh7.5 ../src/plugin2tcl.tcl - - libs.tcl: $(TK_LIBRARY_FILES) - cat $(TK_LIBRARY_FILES) | sed '/^[ ]*source[ ]/d' > libs.tcl ---- 97,103 ---- - $(SDR_UI_FILES): tcl2c - - parsed_plugins.tcl: ../src/plugin2tcl.tcl -! tclsh8.0 ../src/plugin2tcl.tcl - - libs.tcl: $(TK_LIBRARY_FILES) - cat $(TK_LIBRARY_FILES) | sed '/^[ ]*source[ ]/d' > libs.tcl diff --git a/mbone/sdr/patches/patch-ae b/mbone/sdr/patches/patch-ae deleted file mode 100644 index 06004bd9c47..00000000000 --- a/mbone/sdr/patches/patch-ae +++ /dev/null @@ -1,19 +0,0 @@ ---- src/iohandler.c.orig Tue Oct 29 06:52:25 1996 -+++ src/iohandler.c Tue Sep 9 15:36:34 1997 -@@ -131,7 +131,7 @@ - } - sockproc[fd] = callback; - #else -- Tcl_CreateFileHandler(Tcl_GetFile((ClientData)fd, TCL_UNIX_FD), -+ Tcl_CreateFileHandler(fd, - mask, callback, (ClientData)fd); - #endif - } -@@ -144,6 +144,6 @@ - (void) WSAAsyncSelect(fd, sockwin, 0, 0); - } - #else -- Tcl_DeleteFileHandler(Tcl_GetFile((ClientData)fd, TCL_UNIX_FD)); -+ Tcl_DeleteFileHandler(fd); - #endif - } diff --git a/mbone/sdr/pkg/PLIST b/mbone/sdr/pkg/PLIST index 3b663de62fc..8151a90be77 100644 --- a/mbone/sdr/pkg/PLIST +++ b/mbone/sdr/pkg/PLIST @@ -1 +1,2 @@ +@comment $NetBSD: PLIST,v 1.2 1997/11/18 17:21:32 is Exp $ bin/sdr diff --git a/mbone/sdr/scripts/configure b/mbone/sdr/scripts/configure index 4db6ed26d5b..8ba0a33bd9c 100644 --- a/mbone/sdr/scripts/configure +++ b/mbone/sdr/scripts/configure @@ -1,2 +1,3 @@ -cat ${FILESDIR}/Makefile.freebsd ${WRKSRC}/src/Makefile.template > ${WRKSRC}/freebsd/Makefile +mkdir ${WRKSRC}/netbsd +cat ${FILESDIR}/Makefile.netbsd ${WRKSRC}/src/Makefile.template > ${WRKSRC}/netbsd/Makefile cp ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile |