ports/78865: [MAINTAINER] audio/ncmpc: Fix dependency on glib2

[Mark Daniel Reidel]

>Number:         78865
>Category:       ports
>Synopsis:       [MAINTAINER] audio/ncmpc: Fix dependency on glib2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 15 13:30:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Mark Daniel Reidel
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD raffi.reidel.info 5.3-STABLE FreeBSD 5.3-STABLE #3: Mon Feb 21 06:51:20 CET 2005
>Description:
Fixed the direct dependency with LIB_DEPENDS on glib2 using USE_GNOME instead. Otherwise, the upgrade-process will break.
Additionally move the pkg-plist into Makefile and incorporate a patch by Adam Klunick to add the new "-m"-switch to the documentation.

Added file(s):
- files/patch-doc-ncmpc.1.diff

Removed file(s):
- pkg-plist
>How-To-Repeat:
>Fix:

--- ncmpc-0.11.1_1.patch begins here ---
diff -ruN --exclude=CVS /tmp/portbk/audio/ncmpc/Makefile /usr/ports/audio/ncmpc/Makefile
--- /tmp/portbk/audio/ncmpc/Makefile	Tue Mar 15 14:22:58 2005
+++ /usr/ports/audio/ncmpc/Makefile	Tue Mar 15 14:18:54 2005
@@ -15,8 +15,7 @@
 MAINTAINER=	ports at mark.reidel.info
 COMMENT=	Ncurses client for the musicpd
 
-LIB_DEPENDS=	glib-2.0.400:${PORTSDIR}/devel/glib20
-
+USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
@@ -28,13 +27,21 @@
 .include <bsd.port.pre.mk>
 
 USE_ICONV=	yes
+PLIST_FILES=bin/ncmpc
+PLIST_DIRS=%%EXAMPLESDIR%%
+PLIST_FILES+=%%EXAMPLESDIR%%/config
+PLIST_FILES+=%%EXAMPLESDIR%%/keys
+PLIST_FILES+=%%EXAMPLESDIR%%/ncmpc.lirc
 
 .ifdef(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
 .else
 USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
+LANGUAGES=de sv es ru fr
+.for language in ${LANGUAGES}
+PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo
+.endfor
+
 .endif
 
 .if !defined(WITHOUT_CLOCK_SCREEN)
@@ -51,7 +58,7 @@
 	${INSTALL_DATA} ${WRKSRC}/doc/ncmpc.lirc ${EXAMPLESDIR}/
 	${INSTALL_MAN} ${WRKSRC}/doc/ncmpc.1 ${MAN1PREFIX}/man/man1/
 .if !defined(WITHOUT_NLS)
-.for language in de sv es ru fr
+.for language in ${LANGUAGES}
 	${MKDIR} ${LOCALBASE}/share/locale/${language}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${language}.gmo ${PREFIX}/share/locale/${language}/LC_MESSAGES/ncmpc.mo
 .endfor
diff -ruN --exclude=CVS /tmp/portbk/audio/ncmpc/files/patch-doc-ncmpc.1.diff /usr/ports/audio/ncmpc/files/patch-doc-ncmpc.1.diff
--- /tmp/portbk/audio/ncmpc/files/patch-doc-ncmpc.1.diff	Thu Jan  1 01:00:00 1970
+++ /usr/ports/audio/ncmpc/files/patch-doc-ncmpc.1.diff	Tue Mar 15 14:07:35 2005
@@ -0,0 +1,25 @@
+--- 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 -ruN --exclude=CVS /tmp/portbk/audio/ncmpc/pkg-plist /usr/ports/audio/ncmpc/pkg-plist
--- /tmp/portbk/audio/ncmpc/pkg-plist	Tue Mar 15 14:22:58 2005
+++ /usr/ports/audio/ncmpc/pkg-plist	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
-bin/ncmpc
-%%EXAMPLESDIR%%/config
-%%EXAMPLESDIR%%/keys
-%%EXAMPLESDIR%%/ncmpc.lirc
-%%NLS%%share/locale/de/LC_MESSAGES/ncmpc.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ncmpc.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ncmpc.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ncmpc.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ncmpc.mo
- at dirrm %%EXAMPLESDIR%%
--- ncmpc-0.11.1_1.patch ends here ---

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