From 7204e8e5276f1c82d70ed3fb0f6159b93ad0ac0e Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 31 Dec 2001 09:44:45 +0000 Subject: [PATCH] autoconf 2.52. Some clean-up --- audio/gqmpeg/Makefile | 5 +++-- audio/rsynth/Makefile | 5 +++-- audio/rsynth/{files/md5 => distinfo} | 0 audio/rsynth/patches/{patch-ac => patch-Makefile_in} | 3 ++- audio/rsynth/patches/patch-aa | 9 --------- audio/rsynth/patches/{patch-ad => patch-config_sub} | 3 ++- audio/rsynth/patches/{patch-ab => patch-configure_in} | 9 +++++---- audio/rsynth/patches/patch-naplay_c | 8 ++++++++ 8 files changed, 23 insertions(+), 19 deletions(-) rename audio/rsynth/{files/md5 => distinfo} (100%) rename audio/rsynth/patches/{patch-ac => patch-Makefile_in} (86%) delete mode 100644 audio/rsynth/patches/patch-aa rename audio/rsynth/patches/{patch-ad => patch-config_sub} (85%) rename audio/rsynth/patches/{patch-ab => patch-configure_in} (58%) create mode 100644 audio/rsynth/patches/patch-naplay_c diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index b4e60a602c1..e5cd7019a01 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.24 2001/11/18 19:07:51 rohee Exp $ +# $OpenBSD: Makefile,v 1.25 2001/12/31 09:44:45 espie Exp $ COMMENT= "mpg123 front-end with skin support" DISTNAME= gqmpeg-0.11.0 CATEGORIES= audio -NEED_VERSION= 1.497 +NEED_VERSION= 1.504 HOMEPAGE= http://gqmpeg.sourceforge.net @@ -25,6 +25,7 @@ RUN_DEPENDS= ::audio/mpg123 LIB_DEPENDS= gdk_pixbuf.2::graphics/gdk-pixbuf CONFIGURE_STYLE= autoconf +AUTOCONF_NEW= Yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile index 3b73df434b3..6ba585f278e 100644 --- a/audio/rsynth/Makefile +++ b/audio/rsynth/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.17 2001/04/13 03:24:20 obecian Exp $ +# $OpenBSD: Makefile,v 1.18 2001/12/31 09:44:45 espie Exp $ COMMENT= "speech synthesizer" DISTNAME= rsynth-2.0 CATEGORIES= audio -NEED_VERSION= 1.364 +NEED_VERSION= 1.504 MASTER_SITES= ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/ MAINTAINER= Angelos D. Keromytis @@ -18,6 +18,7 @@ FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX} LIB_DEPENDS= gdbm.::databases/gdbm CONFIGURE_STYLE=autoconf +AUTOCONF_NEW=Yes CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include CONFIGURE_ARGS= `$(CC) -dumpmachine` SEPARATE_BUILD= simple diff --git a/audio/rsynth/files/md5 b/audio/rsynth/distinfo similarity index 100% rename from audio/rsynth/files/md5 rename to audio/rsynth/distinfo diff --git a/audio/rsynth/patches/patch-ac b/audio/rsynth/patches/patch-Makefile_in similarity index 86% rename from audio/rsynth/patches/patch-ac rename to audio/rsynth/patches/patch-Makefile_in index 3210ee5a19a..c7ebf36562e 100644 --- a/audio/rsynth/patches/patch-ac +++ b/audio/rsynth/patches/patch-Makefile_in @@ -1,5 +1,6 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2001/12/31 09:44:45 espie Exp $ --- Makefile.in.orig Tue Nov 8 14:30:52 1994 -+++ Makefile.in Sat Apr 8 18:55:14 2000 ++++ Makefile.in Mon Dec 31 10:31:55 2001 @@ -5,8 +5,9 @@ SRCDIR = @srcdir@ CC = @CC@ PREFIX = @prefix@ diff --git a/audio/rsynth/patches/patch-aa b/audio/rsynth/patches/patch-aa deleted file mode 100644 index 44906e467d3..00000000000 --- a/audio/rsynth/patches/patch-aa +++ /dev/null @@ -1,9 +0,0 @@ -*** naplay.c.ORIG Tue Nov 1 19:40:13 1994 ---- naplay.c Sat Jun 10 19:51:40 1995 -*************** -*** 1,3 **** ---- 1,4 ---- -+ #include - #include - #include - #include diff --git a/audio/rsynth/patches/patch-ad b/audio/rsynth/patches/patch-config_sub similarity index 85% rename from audio/rsynth/patches/patch-ad rename to audio/rsynth/patches/patch-config_sub index 5d2f8382efe..f589e00bdfb 100644 --- a/audio/rsynth/patches/patch-ad +++ b/audio/rsynth/patches/patch-config_sub @@ -1,5 +1,6 @@ +$OpenBSD: patch-config_sub,v 1.1 2001/12/31 09:44:45 espie Exp $ --- config.sub.orig Mon Oct 31 14:41:52 1994 -+++ config.sub Sat Apr 8 19:15:47 2000 ++++ config.sub Mon Dec 31 10:31:55 2001 @@ -704,7 +704,7 @@ case $os in | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \ | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \ diff --git a/audio/rsynth/patches/patch-ab b/audio/rsynth/patches/patch-configure_in similarity index 58% rename from audio/rsynth/patches/patch-ab rename to audio/rsynth/patches/patch-configure_in index a1d48d643e6..166adff00f5 100644 --- a/audio/rsynth/patches/patch-ab +++ b/audio/rsynth/patches/patch-configure_in @@ -1,6 +1,7 @@ ---- configure.in.orig Tue Nov 8 08:30:51 1994 -+++ configure.in Tue Jun 22 08:44:36 1999 -@@ -11,8 +11,6 @@ +$OpenBSD: patch-configure_in,v 1.1 2001/12/31 09:44:45 espie Exp $ +--- configure.in.orig Tue Nov 8 14:30:51 1994 ++++ configure.in Mon Dec 31 10:31:55 2001 +@@ -11,8 +11,6 @@ hplay=dummy dbm=none make_dist=/dev/null @@ -9,7 +10,7 @@ if test -z "$CC" && test -n "$GCC" ; then CC=$GCC fi -@@ -42,6 +40,7 @@ +@@ -42,6 +40,7 @@ case "$host" in *-next-*) hplay=NeXT; AC_CHECK_HEADERS(libc.h) ;; *-*-linux*) hplay=linux ;; *-*-hpux*) hplay=hpux ;; diff --git a/audio/rsynth/patches/patch-naplay_c b/audio/rsynth/patches/patch-naplay_c new file mode 100644 index 00000000000..d44c30290fc --- /dev/null +++ b/audio/rsynth/patches/patch-naplay_c @@ -0,0 +1,8 @@ +$OpenBSD: patch-naplay_c,v 1.1 2001/12/31 09:44:45 espie Exp $ +--- naplay.c.orig Tue Nov 1 19:40:13 1994 ++++ naplay.c Mon Dec 31 10:31:55 2001 +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include