Hello,
the attached patch is port maintenance, and handles net/libshout's
switch to using pkgconfig. This patch empties/removes
patches/patch-ltmain_sh.
Tested on i386.
Moritz
* Use pkgconfig, to cope with net/libshout update
* USE_LIBTOOL
this patch empties patches/patch-ltmain_sh, which needs to be
removed
* Use Python 2.4
* patch maintenance
diff -pruN --exclude=CVS /usr/ports/net/ices/Makefile ./Makefile
--- /usr/ports/net/ices/Makefile Sun Jun 19 12:56:31 2005
+++ ./Makefile Fri Jan 6 14:41:21 2006
@@ -3,7 +3,7 @@
COMMENT= "icecast source for streaming MP3"
DISTNAME= ices-0.4
-PKGNAME= ${DISTNAME}p0
+PKGNAME= ${DISTNAME}p1
CATEGORIES= net audio
HOMEPAGE= http://www.icecast.org/
@@ -27,6 +27,7 @@ CONFIGURE_ARGS= --with-docdir=${LOCALBAS
--with-flac=${LOCALBASE}
MODULES= converters/libiconv
+BUILD_DEPENDS= ::devel/pkgconfig
LIB_DEPENDS= mp3lame.0:lame-*:audio/lame,no_x11 \
shout.3::net/libshout \
FLAC.5::audio/flac \
@@ -36,7 +37,7 @@ FLAVORS= python mp4
FLAVOR?=
.if ${FLAVOR:L:Mpython}
-PYTHON_VER= 2.3
+PYTHON_VER= 2.4
CONFIGURE_ARGS+=--with-python=${LOCALBASE}/bin/python${PYTHON_VER}
LIB_DEPENDS+=
python${PYTHON_VER}.0.0:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
.else
@@ -51,6 +52,7 @@ CONFIGURE_ARGS+=--without-faad
.endif
SEPARATE_BUILD= simple
+USE_LIBTOOL= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ices/
diff -pruN --exclude=CVS /usr/ports/net/ices/patches/patch-ltmain_sh
./patches/patch-ltmain_sh
--- /usr/ports/net/ices/patches/patch-ltmain_sh Sat May 21 15:46:44 2005
+++ ./patches/patch-ltmain_sh Thu Jan 1 01:00:00 1970
@@ -1,40 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2005/05/21 13:46:44 alek Exp $
---- ltmain.sh.orig Sat Aug 21 02:03:43 2004
-+++ ltmain.sh Sun Oct 24 23:30:56 2004
-@@ -127,7 +127,7 @@ nonopt=
- prev=
- prevopt=
- run=
--show="$echo"
-+show=
- show_help=
- execute_dlfiles=
- lo2o="s/\\.lo\$/.${objext}/"
-@@ -1492,6 +1492,17 @@ EOF
- continue
- ;;
-
-+ -pthread)
-+ case $host in
-+ *-*-openbsd*)
-+ deplibs="$deplibs $arg"
-+ ;;
-+ *)
-+ continue
-+ ;;
-+ esac
-+ ;;
-+
- -module)
- module=yes
- continue
-@@ -2155,6 +2166,9 @@ EOF
- newdlfiles="$newdlfiles $deplib"
- fi
- fi
-+ continue
-+ ;;
-+ -pthread)
- continue
- ;;
- %DEPLIBS%)
diff -pruN --exclude=CVS
/usr/ports/net/ices/patches/patch-src_playlist_pm_python_c
./patches/patch-src_playlist_pm_python_c
--- /usr/ports/net/ices/patches/patch-src_playlist_pm_python_c Sat May 21
15:46:44 2005
+++ ./patches/patch-src_playlist_pm_python_c Fri Jan 6 13:34:01 2006
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_playlist_pm_python_c,v 1.1 2005/05/21 13:46:44 alek Exp $
---- src/playlist/pm_python.c.orig Thu Mar 24 16:42:00 2005
-+++ src/playlist/pm_python.c Thu Mar 24 18:14:48 2005
-@@ -213,13 +213,25 @@ python_init (void)
+--- src/playlist/pm_python.c.orig Mon Mar 22 04:13:12 2004
++++ src/playlist/pm_python.c Fri Jan 6 13:26:58 2006
+@@ -213,13 +213,27 @@ python_init (void)
static int
python_setup_path (void)
{
@@ -19,14 +19,16 @@ $OpenBSD: patch-src_playlist_pm_python_c
+
+ if (oldpath && (python_path = (char*) malloc (size = strlen(oldpath) +
strlen (ICES_MODULEDIR) + 14 + 1))) {
+ ret = snprintf (python_path, size, "PYTHONPATH=%s:%s:.", oldpath,
ICES_MODULEDIR);
-+ if (ret == -1 || ret >= size) {
++ if (ret < 0 || ret >= size) {
+ ices_log_error ("Truncation or output/encoding error occured while
generating Python environment");
++ free(python_path);
+ return -1;
+ }
+ } else if ((python_path = (char*) malloc (size = strlen (ICES_MODULEDIR) +
13 + 1))) {
+ ret = snprintf (python_path, size, "PYTHONPATH=%s:.", ICES_MODULEDIR);
-+ if (ret == -1 || ret >= size) {
++ if (ret < 0 || ret >= size) {
+ ices_log_error ("Truncation or output/encoding error occured while
generating Python environment");
++ free(python_path);
+ return -1;
+ }
+ } else {
diff -pruN --exclude=CVS /usr/ports/net/ices/patches/patch-src_setup_c
./patches/patch-src_setup_c
--- /usr/ports/net/ices/patches/patch-src_setup_c Sat May 21 15:46:44 2005
+++ ./patches/patch-src_setup_c Fri Jan 6 13:34:01 2006
@@ -1,16 +1,14 @@
$OpenBSD: patch-src_setup_c,v 1.1 2005/05/21 13:46:44 alek Exp $
--- src/setup.c.orig Sat Jul 31 11:13:35 2004
-+++ src/setup.c Fri May 20 13:48:53 2005
-@@ -264,7 +264,14 @@ ices_setup_parse_config_file (ices_confi
++++ src/setup.c Fri Jan 6 13:30:24 2006
+@@ -264,7 +264,12 @@ ices_setup_parse_config_file (ices_confi
if (ices_util_verify_file (configfile)) {
realname = configfile;
} else {
- sprintf (namespace, "%s/%s", ICES_ETCDIR, configfile);
+ int sret;
-+ size_t size;
-+ size = sizeof (namespace);
-+ sret = snprintf (namespace, size, "%s/%s", ICES_ETCDIR, configfile);
-+ if (sret == -1 || sret >= size) {
++ sret = snprintf (namespace, sizeof(namespace), "%s/%s", ICES_ETCDIR,
configfile);
++ if (sret < 0 || sret >= sizeof(namespace)) {
+ ices_log ("WARNING: Truncation or format/encoding error occured
in ices_setup_parse_config_file()");
+ return;
+ }
diff -pruN --exclude=CVS /usr/ports/net/ices/patches/patch-src_util_c
./patches/patch-src_util_c
--- /usr/ports/net/ices/patches/patch-src_util_c Sat May 21 15:46:44 2005
+++ ./patches/patch-src_util_c Fri Jan 6 13:34:01 2006
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_util_c,v 1.1 2005/05/21 13:46:44 alek Exp $
---- src/util.c.orig Fri May 20 13:20:25 2005
-+++ src/util.c Fri May 20 13:38:22 2005
+--- src/util.c.orig Mon Mar 22 04:13:11 2004
++++ src/util.c Fri Jan 6 13:33:35 2006
@@ -143,8 +143,10 @@ ices_util_read_line (FILE *fp)
/* Create a box-unique filename of a certain type */
@@ -8,7 +8,7 @@ $OpenBSD: patch-src_util_c,v 1.1 2005/05
-ices_util_get_random_filename (char *namespace, char *type)
+ices_util_get_random_filename (char *namespace, size_t size, char *type)
{
-+ int ret;
++ int ret;
+
if (!namespace || !type) {
ices_log ("WARNING: ices_util_get_random_filename() called with
NULL pointers.");
@@ -19,7 +19,7 @@ $OpenBSD: patch-src_util_c,v 1.1 2005/05
#else
- sprintf (namespace, "ices.%s.%d", type, (int)getpid ());
+ ret = snprintf (namespace, size, "ices.%s.%d", type, (int)getpid ());
-+ if (ret == -1 || ret >= size) {
++ if (ret < 0 || ret >= size) {
+ ices_log ("WARNING: Truncation or format/encoding error occured
in ices_util_get_random_filename()");
+ return NULL;
+ }
@@ -35,7 +35,7 @@ $OpenBSD: patch-src_util_c,v 1.1 2005/05
{
unsigned long int days, hours, minutes, nseconds, remains;
unsigned long int seconds;
-+ int ret;
++ int ret;
+ if (!buf)
+ return NULL;
@@ -45,7 +45,7 @@ $OpenBSD: patch-src_util_c,v 1.1 2005/05
- return buf;
- }
+ ret = snprintf (buf, size, "0:0:0:0");
-+ if (ret == -1 || ret >= size)
++ if (ret < 0 || ret >= size)
+ return NULL;
+ return buf;
+ }
@@ -66,7 +66,7 @@ $OpenBSD: patch-src_util_c,v 1.1 2005/05
- sprintf (buf, "%lu:%lu:%lu:%lu", days, hours, minutes, nseconds);
-
+ ret = snprintf (buf, size, "%lu:%lu:%lu:%lu", days, hours, minutes,
nseconds);
-+ if (ret == -1 || ret >= size)
++ if (ret < 0 || ret >= size)
+ return NULL;
return buf;
}
