* Fix for endianness check (NetBSD-current and 1.4.x are different)

* Move parts shared between speakfreely and speakfreely-crypto to
  Makefile.common.

5 files changed, 65 insertions, 59 deletions

diff --git a/net/speakfreely/Makefile b/net/speakfreely/Makefile
index 8d9ee171594..734db280ddf 100644
--- a/net/speakfreely/Makefile
+++ b/net/speakfreely/Makefile
@@ -1,55 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/11 05:48:24 jlam Exp $
+# $NetBSD: Makefile,v 1.2 1999/10/26 16:45:16 jlam Exp $
 #
 
-DISTNAME=		speak_freely-7.1
 PKGNAME=		speakfreely-7.1
-CATEGORIES=		net audio
-MASTER_SITES=		http://www.fourmilab.ch/speakfree/unix/
-
-MAINTAINER=		johnam@mail.kemper.org
-HOMEPAGE=		http://www.fourmilab.ch/speakfree/unix/
-
 CONFLICTS=		speakfreely-crypto-*
 
-DEPENDS+=		gsm-1.0.10:../../audio/gsm
-
-USE_PERL=		yes
-PERL_PATH=		${LOCALBASE}/bin/perl
-
-MIRROR_DISTFILE=	no			# source includes crypto code
-
-NO_CONFIGURE=		yes
-
-BUILD_DEFS+=		SPEAKFREELY_OPTIONS
-
-.include "../../mk/bsd.prefs.mk"
-
-# SPEAKFREELY_OPTIONS is a space-separated list of compile-time options
-# to support.  Currently supported options:
-#
-#	halfduplex	for if sound card doesn't support full-duplex sound
-#
-SPEAKFREELY_OPTIONS?=   halfduplex
-
-.if ${SPEAKFREELY_OPTIONS:Mhalfduplex} == "halfduplex"
-CCFLAGS+=		-DHALF_DUPLEX
-.endif
-
-SOUNDDIR=		${PREFIX}/share/speakfreely
-MAKE_ENV+=		PERL="${PERL_PATH}" CCFLAGS="${CCFLAGS}" \
-			SOUNDDIR="${SOUNDDIR}" HAVE_GSM=yes
-MAKE_ENV+=		HAVE_MD5=yes
-
-post-extract:
-	${MV} ${WRKSRC}/sfspeaker.1 ${WRKSRC}/sfspeaker.1.in
-
-pre-build:
-	${SED} -e "s,@SOUNDDIR@,${SOUNDDIR},g" ${WRKSRC}/sfspeaker.1.in \
-		> ${WRKSRC}/sfspeaker.1
-
-post-install:
-	${INSTALL_DATA_DIR} ${SOUNDDIR}
-	${INSTALL_DATA} ${WRKSRC}/busy.au ${SOUNDDIR}
-	${INSTALL_DATA} ${WRKSRC}/ring.au ${SOUNDDIR}
-
-.include "../../mk/bsd.pkg.mk"
+.include "../../net/speakfreely/Makefile.common"
diff --git a/net/speakfreely/Makefile.common b/net/speakfreely/Makefile.common
new file mode 100644
index 00000000000..7222e0f67a1
--- /dev/null
+++ b/net/speakfreely/Makefile.common
@@ -0,0 +1,52 @@
+# $NetBSD: Makefile.common,v 1.1 1999/10/26 16:45:16 jlam Exp $
+#
+
+DISTNAME=		speak_freely-7.1
+CATEGORIES=		net audio
+MASTER_SITES=		http://www.fourmilab.ch/speakfree/unix/
+
+MAINTAINER=		johnam@mail.kemper.org
+HOMEPAGE=		http://www.fourmilab.ch/speakfree/unix/
+
+DEPENDS+=		gsm-1.0.10:../../audio/gsm
+
+USE_PERL=		yes
+PERL_PATH=		${LOCALBASE}/bin/perl
+
+MIRROR_DISTFILE=	no			# source includes crypto code
+
+NO_CONFIGURE=		yes
+
+BUILD_DEFS+=		SPEAKFREELY_OPTIONS
+
+.include "../../mk/bsd.prefs.mk"
+
+# SPEAKFREELY_OPTIONS is a space-separated list of compile-time options
+# to support.  Currently supported options:
+#
+#	halfduplex	for if sound card doesn't support full-duplex sound
+#
+SPEAKFREELY_OPTIONS?=   halfduplex
+
+.if ${SPEAKFREELY_OPTIONS:Mhalfduplex} == "halfduplex"
+CCFLAGS+=		-DHALF_DUPLEX
+.endif
+
+SOUNDDIR=		${PREFIX}/share/speakfreely
+MAKE_ENV+=		PERL="${PERL_PATH}" CCFLAGS="${CCFLAGS}" \
+			SOUNDDIR="${SOUNDDIR}" HAVE_GSM=yes
+MAKE_ENV+=		HAVE_MD5=yes
+
+post-extract:
+	${MV} ${WRKSRC}/sfspeaker.1 ${WRKSRC}/sfspeaker.1.in
+
+pre-build:
+	${SED} -e "s,@SOUNDDIR@,${SOUNDDIR},g" ${WRKSRC}/sfspeaker.1.in \
+		> ${WRKSRC}/sfspeaker.1
+
+post-install:
+	${INSTALL_DATA_DIR} ${SOUNDDIR}
+	${INSTALL_DATA} ${WRKSRC}/busy.au ${SOUNDDIR}
+	${INSTALL_DATA} ${WRKSRC}/ring.au ${SOUNDDIR}
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/speakfreely/files/patch-sum b/net/speakfreely/files/patch-sum
index 24cc2f161f9..e696d391961 100644
--- a/net/speakfreely/files/patch-sum
+++ b/net/speakfreely/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/10/11 05:48:25 jlam Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/26 16:45:17 jlam Exp $
 
 MD5 (patch-aa) = fc4777d135292d7b09e155cbfa98cc92
-MD5 (patch-ab) = 21d79fc6eb7a9d467486c9247b7a1e5a
+MD5 (patch-ab) = 437f44a080d08925b8275c6c01543b76
 MD5 (patch-ac) = 9bb7b8bb6a0928830e09d6cb7223aed7
 MD5 (patch-ad) = ca5b272dc6faff9cc174ea0b47e038cd
 MD5 (patch-ae) = 7a0471772af271dc970fe5d3280f8d32
-MD5 (patch-af) = 0588252b44ea08362affba7c4a504c8e
+MD5 (patch-af) = c101bbe1d66b8399cec024e501305704
diff --git a/net/speakfreely/patches/patch-ab b/net/speakfreely/patches/patch-ab
index fedf15eecba..63d27e7b550 100644
--- a/net/speakfreely/patches/patch-ab
+++ b/net/speakfreely/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/10/11 05:48:25 jlam Exp $
+$NetBSD: patch-ab,v 1.2 1999/10/26 16:45:18 jlam Exp $
 
 --- des/des.c.orig	Fri Feb 23 06:10:37 1996
-+++ des/des.c	Mon Oct 11 01:38:34 1999
-@@ -4,6 +4,17 @@
++++ des/des.c	Tue Oct 26 12:22:56 1999
+@@ -4,6 +4,18 @@
   */
  #define NULL	0
  
@@ -11,6 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/10/11 05:48:25 jlam Exp $
 + * header files.
 + */
 +#if defined(__NetBSD__)
++#include <sys/types.h>		/* needed for NetBSD <= 1.4.x */
 +#include <machine/endian.h>
 +#if BYTE_ORDER == LITTLE_ENDIAN
 +#define M_LITTLE_ENDIAN
diff --git a/net/speakfreely/patches/patch-af b/net/speakfreely/patches/patch-af
index 751e2a9a296..bef789ce71c 100644
--- a/net/speakfreely/patches/patch-af
+++ b/net/speakfreely/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/10/11 05:48:25 jlam Exp $
+$NetBSD: patch-af,v 1.2 1999/10/26 16:45:18 jlam Exp $
 
 --- speakfree.h.orig	Tue Sep 14 08:17:32 1999
-+++ speakfree.h	Mon Oct 11 01:38:35 1999
-@@ -20,6 +20,17 @@
++++ speakfree.h	Tue Oct 26 12:23:11 1999
+@@ -20,6 +20,18 @@
  #define _BSD_SIGNALS
  #endif
  
@@ -11,6 +11,7 @@ $NetBSD: patch-af,v 1.1.1.1 1999/10/11 05:48:25 jlam Exp $
 + * header files.
 + */
 +#if defined(__NetBSD__)
++#include <sys/types.h>		/* needed for NetBSD <= 1.4.x */
 +#include <machine/endian.h>
 +#if BYTE_ORDER == LITTLE_ENDIAN
 +#define M_LITTLE_ENDIAN