Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Jan 2009 23:15:31 +0100 (CET)
From:      Henrik Friedrichsen <hrkfdn@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/130173: [UPDATE] audio/ncmpc to 0.12
Message-ID:  <200901042215.n04MFVF3049967@canaan.megawr.ath.cx>
Resent-Message-ID: <200901042220.n04MK0bw087555@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         130173
>Category:       ports
>Synopsis:       [UPDATE] audio/ncmpc to 0.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 04 22:20:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Henrik Friedrichsen
>Release:        FreeBSD 7.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD canaan.megawr.ath.cx 7.1-RELEASE FreeBSD 7.1-RELEASE #0: Sun Jan 4 20:18:09 CET 2009 root@canaan.megawr.ath.cx:/usr/obj/usr/src/sys/PLUTONIUM i386


	
>Description:
Ncmpc was originally developed by Kalle Wallin. After Kalle has been unreachable for several years, Max Kellermann has picked up the project in mid-2008.
This patch makes the port use the version developed by Max Kellerman, which is being actively developed. It has a lot more translations, a bunch of bugfixes,
improved NLS and other features.

See also: http://mpd.wikia.com/wiki/Client:Ncmpc
>How-To-Repeat:
	
>Fix:

	

--- ncmpc.patch begins here ---
diff -Naur ./Makefile ../ncmpc/Makefile
--- ./Makefile	2009-01-04 22:49:32.000000000 +0100
+++ ../ncmpc/Makefile	2009-01-04 23:08:52.000000000 +0100
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	ncmpc
-PORTVERSION=	0.11.1
-PORTREVISION=	3
+PORTVERSION=	0.12
 CATEGORIES=	audio
-MASTER_SITES=	http://hem.bredband.net/kaw/ncmpc/files/ \
-		http://mercury.chem.pitt.edu/~shank/
-
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	musicpd
 MAINTAINER=	ports@mark.reidel.info
 COMMENT=	Ncurses client for the musicpd
 
@@ -20,9 +18,7 @@
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-OPTIONS=	NLS "Native language support" on \
-		CLOCK_SCREEN "Enable clock screen" on \
-		SEARCH_SCREEN "Enable search screen" on
+OPTIONS=	NLS "Native language support" on
 
 .include <bsd.port.pre.mk>
 
@@ -37,21 +33,13 @@
 CONFIGURE_ARGS+=--disable-nls
 .else
 USE_GETTEXT=	yes
-LANGUAGES=de sv es ru fr
+LANGUAGES=da de es fr gl hu no ru sk sv
 .for language in ${LANGUAGES}
 PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo
 .endfor
 
 .endif
 
-.if !defined(WITHOUT_CLOCK_SCREEN)
-CONFIGURE_ARGS+=--enable-clock-screen
-.endif
-
-.if !defined(WITHOUT_SEARCH_SCREEN)
-CONFIGURE_ARGS+=--enable-search-screen
-.endif
-
 MAN1=		ncmpc.1
 
 do-install:
diff -Naur ./distinfo ../ncmpc/distinfo
--- ./distinfo	2009-01-04 22:49:32.000000000 +0100
+++ ../ncmpc/distinfo	2009-01-04 22:51:00.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (ncmpc-0.11.1.tar.gz) = c90668b12f3676c73913a863482ec405
-SHA256 (ncmpc-0.11.1.tar.gz) = aa0a6162e8543e01304f7dc2f6b227babebda9f2430664e6deae0277444cb817
-SIZE (ncmpc-0.11.1.tar.gz) = 273489
+MD5 (ncmpc-0.12.tar.gz) = 8a7cff66c859d037bda735662313d4b0
+SHA256 (ncmpc-0.12.tar.gz) = 5d09205ef4c66715c84f0859f0d01dd946bfc586339f1da0b6825a030307db4a
+SIZE (ncmpc-0.12.tar.gz) = 252763
diff -Naur ./files/patch-doc-ncmpc.1.diff ../ncmpc/files/patch-doc-ncmpc.1.diff
--- ./files/patch-doc-ncmpc.1.diff	2009-01-04 22:49:32.000000000 +0100
+++ ../ncmpc/files/patch-doc-ncmpc.1.diff	1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
---- doc/ncmpc.1	Mon Mar  7 03:02:10 2005
-+++ doc/ncmpc.1	Mon Mar  7 03:26:54 2005
-@@ -54,6 +54,12 @@
- .B \-P, \-\-key\-file=FILE
- Read key bindings from FILE.
- .TP 
-+.B \-m, \-\-mouse
-+Enable ncurses mouse events.
-+.TP
-+.B \-M, \-\-no\-mouse 
-+Disable ncurses mouse events.
-+.TP
- Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options.
- .SH "CONFIGURATION"
- When ncmpc start it tries to read user setting from the ~/ncmpc/config file. If no user configuration is found ncmpc tries to load global settings from $SYSCONFDIR/ncmpc/config (the actual path is displayed on the help screen). An example configuration file (config.sample) should be provided with ncmpc.
-@@ -72,6 +78,9 @@
- .B wide\-cursor = yes|no
- Make the cursor as wide as the screen.
- .TP 
-+.B enable\-mouse = yes|no
-+Ncurses mouse events.
-+.TP
- .B wrap\-around = yes|no
- Wrapped cursor movement.
- .TP 
diff -Naur ./files/patch-po-ru.po ../ncmpc/files/patch-po-ru.po
--- ./files/patch-po-ru.po	2009-01-04 22:49:32.000000000 +0100
+++ ../ncmpc/files/patch-po-ru.po	1970-01-01 01:00:00.000000000 +0100
@@ -1,194 +0,0 @@
---- po/ru.po	Sun Jan 23 18:37:43 2005
-+++ po/ru.po	Sun Nov 12 20:28:22 2006
-@@ -3,16 +3,17 @@
- # This file is distributed under the same license as the ncmpc package.
- # Nikolay Pavlov <quetzal@roks.biz>, 2004.
- #, fuzzy
-+# Modified by Alexey Ivanov aka LexxTheFox <lexx@orenubrg.rfn.ru>
- msgid ""
- msgstr ""
- "Project-Id-Version: ncmpc 0.11.0\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-01-04 21:55+0100\n"
- "PO-Revision-Date: 2004-12-29 09:40+0200\n"
--"Last-Translator: Nikolay Pavlov <quetzal@roks.biz>\n"
-+"Last-Translator: Alexey Ivanov aka LexxTheFox <lexx@orenubrg.rfn.ru>\n"
- "Language-Team: ru <ru@li.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=ISO-8859-1\n"
-+"Content-Type: text/plain; charset=koi8-r\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
- #: src/ncmpc.h:36
-@@ -30,7 +31,7 @@
- #: src/main.c:266
- #, c-format
- msgid "Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"
--msgstr "Ошибка: MPD версия %d.%d.%d устарела (необходимо 0.11.0).\n"
-+msgstr "Ошибка: MPD версии %d.%d.%d устарел (необходим 0.11.0).\n"
- 
- #: src/main.c:318
- #, c-format
-@@ -69,7 +70,7 @@
- 
- #: src/screen.c:271
- msgid "Playing:"
--msgstr "Проигрываеться:"
-+msgstr "Проигрывается:"
- 
- #: src/screen.c:274
- msgid "[Paused]"
-@@ -98,7 +99,7 @@
- #: src/screen.c:652
- #, c-format
- msgid "Crossfade %d seconds"
--msgstr "Ознакомление %d секунд"
-+msgstr "Кроссфейд %d секунд"
- 
- #: src/screen.c:655
- msgid "Database updated!"
-@@ -138,7 +139,7 @@
- 
- #: src/screen_utils.c:38
- msgid "Find: "
--msgstr "Поиск: "
-+msgstr "Искать: "
- 
- #: src/screen_utils.c:39
- msgid "Find backward: "
-@@ -179,7 +180,7 @@
- #: src/screen_play.c:326
- #, c-format
- msgid "Playlist on %s"
--msgstr "Плайлист в %s"
-+msgstr "Плейлист в %s"
- 
- #: src/screen_file.c:282
- #, c-format
-@@ -216,7 +217,7 @@
- 
- #: src/screen_file.c:658
- msgid "Screen updated!"
--msgstr "Экран обновляеться!"
-+msgstr "Экран обновляется!"
- 
- #: src/screen_file.c:665
- #, c-format
-@@ -229,7 +230,7 @@
- 
- #: src/screen_search.c:51
- msgid "Artist"
--msgstr "Артист"
-+msgstr "Автор"
- 
- #: src/screen_search.c:52
- msgid "Album"
-@@ -246,12 +247,12 @@
- #: src/screen_search.c:162
- #, c-format
- msgid "Press %s for a new search"
--msgstr ""
-+msgstr "Нажмите %s чтобы начать новый поиск"
- 
- #: src/screen_search.c:214
- #, c-format
- msgid "Search: Results for %s [%s]"
--msgstr ""
-+msgstr "Результаты поиска $s [$s]"
- 
- #: src/screen_search.c:218
- #, c-format
-@@ -265,19 +266,19 @@
- 
- #: src/screen_keydef.c:46
- msgid "===> Apply & Save key bindings  "
--msgstr "===> Применить & Сохранить новые клавиши  "
-+msgstr "===> Применить и сохранить новые комбинации клавиш  "
- 
- #: src/screen_keydef.c:47
- msgid "===> Apply key bindings "
--msgstr "===> Применить новые клавиши "
-+msgstr "===> Применить новые комбинации клавиш "
- 
- #: src/screen_keydef.c:76
- msgid "You have new key bindings!"
--msgstr "У вас есть новые клавиши!"
-+msgstr "У вас есть новые комбинации клавиш!"
- 
- #: src/screen_keydef.c:79
- msgid "Keybindings unchanged."
--msgstr "Настройки не изменились."
-+msgstr "Настройки клавиатурных комбинаций не изменились."
- 
- #: src/screen_keydef.c:90
- #, c-format
-@@ -301,7 +302,7 @@
- #: src/screen_keydef.c:155
- #, c-format
- msgid "Enter new key for %s: "
--msgstr "Введите новую клавишу для %s"
-+msgstr "Введите новую комбинацию для %s"
- 
- #: src/screen_keydef.c:168
- #, c-format
-@@ -324,16 +325,16 @@
- 
- #: src/screen_keydef.c:283
- msgid "Note: Did you forget to 'Apply' your changes?"
--msgstr "Внимание: Вы не забыли 'Применить' ваши изменения?"
-+msgstr "Внимание: Вы не забыли Применить ваши изменения?"
- 
- #: src/screen_keydef.c:290
- msgid "Edit key bindings"
--msgstr "Редактировать клавиши"
-+msgstr "Редактировать клавиатурные комбинации"
- 
- #: src/screen_keydef.c:292
- #, c-format
- msgid "Edit keys for %s"
--msgstr "Редактировать клавиши для %s"
-+msgstr "Редактировать комбинацию для %s"
- 
- #: src/screen_clock.c:154
- msgid "Clock"
-@@ -341,7 +342,7 @@
- 
- #: src/screen_help.c:43
- msgid "Keys - Movement"
--msgstr "Команды - Перемещения"
-+msgstr "Команды - Перемещение"
- 
- #: src/screen_help.c:68
- msgid "Keys - Global"
-@@ -349,11 +350,11 @@
- 
- #: src/screen_help.c:95
- msgid "Keys - Playlist screen"
--msgstr "Команды - Экран Плейлист"
-+msgstr "Команды - Экран Плейлиста"
- 
- #: src/screen_help.c:97
- msgid "Play"
--msgstr "Проигрывать"
-+msgstr "Воспроизведение"
- 
- #: src/screen_help.c:100
- msgid "Move song up"
-@@ -433,7 +434,7 @@
- 
- #: src/command.c:94
- msgid "Playlist screen"
--msgstr "Экран Плейлист"
-+msgstr "Экран Плейлиста"
- 
- #: src/command.c:96
- msgid "Browse screen"
-@@ -441,7 +442,7 @@
- 
- #: src/command.c:101
- msgid "Play/Enter directory"
--msgstr "Проигрывать/Прейти в директорию"
-+msgstr "Воспроизвести/Прейти в директорию"
- 
- #: src/command.c:103
- msgid "Pause"
diff -Naur ./files/patch-support.h ../ncmpc/files/patch-support.h
--- ./files/patch-support.h	1970-01-01 01:00:00.000000000 +0100
+++ ../ncmpc/files/patch-support.h	2009-01-04 22:53:18.000000000 +0100
@@ -0,0 +1,10 @@
+--- src/_support.h	2009-01-04 22:52:35.000000000 +0100
++++ src/support.h	2009-01-04 22:52:42.000000000 +0100
+@@ -5,7 +5,6 @@
+ 
+ #include <glib.h>
+ 
+-const char *strcasestr(const char *haystack, const char *needle);
+ 
+ #ifndef NCMPC_MINI
+ 
diff -Naur ./pkg-descr ../ncmpc/pkg-descr
--- ./pkg-descr	2009-01-04 22:49:32.000000000 +0100
+++ ../ncmpc/pkg-descr	2009-01-04 23:08:22.000000000 +0100
@@ -2,4 +2,4 @@
 ncmpc connects to a musicpd running on a machine via a network.
 The interface was inspired by cplay.
 
-WWW:	http://hem.bredband.net/kaw/ncmpc/
+WWW:	http://mpd.wikia.com/wiki/Client:Ncmpc
--- ncmpc.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901042215.n04MFVF3049967>