summaryrefslogtreecommitdiff
path: root/mbone
diff options
context:
space:
mode:
authorgarbled <garbled@pkgsrc.org>1998-09-13 17:06:08 +0000
committergarbled <garbled@pkgsrc.org>1998-09-13 17:06:08 +0000
commit68efe4e9e1a388ee7c27add555c3622eaa5bef4a (patch)
tree464caa6551da6ca0206c68965187f1e6c2b69b32 /mbone
parent2dd5c08c038878718e6c191ed404eeafd0730d8a (diff)
downloadpkgsrc-68efe4e9e1a388ee7c27add555c3622eaa5bef4a.tar.gz
Makefile: removed tk80 as a category, added USE_X11, fixed up build target
Patches: Added patch to fix alpha 64bit-ism, broke up patches into separate files, fix various Makefiles WRT PREFIX,X11BASE and LOCALBASE handling. All in all, this was a mess. It works now on elf/alpha, pending a fix to bsd.pkg.mk.. if that falls through, one line will fix it up in the Makefile.
Diffstat (limited to 'mbone')
-rw-r--r--mbone/rat/Makefile11
-rw-r--r--mbone/rat/patches/patch-aa122
-rw-r--r--mbone/rat/patches/patch-ab3
-rw-r--r--mbone/rat/patches/patch-ac11
-rw-r--r--mbone/rat/patches/patch-ad46
-rw-r--r--mbone/rat/patches/patch-ae24
-rw-r--r--mbone/rat/patches/patch-af16
-rw-r--r--mbone/rat/patches/patch-ag21
-rw-r--r--mbone/rat/patches/patch-ah11
9 files changed, 140 insertions, 125 deletions
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index a776816c248..febcc0ae774 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 1998/08/20 15:17:11 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 1998/09/13 17:06:08 garbled Exp $
#
DISTNAME= rat-3.0.24
-CATEGORIES= mbone tk80
+CATEGORIES= mbone
MASTER_SITES= ftp://cs.ucl.ac.uk/mice/rat/src/
MAINTAINER= mycroft@netbsd.org
@@ -13,16 +13,17 @@ DEPENDS+= tk-8.0p2:../../x11/tk80
RESTRICTED= "Contains DES encryption"
MIRROR_DISTFILE=no
USE_GMAKE= yes
+USE_X11= yes
do-build:
- cd ${WRKSRC} && PREFIX=${PREFIX} MAKE=${MAKE_PROGRAM} ./Build rat
+ cd ${WRKSRC} && PREFIX=${PREFIX} MAKE=${MAKE_PROGRAM} LDFLAGS="${LDFLAGS}" X11BASE=${X11BASE} LOCALBASE=${LOCALBASE} ./Build rat
do-install:
cd ${WRKSRC} && ( \
${INSTALL_PROGRAM} \
bin/$${USER:=`whoami`}/rat-`uname -s`-`uname -r` \
- ${LOCALBASE}/bin/rat; \
+ ${PREFIX}/bin/rat; \
${INSTALL_MAN} \
- man/man1/rat.1 ${LOCALBASE}/man/man1/rat.1 )
+ man/man1/rat.1 ${PREFIX}/man/man1/rat.1 )
.include "../../mk/bsd.pkg.mk"
diff --git a/mbone/rat/patches/patch-aa b/mbone/rat/patches/patch-aa
index 3f69a7fd154..965222bc7ab 100644
--- a/mbone/rat/patches/patch-aa
+++ b/mbone/rat/patches/patch-aa
@@ -1,120 +1,4 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:09:57 agc Exp $
-
-*** Build~ Tue May 13 04:38:56 1997
---- Build Thu Mar 5 16:35:38 1998
-***************
-*** 55,59 ****
- Linux ) OSMVER=`echo $OSVERS | awk -F. '{printf("%d_%d", $1, $2)}'`
- ;;
-! SunOS | IRIX | FreeBSD ) OSMVER=`echo $OSVERS | awk -F. '{print $1}'`
- ;;
- HP-UX ) OSTYPE=HPUX
---- 55,59 ----
- Linux ) OSMVER=`echo $OSVERS | awk -F. '{printf("%d_%d", $1, $2)}'`
- ;;
-! SunOS | IRIX | FreeBSD | NetBSD ) OSMVER=`echo $OSVERS | awk -F. '{print $1}'`
- ;;
- HP-UX ) OSTYPE=HPUX
-***************
-*** 69,74 ****
- echo "OSMVER=$OSMVER"
-
- # Create a directory for the .o files, if it doesn't exist...
-! if [ ! -d objs/${USER:=`whoami`}/${OSTYPE}_${OSVERS} ]; then
- echo "Creating object directory objs/${USER}/${OSTYPE}_${OSVERS}..."
- mkdir bin/${USER}
---- 69,76 ----
- echo "OSMVER=$OSMVER"
-
-+ USER=${USER:=`whoami`}
-+
- # Create a directory for the .o files, if it doesn't exist...
-! if [ ! -d objs/${USER}/${OSTYPE}_${OSVERS} ]; then
- echo "Creating object directory objs/${USER}/${OSTYPE}_${OSVERS}..."
- mkdir bin/${USER}
-***************
-*** 80,84 ****
- fi
-
-! cmd="${MAKE:=make} OSTYPE=$OSTYPE OSMVER=$OSMVER OSVERS=$OSVERS USER=`whoami`"
- case $1 in
- rat ) echo "Running: $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}"
---- 82,86 ----
- fi
-
-! cmd="${MAKE:=make} OSTYPE=$OSTYPE OSMVER=$OSMVER OSVERS=$OSVERS USER=$USER"
- case $1 in
- rat ) echo "Running: $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}"
-*** Makefile~ Tue May 27 06:29:15 1997
---- Makefile Thu Mar 5 16:37:53 1998
-***************
-*** 10,14 ****
- # -DDEBUG_RTP -DREPEAT
-
-! DEFS += -D$(OSTYPE) -D$(OSTYPE)_$(OSMVER) -D$(USER)
- CC = gcc
- CFLAGS = -Wall -Werror $(INCS) $(DEFS) -g -O -fsigned-char
---- 10,14 ----
- # -DDEBUG_RTP -DREPEAT
-
-! #DEFS += -D$(OSTYPE) -D$(OSTYPE)_$(OSMVER) -D$(USER)
- CC = gcc
- CFLAGS = -Wall -Werror $(INCS) $(DEFS) -g -O -fsigned-char
-***************
-*** 53,56 ****
---- 53,57 ----
- $(OBJDIR)/auddev_linux.o \
- $(OBJDIR)/auddev_freebsd.o \
-+ $(OBJDIR)/auddev_netbsd.o \
- $(OBJDIR)/init_net.o \
- $(OBJDIR)/init_session.o \
-*** src/bat_include.h~ Tue May 27 06:27:48 1997
---- src/bat_include.h Thu Mar 5 16:22:59 1998
-***************
-*** 71,75 ****
- #include <arpa/inet.h>
- extern int h_errno;
-! #if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__)
- #include <stropts.h>
- #include <sys/filio.h>
---- 71,75 ----
- #include <arpa/inet.h>
- extern int h_errno;
-! #if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__) && !defined(__NetBSD__)
- #include <stropts.h>
- #include <sys/filio.h>
-*** src/config.h~ Fri May 23 08:44:14 1997
---- src/config.h Thu Mar 5 16:39:40 1998
-***************
-*** 57,60 ****
---- 57,71 ----
- #endif /* FreeBSD */
-
-+ #ifdef __NetBSD__
-+ #define OSNAME "NetBSD"
-+ #define DEFINED_ERRLIST
-+ #include <sys/stat.h>
-+ #include <sys/time.h>
-+ #include <errno.h>
-+ #include <fcntl.h>
-+ #include <unistd.h>
-+ #include <sys/audioio.h>
-+ #endif
-+
- #ifdef SunOS_5
- #define OSNAME "Solaris"
-*** /dev/null Thu Mar 5 16:59:30 1998
---- Makefile_NetBSD_1 Thu Mar 5 16:41:44 1998
-***************
-*** 0 ****
---- 1,7 ----
-+ INCS = -I/usr/X11R6/include \
-+ -I${PREFIX}/include/tcl8.0 \
-+ -I${PREFIX}/include/tk8.0
-+ LDLIBS = -L${PREFIX}/lib -ltk80 -ltcl80 \
-+ -L/usr/X11R6/lib -lXext -lX11 \
-+ -lm
-+
+$NetBSD: patch-aa,v 1.4 1998/09/13 17:06:09 garbled Exp $
*** /dev/null Thu Mar 5 16:59:30 1998
--- src/auddev_netbsd.c Thu Mar 5 16:40:41 1998
***************
@@ -126,8 +10,8 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:09:57 agc Exp $
+ * AUTHOR: Isidor Kouvelas
+ * MODIFIED: Colin Perkins
+ *
-+ * $Revision: 1.3 $
-+ * $Date: 1998/08/07 11:09:57 $
++ * $Revision: 1.4 $
++ * $Date: 1998/09/13 17:06:09 $
+ *
+ * Copyright (c) 1995,1996 University College London
+ * All rights reserved.
diff --git a/mbone/rat/patches/patch-ab b/mbone/rat/patches/patch-ab
index 56742c77fb5..ead6a8da087 100644
--- a/mbone/rat/patches/patch-ab
+++ b/mbone/rat/patches/patch-ab
@@ -1,4 +1,5 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:09:57 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/09/13 17:06:09 garbled Exp $
+$NetBSD: patch-ab,v 1.3 1998/09/13 17:06:09 garbled Exp $
--- src/ui.c.orig Thu May 22 09:31:59 1997
+++ src/ui.c Thu Apr 23 10:21:20 1998
diff --git a/mbone/rat/patches/patch-ac b/mbone/rat/patches/patch-ac
new file mode 100644
index 00000000000..e4ddef46017
--- /dev/null
+++ b/mbone/rat/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.1 1998/09/13 17:06:09 garbled Exp $
+--- src/gsm_code.c.orig Sun Sep 13 08:04:40 1998
++++ src/gsm_code.c Sun Sep 13 08:05:08 1998
+@@ -7,6 +7,7 @@
+ /* $Header: /cvsroot/pkgsrc/mbone/rat/patches/patch-ac,v 1.1 1998/09/13 17:06:09 garbled Exp $ */
+
+ #include <stdlib.h>
++#include <string.h>
+ #include "gsm.h"
+
+ /*
diff --git a/mbone/rat/patches/patch-ad b/mbone/rat/patches/patch-ad
new file mode 100644
index 00000000000..810034649fa
--- /dev/null
+++ b/mbone/rat/patches/patch-ad
@@ -0,0 +1,46 @@
+$NetBSD: patch-ad,v 1.1 1998/09/13 17:06:09 garbled Exp $
+*** Build~ Tue May 13 04:38:56 1997
+--- Build Thu Mar 5 16:35:38 1998
+***************
+*** 55,59 ****
+ Linux ) OSMVER=`echo $OSVERS | awk -F. '{printf("%d_%d", $1, $2)}'`
+ ;;
+! SunOS | IRIX | FreeBSD ) OSMVER=`echo $OSVERS | awk -F. '{print $1}'`
+ ;;
+ HP-UX ) OSTYPE=HPUX
+--- 55,59 ----
+ Linux ) OSMVER=`echo $OSVERS | awk -F. '{printf("%d_%d", $1, $2)}'`
+ ;;
+! SunOS | IRIX | FreeBSD | NetBSD ) OSMVER=`echo $OSVERS | awk -F. '{print $1}'`
+ ;;
+ HP-UX ) OSTYPE=HPUX
+***************
+*** 69,74 ****
+ echo "OSMVER=$OSMVER"
+
+ # Create a directory for the .o files, if it doesn't exist...
+! if [ ! -d objs/${USER:=`whoami`}/${OSTYPE}_${OSVERS} ]; then
+ echo "Creating object directory objs/${USER}/${OSTYPE}_${OSVERS}..."
+ mkdir bin/${USER}
+--- 69,76 ----
+ echo "OSMVER=$OSMVER"
+
++ USER=${USER:=`whoami`}
++
+ # Create a directory for the .o files, if it doesn't exist...
+! if [ ! -d objs/${USER}/${OSTYPE}_${OSVERS} ]; then
+ echo "Creating object directory objs/${USER}/${OSTYPE}_${OSVERS}..."
+ mkdir bin/${USER}
+***************
+*** 80,84 ****
+ fi
+
+! cmd="${MAKE:=make} OSTYPE=$OSTYPE OSMVER=$OSMVER OSVERS=$OSVERS USER=`whoami`"
+ case $1 in
+ rat ) echo "Running: $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}"
+--- 82,86 ----
+ fi
+
+! cmd="${MAKE:=make} OSTYPE=$OSTYPE OSMVER=$OSMVER OSVERS=$OSVERS USER=$USER"
+ case $1 in
+ rat ) echo "Running: $cmd bin/${USER}/rat-${OSTYPE}-${OSVERS}"
diff --git a/mbone/rat/patches/patch-ae b/mbone/rat/patches/patch-ae
new file mode 100644
index 00000000000..5ffa3e4ca91
--- /dev/null
+++ b/mbone/rat/patches/patch-ae
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.1 1998/09/13 17:06:09 garbled Exp $
+--- Makefile.orig Thu Mar 19 08:40:07 1998
++++ Makefile Sun Sep 13 09:29:54 1998
+@@ -9,10 +9,10 @@
+ # -DNDEBUG -DDEBUG -DTEST -DGSM -DDEBUG_MIX -DDEBUG_MEM
+ # -DDEBUG_RTP -DREPEAT
+
+-DEFS += -D$(OSTYPE) -D$(OSTYPE)_$(OSMVER) -D$(USER)
++#DEFS += -D$(OSTYPE) -D$(OSTYPE)_$(OSMVER) -D$(USER)
+ CC = gcc
+ CFLAGS = -Wall -Werror $(INCS) $(DEFS) -g -O -fsigned-char
+-LDFLAGS=
++#LDFLAGS=
+ LDLIBS= $(LDLIBS) -lm
+ RANLIB = ranlib
+
+@@ -50,6 +50,7 @@
+ $(OBJDIR)/auddev_hpux_raw.o \
+ $(OBJDIR)/auddev_linux.o \
+ $(OBJDIR)/auddev_freebsd.o \
++ $(OBJDIR)/auddev_netbsd.o \
+ $(OBJDIR)/init_net.o \
+ $(OBJDIR)/init_session.o \
+ $(OBJDIR)/tabmulaw.o \
diff --git a/mbone/rat/patches/patch-af b/mbone/rat/patches/patch-af
new file mode 100644
index 00000000000..b8dfe4a7a48
--- /dev/null
+++ b/mbone/rat/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 1998/09/13 17:06:10 garbled Exp $
+*** src/bat_include.h~ Tue May 27 06:27:48 1997
+--- src/bat_include.h Thu Mar 5 16:22:59 1998
+***************
+*** 71,75 ****
+ #include <arpa/inet.h>
+ extern int h_errno;
+! #if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__)
+ #include <stropts.h>
+ #include <sys/filio.h>
+--- 71,75 ----
+ #include <arpa/inet.h>
+ extern int h_errno;
+! #if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+ #include <stropts.h>
+ #include <sys/filio.h>
diff --git a/mbone/rat/patches/patch-ag b/mbone/rat/patches/patch-ag
new file mode 100644
index 00000000000..667a0959118
--- /dev/null
+++ b/mbone/rat/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1 1998/09/13 17:06:10 garbled Exp $
+*** src/config.h~ Fri May 23 08:44:14 1997
+--- src/config.h Thu Mar 5 16:39:40 1998
+***************
+*** 57,60 ****
+--- 57,71 ----
+ #endif /* FreeBSD */
+
++ #ifdef __NetBSD__
++ #define OSNAME "NetBSD"
++ #define DEFINED_ERRLIST
++ #include <sys/stat.h>
++ #include <sys/time.h>
++ #include <errno.h>
++ #include <fcntl.h>
++ #include <unistd.h>
++ #include <sys/audioio.h>
++ #endif
++
+ #ifdef SunOS_5
+ #define OSNAME "Solaris"
diff --git a/mbone/rat/patches/patch-ah b/mbone/rat/patches/patch-ah
new file mode 100644
index 00000000000..b849855f327
--- /dev/null
+++ b/mbone/rat/patches/patch-ah
@@ -0,0 +1,11 @@
+$NetBSD: patch-ah,v 1.1 1998/09/13 17:06:10 garbled Exp $
+--- /dev/null Sun Sep 13 09:01:39 1998
++++ Makefile_NetBSD_1 Sun Sep 13 09:32:37 1998
+@@ -0,0 +1,7 @@
++INCS = -I${X11BASE}/include \
++ -I${LOCALBASE}/include/tcl8.0 \
++ -I${LOCALBASE}/include/tk8.0
++LDLIBS = -L${LOCALBASE}/lib -ltk80 -ltcl80 \
++ -L${X11BASE}/lib -lXext -lX11 \
++ -lm
++