aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia/xmms
diff options
context:
space:
mode:
authorkan <kan@FreeBSD.org>2004-03-11 23:08:14 +0800
committerkan <kan@FreeBSD.org>2004-03-11 23:08:14 +0800
commit370345106a6b93e64ade7e4df607b0e880fc53a9 (patch)
tree44b8512172b6e718bcac749e9d8f5dee394930ee /multimedia/xmms
parent207bba47bcc4e7f4f2fffc23d247381d5086ebc7 (diff)
downloadfreebsd-ports-graphics-370345106a6b93e64ade7e4df607b0e880fc53a9.tar.gz
freebsd-ports-graphics-370345106a6b93e64ade7e4df607b0e880fc53a9.tar.zst
freebsd-ports-graphics-370345106a6b93e64ade7e4df607b0e880fc53a9.zip
Unbreak WITH_ENCODING_PATCH by updating it to version 27.3.
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 ec0c490b85f..6ee2042c6a7 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 f29cda908c1..00000000000
--- 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);