aboutsummaryrefslogtreecommitdiff
path: root/multimedia/xmms
diff options
context:
space:
mode:
authorAlexander Kabaev <kan@FreeBSD.org>2004-03-11 15:08:14 +0000
committerAlexander Kabaev <kan@FreeBSD.org>2004-03-11 15:08:14 +0000
commitb884dfb82601b05e0c19a78796387ad4bf64bc91 (patch)
treef545c295d4f0ecf6a9db2344d1da906c2300bc5b /multimedia/xmms
parent2d9da4bfe7f7dd4110889920ec1dab10c8cc148e (diff)
downloadports-b884dfb82601b05e0c19a78796387ad4bf64bc91.tar.gz
ports-b884dfb82601b05e0c19a78796387ad4bf64bc91.zip
Unbreak WITH_ENCODING_PATCH by updating it to version 27.3.
Notes
Notes: svn path=/head/; revision=103659
Diffstat (limited to 'multimedia/xmms')
-rw-r--r--multimedia/xmms/Makefile4
-rw-r--r--multimedia/xmms/files/Input-vorbis-fileinfo.c.diff19
2 files changed, 1 insertions, 22 deletions
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index ec0c490b85f0..6ee2042c6a7e 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -45,8 +45,7 @@ PLIST_SUB= DATADIR="share"
CONFIGURE_ARGS+= --enable-ipv6
.if defined(WITH_ENCODING_PATCH)
-BROKEN= Patch does not build with xmms version 1.2.10
-ENC_PATCHLEVEL= 27
+ENC_PATCHLEVEL= 27.3
DISTFILES+= ${PORTNAME}-${PORTVERSION}-recode-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
MASTER_SITE_SUBDIR+= rusxmms/:enc
@@ -123,7 +122,6 @@ pre-extract:
post-patch:
.if defined(WITH_ENCODING_PATCH)
@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/xmms-ds-recode.patch
- @${PATCH} -s -p0 -d ${WRKSRC} < ${FILESDIR}/Input-vorbis-fileinfo.c.diff
.endif
@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
's|\(datadir\)/aclocal|(prefix)/share/aclocal|g'
diff --git a/multimedia/xmms/files/Input-vorbis-fileinfo.c.diff b/multimedia/xmms/files/Input-vorbis-fileinfo.c.diff
deleted file mode 100644
index f29cda908c1f..000000000000
--- a/multimedia/xmms/files/Input-vorbis-fileinfo.c.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- Input/vorbis/fileinfo.c.orig Thu Feb 5 02:42:36 2004
-+++ Input/vorbis/fileinfo.c Thu Feb 5 02:43:19 2004
-@@ -455,6 +455,7 @@
- gchar *description, *version, *isrc, *copyright, *organization;
- gchar *location;
- gchar *rg_track_gain, *rg_album_gain, *rg_track_peak, *rg_album_peak;
-+ gchar *cfilename;
-
- gint time, minutes, seconds, bitrate, rate, channels, filesize, i;
-
-@@ -916,7 +917,7 @@
- gtk_entry_set_text(GTK_ENTRY(isrc_entry), isrc);
- gtk_entry_set_text(GTK_ENTRY(location_entry), location);
- #endif
-- gchar *cfilename=xmms_charset_recode_fsout(vte.filename,0,NULL);
-+ cfilename=xmms_charset_recode_fsout(vte.filename,0,NULL);
- if (cfilename) {
- gtk_entry_set_text(GTK_ENTRY(filename_entry), cfilename);
- g_free(cfilename);