aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorpat <pat@FreeBSD.org>2002-08-21 10:52:01 +0800
committerpat <pat@FreeBSD.org>2002-08-21 10:52:01 +0800
commitd807df6cfaf5be28e732899e19fe5458de82d9e4 (patch)
treeb9b4b77b1311b1775346e96ec91411977edba210 /audio
parenta44aac548589eee7d07dd1945f2e61b5424dee24 (diff)
downloadfreebsd-ports-gnome-d807df6cfaf5be28e732899e19fe5458de82d9e4.tar.gz
freebsd-ports-gnome-d807df6cfaf5be28e732899e19fe5458de82d9e4.tar.zst
freebsd-ports-gnome-d807df6cfaf5be28e732899e19fe5458de82d9e4.zip
- Fix detection of libreadline and bump PORTREVISION [1]
- Allow port to compile on -current Submitted by: David Yeske <dyeske@yahoo.com> [1] Reviewed by: maintainer
Diffstat (limited to 'audio')
-rw-r--r--audio/icecast/Makefile9
-rw-r--r--audio/icecast/files/patch-configure20
-rw-r--r--audio/icecast/files/patch-src::connection.c18
-rw-r--r--audio/icecast/files/patch-src::sock.c18
-rw-r--r--audio/icecast2/Makefile9
-rw-r--r--audio/icecast2/files/patch-configure20
-rw-r--r--audio/icecast2/files/patch-src::connection.c18
-rw-r--r--audio/icecast2/files/patch-src::sock.c18
8 files changed, 130 insertions, 0 deletions
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index 822bd1c4b949..704cb8a95e69 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -7,6 +7,7 @@
PORTNAME= icecast
PORTVERSION= 1.3.12
+PORTREVISION= 1
CATEGORIES= audio net
MASTER_SITES= http://www.icecast.org/releases/
@@ -14,6 +15,14 @@ MAINTAINER= zach@pabst.bendnet.com
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --with-libwrap
+USE_REINPLACE= yes
+
+pre-patch:
+ @${REINPLACE_CMD} -e 's|<history.h>|<readline/history.h>|' \
+ -e 's|<readline.h>|<readline/readline.h>|' \
+ ${WRKSRC}/src/admin.c
+ @${REINPLACE_CMD} -e 's|#undef HAVE_HISTORY_H|#undef HAVE_READLINE_HISTORY_H|g' \
+ ${WRKSRC}/config.h.in
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/icecast ${PREFIX}/sbin
diff --git a/audio/icecast/files/patch-configure b/audio/icecast/files/patch-configure
new file mode 100644
index 000000000000..99b42e7b4e83
--- /dev/null
+++ b/audio/icecast/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig Wed Apr 10 18:50:20 2002
++++ configure Tue Aug 6 05:36:56 2002
+@@ -2113,7 +2113,7 @@
+ fi
+ fi
+
+-opt_readline="no"
++opt_readline="unset"
+
+ if test "$opt_readline" = "unset"; then
+ if test -f "$withval/include/readline/readline.h"; then
+@@ -3118,7 +3118,7 @@
+
+ fi
+
+-for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h history.h Python.h
++for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h readline/history.h Python.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/audio/icecast/files/patch-src::connection.c b/audio/icecast/files/patch-src::connection.c
new file mode 100644
index 000000000000..9fb9b0f7a136
--- /dev/null
+++ b/audio/icecast/files/patch-src::connection.c
@@ -0,0 +1,18 @@
+--- src/connection.c.orig Mon Aug 5 20:39:21 2002
++++ src/connection.c Mon Aug 5 20:40:08 2002
+@@ -18,6 +18,7 @@
+ *
+ */
+
++#include <sys/types.h>
+ #ifdef HAVE_CONFIG_H
+ #ifdef _WIN32
+ #include <win32config.h>
+@@ -42,7 +43,6 @@
+ #include <unistd.h>
+ #endif
+
+-#include <sys/types.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <time.h>
diff --git a/audio/icecast/files/patch-src::sock.c b/audio/icecast/files/patch-src::sock.c
new file mode 100644
index 000000000000..67c50425f9cb
--- /dev/null
+++ b/audio/icecast/files/patch-src::sock.c
@@ -0,0 +1,18 @@
+--- src/sock.c.orig Mon Aug 5 20:57:27 2002
++++ src/sock.c Mon Aug 5 20:57:48 2002
+@@ -19,6 +19,7 @@
+ *
+ */
+
++#include <sys/types.h>
+ #ifdef HAVE_CONFIG_H
+ #ifdef _WIN32
+ #include <win32config.h>
+@@ -35,7 +36,6 @@
+
+ #include "definitions.h"
+
+-#include <sys/types.h>
+ #include <ctype.h>
+
+ #ifdef HAVE_UNISTD_H
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 822bd1c4b949..704cb8a95e69 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= icecast
PORTVERSION= 1.3.12
+PORTREVISION= 1
CATEGORIES= audio net
MASTER_SITES= http://www.icecast.org/releases/
@@ -14,6 +15,14 @@ MAINTAINER= zach@pabst.bendnet.com
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --with-libwrap
+USE_REINPLACE= yes
+
+pre-patch:
+ @${REINPLACE_CMD} -e 's|<history.h>|<readline/history.h>|' \
+ -e 's|<readline.h>|<readline/readline.h>|' \
+ ${WRKSRC}/src/admin.c
+ @${REINPLACE_CMD} -e 's|#undef HAVE_HISTORY_H|#undef HAVE_READLINE_HISTORY_H|g' \
+ ${WRKSRC}/config.h.in
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/icecast ${PREFIX}/sbin
diff --git a/audio/icecast2/files/patch-configure b/audio/icecast2/files/patch-configure
new file mode 100644
index 000000000000..99b42e7b4e83
--- /dev/null
+++ b/audio/icecast2/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig Wed Apr 10 18:50:20 2002
++++ configure Tue Aug 6 05:36:56 2002
+@@ -2113,7 +2113,7 @@
+ fi
+ fi
+
+-opt_readline="no"
++opt_readline="unset"
+
+ if test "$opt_readline" = "unset"; then
+ if test -f "$withval/include/readline/readline.h"; then
+@@ -3118,7 +3118,7 @@
+
+ fi
+
+-for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h history.h Python.h
++for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h readline/history.h Python.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/audio/icecast2/files/patch-src::connection.c b/audio/icecast2/files/patch-src::connection.c
new file mode 100644
index 000000000000..9fb9b0f7a136
--- /dev/null
+++ b/audio/icecast2/files/patch-src::connection.c
@@ -0,0 +1,18 @@
+--- src/connection.c.orig Mon Aug 5 20:39:21 2002
++++ src/connection.c Mon Aug 5 20:40:08 2002
+@@ -18,6 +18,7 @@
+ *
+ */
+
++#include <sys/types.h>
+ #ifdef HAVE_CONFIG_H
+ #ifdef _WIN32
+ #include <win32config.h>
+@@ -42,7 +43,6 @@
+ #include <unistd.h>
+ #endif
+
+-#include <sys/types.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <time.h>
diff --git a/audio/icecast2/files/patch-src::sock.c b/audio/icecast2/files/patch-src::sock.c
new file mode 100644
index 000000000000..67c50425f9cb
--- /dev/null
+++ b/audio/icecast2/files/patch-src::sock.c
@@ -0,0 +1,18 @@
+--- src/sock.c.orig Mon Aug 5 20:57:27 2002
++++ src/sock.c Mon Aug 5 20:57:48 2002
+@@ -19,6 +19,7 @@
+ *
+ */
+
++#include <sys/types.h>
+ #ifdef HAVE_CONFIG_H
+ #ifdef _WIN32
+ #include <win32config.h>
+@@ -35,7 +36,6 @@
+
+ #include "definitions.h"
+
+-#include <sys/types.h>
+ #include <ctype.h>
+
+ #ifdef HAVE_UNISTD_H