diff options
| author | bouyer <bouyer> | 2000-03-13 13:17:14 +0000 |
|---|---|---|
| committer | bouyer <bouyer> | 2000-03-13 13:17:14 +0000 |
| commit | d31d46f9e3061ec4fba8ccfe59a054736d3d0317 (patch) | |
| tree | 2e69458b69af412209295e97e1303907d114d5bc /mbone/vat/patches | |
| parent | 16228ad65d6c24221ea3c043ced0a7ac9f126bd2 (diff) | |
| download | pkgsrc-d31d46f9e3061ec4fba8ccfe59a054736d3d0317.tar.gz | |
- make sure to include $(CPPFLAGS) when compiling gsm files
- make it compile on solaris
Diffstat (limited to 'mbone/vat/patches')
| -rw-r--r-- | mbone/vat/patches/patch-af | 29 | ||||
| -rw-r--r-- | mbone/vat/patches/patch-ak | 34 |
2 files changed, 52 insertions, 11 deletions
diff --git a/mbone/vat/patches/patch-af b/mbone/vat/patches/patch-af index 1dee7a93d57..4aa98005dcf 100644 --- a/mbone/vat/patches/patch-af +++ b/mbone/vat/patches/patch-af @@ -1,22 +1,37 @@ -$NetBSD: patch-af,v 1.2 1998/08/07 11:10:04 agc Exp $ +$NetBSD: patch-af,v 1.3 2000/03/13 13:17:15 bouyer Exp $ ---- config.h.freebsd Thu May 16 14:27:06 1996 -+++ config.h Thu Nov 20 13:35:24 1997 -@@ -36,7 +36,7 @@ +--- config.h.orig Thu May 16 14:27:06 1996 ++++ config.h Mon Mar 13 12:10:22 2000 +@@ -36,8 +36,13 @@ #ifndef vic_config_h #define vic_config_h -#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) -+#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__) #include <sys/types.h> ++#if defined(__svr4__) ++typedef uint8_t u_int8_t; ++typedef uint16_t u_int16_t; ++typedef uint32_t u_int32_t; ++#endif #elif defined(linux) #include <sys/bitypes.h> -@@ -83,7 +83,7 @@ + #else +@@ -57,7 +62,7 @@ + typedef int int32_t; + #endif + +-#if defined(sun)||defined(_AIX) ++#if defined(_AIX) + #if defined(__cplusplus) + extern "C" { + #endif +@@ -83,7 +88,7 @@ #include <arpa/inet.h> int strcasecmp(const char *, const char *); clock_t clock(void); -#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__) -+#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__) && !defined(__NetBSD__) ++#if !defined(sco) && !defined(sgi) && !defined(__bsdi__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__svr4__) int gethostid(void); #endif time_t time(time_t *); diff --git a/mbone/vat/patches/patch-ak b/mbone/vat/patches/patch-ak index de2a69bf7e3..5c38ce71eb1 100644 --- a/mbone/vat/patches/patch-ak +++ b/mbone/vat/patches/patch-ak @@ -1,8 +1,34 @@ -$NetBSD: patch-ak,v 1.1 2000/01/26 22:14:27 jlam Exp $ +$NetBSD: patch-ak,v 1.2 2000/03/13 13:17:16 bouyer Exp $ ---- Makefile.in.orig Thu Apr 25 09:20:32 1996 -+++ Makefile.in Wed Jan 26 16:37:34 2000 -@@ -209,16 +209,10 @@ +--- Makefile.in.orig Thu Apr 25 15:20:32 1996 ++++ Makefile.in Mon Mar 13 14:11:24 2000 +@@ -48,6 +48,7 @@ + C++ = @CXX@ + TABCC = @V_TABCC@ + CCOPT = @V_CCOPT@ ++CPPFLAGS= @CPPFLAGS@ + + INCLUDE_TK = @V_INCLUDE_TK@ + INCLUDE_TCL = @V_INCLUDE_TCL@ +@@ -175,7 +176,7 @@ + $(TABCC) $(RFLAG) -c $*.c + + $(SRC3): mktab.c +- $(CC) $(CFLAGS) -o mktab mktab.c $(LIB) $(STATIC) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o mktab mktab.c $(LIB) $(STATIC) + rm -f $(SRC3) + ./mktab -mulaw > tabmulaw.c + ./mktab -sum > tabmix.c +@@ -184,7 +185,7 @@ + rm -f mktab + + vat-gsm.o: vat-gsm.c +- rm -f $@; $(CC) -o $@ -c $(INCLUDE_GSM) $(CFLAGS) $*.c ++ rm -f $@; $(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $*.c + + tar: force + tar=vatbin-`cat VERSION`-@V_TAR_TARGET@.tar.gz ; \ +@@ -209,16 +210,10 @@ rm ../$$name; chmod 444 $$tar install: force |