[BACK]Return to patch-ae CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / mbone / rat / patches

File: [cvs.NetBSD.org] / pkgsrc / mbone / rat / patches / patch-ae (download)

Revision 1.4, Fri Feb 24 00:35:59 2006 UTC (16 years, 5 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, pkgsrc-2007Q1-base, pkgsrc-2007Q1, pkgsrc-2006Q4-base, pkgsrc-2006Q4, pkgsrc-2006Q3-base, pkgsrc-2006Q3, pkgsrc-2006Q2-base, pkgsrc-2006Q2, pkgsrc-2006Q1-base, pkgsrc-2006Q1, cwrapper, cube-native-xorg-base, cube-native-xorg
Changes since 1.3: +27 -5 lines

Add DragonFly support. Allow build on newer NetBSD versions.
Don't require MTREE. Simplify Makefiles by building directly
as bin/rat -- pkgsrc doesn't support multiple builds in one
WRKSRC anyway.

$NetBSD: patch-ae,v 1.4 2006/02/24 00:35:59 joerg Exp $

--- Makefile.orig	1998-08-15 19:16:44.000000000 +0000
+++ Makefile
@@ -9,10 +9,10 @@ DEFS = -DNDEBUG
 # -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= 
+CFLAGS = -Wall $(INCS) $(DEFS) -g -O -fsigned-char
+#LDFLAGS= 
 LDLIBS=  $(LDLIBS) -lm
 RANLIB = ranlib
 
@@ -21,7 +21,7 @@ GSMFLAGS   = -DSASR -DFAST -DUSE_FLOAT_M
 
 include Makefile_$(OSTYPE)_$(OSMVER)
 
-BINDIR = bin/$(USER)
+BINDIR = bin
 SRCDIR = src
 OBJDIR = objs/$(USER)/$(OSTYPE)_$(OSVERS)
 OBJS   = $(OBJDIR)/codec_encoder.o \
@@ -50,6 +50,7 @@ OBJS   = $(OBJDIR)/codec_encoder.o \
          $(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 \
@@ -77,9 +78,9 @@ CRYPTOBJS=$(OBJDIR)/crypt.o \
           $(OBJDIR)/crypt_random.o \
           $(OBJDIR)/md5c.o
 
-$(BINDIR)/rat-$(OSTYPE)-$(OSVERS): $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(RATOBJS)
-	rm -f $(BINDIR)/rat-$(OSTYPE)-$(OSVERS)
-	$(CC) $(RATOBJS) $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(LDLIBS) $(LDFLAGS) -o $(BINDIR)/rat-$(OSTYPE)-$(OSVERS)
+$(BINDIR)/rat: $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(RATOBJS)
+	rm -f $(BINDIR)/rat
+	$(CC) $(RATOBJS) $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(LDLIBS) $(LDFLAGS) -o $(BINDIR)/rat
 
 $(OBJDIR)/%.o: $(SRCDIR)/%.c
 	$(CC) $(CFLAGS) $(GSMFLAGS) $(CRYPTFLAGS) -c $(SRCDIR)/$*.c -o $(OBJDIR)/$*.o