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

Update to 2.2.3

Browse Source 
PR:		51670
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
This commit is contained in:
Tilman Keskinoz 2003-05-01 22:14:44 +00:00
parent df2218645e
commit e557d5bf4d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=79967
5 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/zinf/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= zinf
PORTVERSION= 2.2.2
PORTVERSION= 2.2.3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -17,8 +17,6 @@ COMMENT= GTK-based MP3 player
LIB_DEPENDS= id3-3.8.2:${PORTSDIR}/audio/id3lib \
musicbrainz.2:${PORTSDIR}/audio/musicbrainz
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_X_PREFIX= yes
USE_GNOME= gnomehier gdkpixbuf
WANT_GNOME= yes
@ -30,7 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS= -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include \
${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
LDFLAGS= -L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>

2
audio/zinf/distinfo
View File

@ -1 +1 @@
MD5 (zinf-2.2.2.tar.gz) = 8d1b58545854cd8eae79a0216c724e0c
MD5 (zinf-2.2.3.tar.gz) = 2eda6103c0287c7d4d591841e4898199

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

@ -1,6 +1,6 @@
--- configure.in.orig Wed Jan 1 08:37:26 2003
+++ configure.in Sat Jan 11 04:37:46 2003
@@ -172,8 +172,8 @@
--- configure.in.orig Mon Jan 20 02:04:10 2003
+++ configure.in Fri May 2 01:35:27 2003
@@ -182,8 +182,8 @@
;;
freebsd*)
host_os="freebsd"
@ -11,7 +11,7 @@
;;
netbsd*)
host_os="freebsd"
@@ -324,9 +324,9 @@
@@ -334,9 +334,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/'`
@ -23,7 +23,7 @@
LIBS="$LIBS $ESD_LIBS"
rm -f conf.esdtest
AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
@@ -385,7 +385,7 @@
@@ -395,7 +395,7 @@
}
],, have_esound=false, have_esound=false)
@ -32,7 +32,7 @@
LIBS="$ac_save_LIBS"
AC_LANG_RESTORE
rm -f conf.esdtest
@@ -474,9 +474,9 @@
@@ -502,9 +502,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/'`
@ -44,7 +44,7 @@
LIBS="$GTK_LIBS $LIBS"
AC_TRY_RUN([
@@ -503,7 +503,7 @@
@@ -531,7 +531,7 @@
gtk_major_version, gtk_minor_version, gtk_micro_version);
return 1;
}], , have_gtk=false, have_gtk=false])
@ -53,7 +53,7 @@
LIBS="$ac_save_LIBS"
if test "$have_gtk" = "false"; then
AC_MSG_RESULT(no)
@@ -524,7 +524,7 @@
@@ -552,7 +552,7 @@
OSINC="$OSINC -I$srcdir/ui/download/unix/include"
OSINC="$OSINC -I$srcdir/ui/musicbrowser/include"
OSINC="$OSINC -I$srcdir/ftc/kjofol"
@ -62,7 +62,7 @@
AC_DEFINE(HAVE_GTK)
else
GTK_CFLAGS=""
@@ -545,18 +545,10 @@
@@ -573,18 +573,10 @@
AC_SUBST(GTK_PREFIX)
AC_SUBST(EXTRALIBS)
@ -83,7 +83,7 @@
ORBIT_LIBS=""
ORBIT_IDL=""
@@ -680,7 +672,7 @@
@@ -708,7 +700,7 @@
alsa_min_major_version=0
alsa_min_minor_version=9
alsa_min_micro_version=0
@ -92,7 +92,7 @@
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lasound"
@@ -725,7 +717,7 @@
@@ -753,7 +745,7 @@
], , have_alsa=false, have_alsa=false
)
AC_LANG_RESTORE
@ -101,7 +101,7 @@
LIBS="$ac_save_LIBS"
if test "$have_alsa" = "false"; then
AC_MSG_RESULT(no)
@@ -745,6 +737,9 @@
@@ -773,6 +765,9 @@
AC_MSG_RESULT([compiling alsa pmo plugin])
fi
@ -111,7 +111,7 @@
AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg="yes",)
AC_CHECK_LIB(vorbisfile, ov_info, have_vorbis="yes",, -lvorbis -logg)
@@ -756,6 +751,7 @@
@@ -784,6 +779,7 @@
AC_MSG_RESULT([compiling vorbis codec plugin])
fi
fi
@ -119,7 +119,7 @@
ID3_LIBS=""
AC_CHECK_LIB(z, uncompress,
@@ -775,7 +771,7 @@
@@ -803,7 +799,7 @@
if test x$ARTSCCONFIG = x -o x$ARTSCCONFIG = x'"$ARTSCCONFIG"'; then
: # arts isn't installed
else
@ -128,7 +128,7 @@
AC_TRY_COMPILE([
#include <artsc.h>
],[
@@ -842,9 +838,9 @@
@@ -870,9 +866,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
@ -140,7 +140,7 @@
LIBS="$LIBS $GDK_PIXBUF_LIBS"
dnl
dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity
@@ -906,7 +902,7 @@
@@ -934,7 +930,7 @@
}
],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
@ -149,7 +149,7 @@
LIBS="$ac_save_LIBS"
fi
fi
@@ -925,7 +921,7 @@
@@ -953,7 +949,7 @@
:
else
echo "*** Could not run GDK_PIXBUF test program, checking why..."
@ -158,7 +158,7 @@
LIBS="$LIBS $GDK_PIXBUF_LIBS"
AC_TRY_LINK([
#include <stdio.h>
@@ -944,7 +940,7 @@
@@ -972,7 +968,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" ])
@ -167,7 +167,7 @@
LIBS="$ac_save_LIBS"
fi
fi
@@ -956,8 +952,8 @@
@@ -984,8 +980,8 @@
AC_SUBST(GDK_PIXBUF_LIBS)
rm -f conf.gdk_pixbuftest
@ -178,12 +178,12 @@
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
@@ -967,7 +963,7 @@
@@ -995,7 +991,7 @@
echo "*** Download the library from "
echo "*** http://www.musicbrainz.org/download.html"
echo "***"
- AC_MSG_ERROR(Cannot continue.)],-ldl -lm -lstdc++)
+ AC_MSG_ERROR(Cannot continue.)],-lm -lstdc++)
- AC_MSG_ERROR(Cannot continue.)],-ldl -lm -lstdc++)
+ AC_MSG_ERROR(Cannot continue.)],-lm -lstdc++)
AC_LANG_RESTORE
AC_CONFIG_HEADER(config/config.h)

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

@ -1,18 +1,18 @@
--- 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 @@
--- Makefile.header.in.orig Thu Jan 16 18:32:00 2003
+++ Makefile.header.in Fri May 2 01:38:08 2003
@@ -73,9 +73,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/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
-CXXFLAGS = -Werror $(EXTRA_CXXFLAGS)
+CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(srcdir)/config/mkinstalldirs
CONFIG_HEADER = ./config/config.h
@@ -89,8 +89,8 @@
@@ -91,8 +91,8 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@

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

@ -1,11 +0,0 @@
--- 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;