mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Update to 2.2.2.

Browse Source 
PR:		47322
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
This commit is contained in:
Adam Weinberger 2003-01-28 06:24:24 +00:00
parent 5365f1dbc7
commit 0707c24745
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=74122
15 changed files with 98 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/zinf/Makefile
View File

@ -6,15 +6,17 @@
#
PORTNAME= zinf
PORTVERSION= 2.2.1
PORTVERSION= 2.2.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= musicbrainz.2:${PORTSDIR}/audio/musicbrainz \
id3:${PORTSDIR}/audio/id3lib
LIB_DEPENDS= id3-3.8.2:${PORTSDIR}/audio/id3lib \
musicbrainz.2:${PORTSDIR}/audio/musicbrainz
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_X_PREFIX= yes
USE_GNOMENG= yes
@ -22,9 +24,8 @@ USE_GNOME= gnomehier gdkpixbuf
WANT_GNOME= yes
USE_PERL5= yes
USE_FREETYPE= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_AUTOCONF_VER=213
USE_AUTOCONF_VER= 213
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS= -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include \
@ -75,18 +76,13 @@ pre-everything::
@${ECHO_MSG}
@${ECHO_MSG} "You may use the following build options:"
@${ECHO_MSG}
@${ECHO_MSG} "WITH_LIBARTS build with libArts output plugin"
@${ECHO_MSG} "WITH_LIBARTS build with libArts output plugin"
@${ECHO_MSG} "WITHOUT_GNOME=esound do NOT build with esd support"
@${ECHO_MSG} "WITHOUT_VORBIS do NOT build with Ogg/Vorbis codec plugin"
@${ECHO_MSG} "WITHOUT_VORBIS do NOT build with Ogg/Vorbis codec plugin"
@${ECHO_MSG}
@${ECHO_MSG} "WITH_ALL_PLUGINS=yes build with all plugins"
@${ECHO_MSG} "WITH_ALL_PLUGINS=yes build with all plugins"
@${ECHO_MSG}
post-patch:
@${REINPLACE_CMD} -e 's|\[en_US.ISO8859-1\]||g ; \
s|/usr/share/pixmaps|${PREFIX}/share/gnome/pixmaps|g' \
${WRKSRC}/installer/unix/linux/Zinf.desktop
post-install:
@${MKDIR} ${PREFIX}/etc/sdr/plugins
${INSTALL_DATA} ${FILESDIR}/sdr2.plugin.S100.audio.rtp.mpa.zinf \

2
audio/zinf/distinfo
View File

@ -1 +1 @@
MD5 (zinf-2.2.1.tar.gz) = 62d603f89341a0e788451498138b962e
MD5 (zinf-2.2.2.tar.gz) = 8d1b58545854cd8eae79a0216c724e0c

60
audio/zinf/files/patch-aa
View File

@ -1,6 +1,6 @@
--- configure.in.orig Sat Oct 12 02:57:17 2002
+++ configure.in Thu Oct 17 09:56:22 2002
@@ -170,8 +170,8 @@
--- configure.in.orig Wed Jan 1 08:37:26 2003
+++ configure.in Sat Jan 11 04:37:46 2003
@@ -172,8 +172,8 @@
;;
freebsd*)
host_os="freebsd"
@ -11,18 +11,19 @@
;;
netbsd*)
host_os="freebsd"
@@ -323,8 +323,10 @@
@@ -324,9 +324,9 @@
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
ac_save_CFLAGS="$CFLAGS"
- ac_save_CFLAGS="$CFLAGS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $ESD_CFLAGS"
- CFLAGS="$CFLAGS $ESD_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $ESD_CFLAGS"
LIBS="$LIBS $ESD_LIBS"
rm -f conf.esdtest
AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
@@ -383,7 +385,7 @@
@@ -385,7 +385,7 @@
}
],, have_esound=false, have_esound=false)
@ -31,16 +32,7 @@
LIBS="$ac_save_LIBS"
AC_LANG_RESTORE
rm -f conf.esdtest
@@ -410,7 +412,7 @@
dnl optional freetype support..
save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+CPPFLAGS="$CPPFLAGS"
AC_LANG_SAVE
AC_LANG_C
AC_CHECK_HEADERS(freetype.h, have_freetype="true", have_freetype="false")
@@ -460,9 +462,9 @@
@@ -474,9 +474,9 @@
gtk_config_major=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gtk_config_micro=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
@ -52,7 +44,7 @@
LIBS="$GTK_LIBS $LIBS"
AC_TRY_RUN([
@@ -489,7 +491,7 @@
@@ -503,7 +503,7 @@
gtk_major_version, gtk_minor_version, gtk_micro_version);
return 1;
}], , have_gtk=false, have_gtk=false])
@ -61,7 +53,7 @@
LIBS="$ac_save_LIBS"
if test "$have_gtk" = "false"; then
AC_MSG_RESULT(no)
@@ -510,7 +512,7 @@
@@ -524,7 +524,7 @@
OSINC="$OSINC -I$srcdir/ui/download/unix/include"
OSINC="$OSINC -I$srcdir/ui/musicbrowser/include"
OSINC="$OSINC -I$srcdir/ftc/kjofol"
@ -70,7 +62,7 @@
AC_DEFINE(HAVE_GTK)
else
GTK_CFLAGS=""
@@ -531,18 +533,10 @@
@@ -545,18 +545,10 @@
AC_SUBST(GTK_PREFIX)
AC_SUBST(EXTRALIBS)
@ -91,16 +83,16 @@
ORBIT_LIBS=""
ORBIT_IDL=""
@@ -652,7 +646,7 @@
@@ -680,7 +672,7 @@
alsa_min_major_version=0
alsa_min_minor_version=5
alsa_min_minor_version=9
alsa_min_micro_version=0
- ac_save_CFLAGS="$CFLAGS"
+ ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lasound"
@@ -697,7 +691,7 @@
@@ -725,7 +717,7 @@
], , have_alsa=false, have_alsa=false
)
AC_LANG_RESTORE
@ -109,7 +101,7 @@
LIBS="$ac_save_LIBS"
if test "$have_alsa" = "false"; then
AC_MSG_RESULT(no)
@@ -717,6 +711,9 @@
@@ -745,6 +737,9 @@
AC_MSG_RESULT([compiling alsa pmo plugin])
fi
@ -119,15 +111,15 @@
AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg="yes",)
AC_CHECK_LIB(vorbisfile, ov_info, have_vorbis="yes",, -lvorbis -logg)
@@ -727,6 +724,7 @@
OSDEPPLUGINS="$OSDEPPLUGINS plugins/vorbis.mdf";
@@ -756,6 +751,7 @@
AC_MSG_RESULT([compiling vorbis codec plugin])
fi
+fi
fi
+fi
ID3_LIBS=""
@@ -747,7 +745,7 @@
AC_CHECK_LIB(z, uncompress,
@@ -775,7 +771,7 @@
if test x$ARTSCCONFIG = x -o x$ARTSCCONFIG = x'"$ARTSCCONFIG"'; then
: # arts isn't installed
else
@ -136,7 +128,7 @@
AC_TRY_COMPILE([
#include <artsc.h>
],[
@@ -814,9 +812,9 @@
@@ -842,9 +838,9 @@
gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gdk_pixbuftest" = "xyes" ; then
@ -148,7 +140,7 @@
LIBS="$LIBS $GDK_PIXBUF_LIBS"
dnl
dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity
@@ -878,7 +876,7 @@
@@ -906,7 +902,7 @@
}
],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
@ -157,7 +149,7 @@
LIBS="$ac_save_LIBS"
fi
fi
@@ -897,7 +895,7 @@
@@ -925,7 +921,7 @@
:
else
echo "*** Could not run GDK_PIXBUF test program, checking why..."
@ -166,7 +158,7 @@
LIBS="$LIBS $GDK_PIXBUF_LIBS"
AC_TRY_LINK([
#include <stdio.h>
@@ -916,7 +914,7 @@
@@ -944,7 +940,7 @@
echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed"
echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you"
echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ])
@ -175,7 +167,7 @@
LIBS="$ac_save_LIBS"
fi
fi
@@ -928,8 +926,8 @@
@@ -956,8 +952,8 @@
AC_SUBST(GDK_PIXBUF_LIBS)
rm -f conf.gdk_pixbuftest
@ -186,7 +178,7 @@
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
@@ -939,7 +937,7 @@
@@ -967,7 +963,7 @@
echo "*** Download the library from "
echo "*** http://www.musicbrainz.org/download.html"
echo "***"

12
audio/zinf/files/patch-ac
View File

@ -1,18 +1,18 @@
--- Makefile.header.in.orig Mon Jun 24 08:44:27 2002
+++ Makefile.header.in Fri Oct 18 06:28:36 2002
@@ -70,9 +70,9 @@
--- Makefile.header.in.orig Wed Jan 1 08:37:26 2003
+++ Makefile.header.in Sat Jan 11 05:53:36 2003
@@ -71,9 +71,9 @@
OSDEPOBJ = @OSDEPOBJ@
-INCLUDES = -I. -I$(srcdir)/lib/gdbm -I$(srcdir)/base/include -I$(srcdir)/config -I$(srcdir)/io/include -I$(srcdir)/ui/include -I$(srcdir)/lmc/include -I$(srcdir)/io/soundcard/unix/$(UNIX_AUDIO_API)/include -I$(srcdir)/lmc/xingmp3/include -I$(srcdir)/lmc/cd/include -I$(srcdir)/plm/portable/pmp300/sba -I$(srcdir)/lib/xml/include -I$(srcdir)/lib/zlib/include -I$(srcdir)/lib/unzip/include -I$(srcdir)/io/cd/unix/include -I$(srcdir)/base/aps -I$(srcdir)/io/wavout/include -I$(srcdir)/ui/lcd/include -I$(srcdir)/ui/irman/include -I$(srcdir)/lib/http/include -I$(srcdir)/io/signature/include -I$(srcdir)/plm/metadata/id3v2 -I$(srcdir)/lmc/wav/include $(OSINC)
+INCLUDES = -I. -I$(srcdir)/lib/gdbm -I$(srcdir)/base/include -I$(srcdir)/config -I$(srcdir)/io/include -I$(srcdir)/ui/include -I$(srcdir)/lmc/include -I$(srcdir)/io/soundcard/unix/$(UNIX_AUDIO_API)/include -I$(srcdir)/lmc/xingmp3/include -I$(srcdir)/lmc/cd/include -I$(srcdir)/plm/portable/pmp300/sba -I$(srcdir)/lib/xml/include -I$(srcdir)/lib/zlib/include -I$(srcdir)/lib/unzip/include -I$(srcdir)/io/cd/unix/include -I$(srcdir)/base/aps -I$(srcdir)/io/wavout/include -I$(srcdir)/ui/lcd/include -I$(srcdir)/ui/irman/include -I$(srcdir)/lib/http/include -I$(srcdir)/io/signature/include -I$(srcdir)/lmc/wav/include $(OSINC)
-INCLUDES = -I. -I$(srcdir)/lib/gdbm -I$(srcdir)/base/include -I$(srcdir)/config -I$(srcdir)/io/include -I$(srcdir)/ui/include -I$(srcdir)/lmc/include -I$(srcdir)/io/soundcard/unix/$(UNIX_AUDIO_API)/include -I$(srcdir)/lmc/xingmp3/include -I$(srcdir)/lmc/cd/include -I$(srcdir)/plm/portable/pmp300/sba -I$(srcdir)/lib/xml/include -I$(srcdir)/lib/unzip/include -I$(srcdir)/io/cd/unix/include -I$(srcdir)/base/aps -I$(srcdir)/io/wavout/include -I$(srcdir)/ui/lcd/include -I$(srcdir)/ui/irman/include -I$(srcdir)/lib/http/include -I$(srcdir)/io/signature/include -I$(srcdir)/plm/metadata/id3v2 -I$(srcdir)/lmc/wav/include -I$(srcdir)/lib/utf8 $(OSINC)
+INCLUDES = -I. -I$(srcdir)/lib/gdbm -I$(srcdir)/base/include -I$(srcdir)/config -I$(srcdir)/io/include -I$(srcdir)/ui/include -I$(srcdir)/lmc/include -I$(srcdir)/io/soundcard/unix/$(UNIX_AUDIO_API)/include -I$(srcdir)/lmc/xingmp3/include -I$(srcdir)/lmc/cd/include -I$(srcdir)/plm/portable/pmp300/sba -I$(srcdir)/lib/xml/include -I$(srcdir)/lib/unzip/include -I$(srcdir)/io/cd/unix/include -I$(srcdir)/base/aps -I$(srcdir)/io/wavout/include -I$(srcdir)/ui/lcd/include -I$(srcdir)/ui/irman/include -I$(srcdir)/lib/http/include -I$(srcdir)/io/signature/include -I$(srcdir)/lmc/wav/include -I$(srcdir)/lib/utf8 $(OSINC)
-CXXFLAGS = $(EXTRA_CXXFLAGS)
+CXXFLAGS = @CXXFLAGS@ -D_REENTRANT
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(srcdir)/config/mkinstalldirs
CONFIG_HEADER = ./config/config.h
@@ -88,8 +88,8 @@
@@ -89,8 +89,8 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@

11
audio/zinf/files/patch-base-include-preferences.h Normal file
View File

@ -0,0 +1,11 @@
--- base/include/preferences.h.orig Wed Jan 1 08:33:21 2003
+++ base/include/preferences.h Sat Jan 18 04:26:42 2003
@@ -28,6 +28,8 @@
#include "config.h"
#include "errors.h"
+using namespace std;
+
// preferences
ZINF_EXPORT extern const char* kInstallDirPref;
ZINF_EXPORT extern const char* kLibraryPathPref;

11
audio/zinf/files/patch-base-unix-include-browser.h Normal file
View File

@ -0,0 +1,11 @@
--- base/unix/include/browser.h.orig Sun Dec 15 10:34:14 2002
+++ base/unix/include/browser.h Sat Jan 18 04:33:14 2003
@@ -8,6 +8,8 @@
#define BROWSER_H
#include <string>
+using namespace std;
+
typedef enum
{
eBrowserNetscape = 0,

13
audio/zinf/files/patch-installer-unix-linux-Zinf.desktop Normal file
View File

@ -0,0 +1,13 @@
--- installer/unix/linux/Zinf.desktop.orig Mon Jun 24 08:44:27 2002
+++ installer/unix/linux/Zinf.desktop Sat Jan 18 04:49:09 2003
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name[en_US.ISO8859-1]=Zinf
+Name=Zinf
Exec=zinf
-Icon=/usr/share/pixmaps/zinf.png
+Icon=zinf.png
Terminal=false
MultipleArgs=false
Type=Application

10
audio/zinf/files/patch-plm-metadata-id3lib-id3lib.cpp Normal file
View File

@ -0,0 +1,10 @@
--- plm/metadata/id3lib/id3lib.cpp.orig Mon Dec 16 17:34:16 2002
+++ plm/metadata/id3lib/id3lib.cpp Sat Jan 18 10:26:46 2003
@@ -31,7 +31,6 @@
#include <strings.h>
#endif
-#include "id3config.h"
#include "errors.h"
#include "utility.h"
#include "debug.h"

10
audio/zinf/files/patch-plm-metadata-vorbis-vorbis.cpp Normal file
View File

@ -0,0 +1,10 @@
--- plm/metadata/vorbis/vorbis.cpp.orig Wed Jan 1 08:29:35 2003
+++ plm/metadata/vorbis/vorbis.cpp Sat Jan 11 05:32:18 2003
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include <math.h>
#include <assert.h>
#include <string>

19
audio/zinf/files/patch-plm_metadata_id3v2_io__helpers.cpp
View File

@ -1,19 +0,0 @@
$FreeBSD$
--- plm/metadata/id3v2/io_helpers.cpp.orig Sat Dec 21 18:10:14 2002
+++ plm/metadata/id3v2/io_helpers.cpp Sat Dec 21 18:11:59 2002
@@ -290,11 +290,11 @@
return writer.writeChars(bytes, size);
}
-ID3_Writer::size_type io::writeTrailingSpaces(ID3_Writer& writer, String buf, size_t len)
+size_t io::writeTrailingSpaces(ID3_Writer& writer, String buf, size_t len)
{
ID3_Writer::pos_type beg = writer.getCur();
ID3_Writer::size_type strLen = buf.size();
- ID3_Writer::size_type size = min(len, strLen);
+ ID3_Writer::size_type size = min((unsigned int)len, (unsigned int)strLen);
writer.writeChars(buf.data(), size);
for (; size < len; ++size)
{

41
audio/zinf/files/patch-plm_metadata_id3v2_io__strings.h
View File

@ -1,41 +0,0 @@
$FreeBSD$
--- plm/metadata/id3v2/io_strings.h.orig Thu Jun 20 08:41:07 2002
+++ plm/metadata/id3v2/io_strings.h Sat Dec 21 17:30:55 2002
@@ -63,7 +63,7 @@
}
virtual size_type readChars(char_type buf[], size_type len)
{
- size_type size = min(len, _string.size() - _cur);
+ size_type size = min((unsigned int)len, (unsigned int)(_string.size() - _cur));
_string.copy(reinterpret_cast<String::value_type *>(buf), size, _cur);
_cur += size;
return size;
@@ -100,7 +100,7 @@
virtual size_type skipChars(size_type len)
{
- size_type size = min(len, _string.size() - _cur);
+ size_type size = min((unsigned int)len, (unsigned int)(_string.size() - _cur));
_cur += size;
return size;
}
@@ -133,7 +133,7 @@
}
virtual size_type readChars(char_type buf[], size_type len)
{
- size_type size = min(len, _string.size() - _cur);
+ size_type size = min((unsigned int)len, (unsigned int)(_string.size() - _cur));
_string.copy(reinterpret_cast<BString::value_type *>(buf), size, _cur);
_cur += size;
return size;
@@ -170,7 +170,7 @@
virtual size_type skipChars(size_type len)
{
- size_type size = min(len, _string.size() - _cur);
+ size_type size = min((unsigned int)len,(unsigned int)( _string.size() - _cur));
_cur += size;
return size;
}

21
audio/zinf/files/patch-zlib-infcodes.c
View File

@ -1,21 +0,0 @@
--- lib/zlib/src/infcodes.c.orig Thu Jun 20 08:40:24 2002
+++ lib/zlib/src/infcodes.c Sun Aug 4 16:45:11 2002
@@ -197,8 +197,18 @@
c->mode = COPY;
case COPY: /* o: copying bytes in window, waiting for space */
f = q - c->sub.copy.dist;
+#ifdef __FreeBSD__
+ {
+ /* Work-around for a FreeBSD gcc bug. */
+ volatile inflate_blocks_statef *s1 = s;
+
+ while (f < s1->window) /* modulo window size-"while" instead */
+ f += s1->end - s1->window; /* of "if" handles invalid distances */
+ }
+#else
while (f < s->window) /* modulo window size-"while" instead */
f += s->end - s->window; /* of "if" handles invalid distances */
+#endif
while (c->len)
{
NEEDOUT

67
audio/zinf/files/patch-zlib-inffast.c
View File

@ -1,67 +0,0 @@
--- lib/zlib/src/inffast.c.orig Thu Jun 20 08:40:24 2002
+++ lib/zlib/src/inffast.c Sun Aug 4 17:16:50 2002
@@ -1,5 +1,5 @@
/* inffast.c -- process literals and length/distance pairs fast
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2002 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -93,28 +93,41 @@
/* do the copy */
m -= c;
- if ((uInt)(q - s->window) >= d) /* offset before dest */
- { /* just copy */
- r = q - d;
- *q++ = *r++; c--; /* minimum count is three, */
- *q++ = *r++; c--; /* so unroll loop a little */
- }
- else /* else offset after destination */
+ r = q - d;
+ if (r < s->window) /* wrap if needed */
{
- e = d - (uInt)(q - s->window); /* bytes from offset to end */
- r = s->end - e; /* pointer to offset */
- if (c > e) /* if source crosses, */
+ do {
+ r += s->end - s->window; /* force pointer in window */
+ } while (r < s->window); /* covers invalid distances */
+ e = s->end - r;
+ if (c > e)
{
- c -= e; /* copy to end of window */
+ c -= e; /* wrapped copy */
do {
- *q++ = *r++;
+ *q++ = *r++;
} while (--e);
- r = s->window; /* copy rest from start of window */
+ r = s->window;
+ do {
+ *q++ = *r++;
+ } while (--c);
}
+ else /* normal copy */
+ {
+ *q++ = *r++; c--;
+ *q++ = *r++; c--;
+ do {
+ *q++ = *r++;
+ } while (--c);
+ }
+ }
+ else /* normal copy */
+ {
+ *q++ = *r++; c--;
+ *q++ = *r++; c--;
+ do {
+ *q++ = *r++;
+ } while (--c);
}
- do { /* copy all or what's left */
- *q++ = *r++;
- } while (--c);
break;
}
else if ((e & 64) == 0)

28
audio/zinf/files/patch-zlib-zconf.h
View File

@ -1,28 +0,0 @@
--- lib/zlib/include/zconf.h.orig Sun Aug 4 20:51:32 2002
+++ lib/zlib/include/zconf.h Sun Aug 4 20:53:27 2002
@@ -238,15 +238,25 @@
#ifdef HAVE_UNISTD_H
# include <sys/types.h> /* for off_t */
# include <unistd.h> /* for SEEK_* and off_t */
+#ifndef __FreeBSD__
# define z_off_t off_t
#endif
+#endif
#ifndef SEEK_SET
# define SEEK_SET 0 /* Seek from beginning of file. */
# define SEEK_CUR 1 /* Seek from current position. */
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
#endif
+#ifndef __FreeBSD__
#ifndef z_off_t
# define z_off_t long
+#endif
+#else
+/*
+ * This is hard-configured for FreeBSD, since zlib doesn't actually support
+ * using the system off_t for offsets unless off_t is no longer than long.
+ */
+#define z_off_t long
#endif
/* MVS linker does not support external names larger than 8 bytes */

3
audio/zinf/pkg-plist
View File

@ -6,8 +6,7 @@ lib/zinf/plugins/cd.pmo
lib/zinf/plugins/download.ui
%%ESOUND%%lib/zinf/plugins/esound.pmo
lib/zinf/plugins/httpinput.pmi
lib/zinf/plugins/id3v1.mdf
lib/zinf/plugins/id3v2.mdf
lib/zinf/plugins/id3lib.mdf
lib/zinf/plugins/irman.ui
lib/zinf/plugins/kjofol.ftf
lib/zinf/plugins/lcd.ui