ports/179152: [PATCH] multimedia/quark: Trim docs, pkg-descr, add NLS Option
nemysis
nemysis at gmx.ch
Fri May 31 18:10:01 UTC 2013
>Number: 179152
>Category: ports
>Synopsis: [PATCH] multimedia/quark: Trim docs, pkg-descr, add NLS Option
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri May 31 18:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013
>Description:
- Trim comment
- Trim docs
- Comply with OptionsNG
- Add NLS Option
- Use REINPLACE_CMD instead of simple patches
- Trim pkg-descr
- Make portlint happy
Removed file(s):
- files/patch-charm-quark::charm-quark
Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- quark-3.24_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/multimedia/quark/Makefile ./Makefile
--- /usr/ports/multimedia/quark/Makefile 2013-04-26 16:36:56.000000000 +0200
+++ ./Makefile 2013-05-31 19:50:09.000000000 +0200
@@ -8,43 +8,52 @@
MASTER_SITES= http://hsgg.github.com/quark/
MAINTAINER= ports at FreeBSD.org
-COMMENT= An audio player, for geeks, by geeks
-
-LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine
+COMMENT= Audio player, for geeks, by geeks
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-USES= pathfix gettext
+LIB_DEPENDS= xine:${PORTSDIR}/multimedia/libxine
+
+USES= pathfix
USE_GNOME= gnomeprefix gnomevfs2
-USE_GMAKE= yes
GNU_CONFIGURE= yes
+USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_JOBS_SAFE= yes
-PORTDOCS= AUTHORS COPYING INSTALL README
+PORTDOCS= AUTHORS README
GCONF_SCHEMAS= quark.schemas strange-quark.schemas
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
+OPTIONS_DEFINE= NLS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
post-patch:
- @${REINPLACE_CMD} -e \
- 's|CFLAGS="-g |CFLAGS="$$CFLAGS |g' ${WRKSRC}/configure
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
- 's|-D.*_DISABLE_DEPRECATED||g'
+ @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' ${WRKSRC}/charm-quark/charm-quark
+ @${REINPLACE_CMD} -e 's|CFLAGS="-g |CFLAGS="$$CFLAGS |g' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} \
+ -e 's|-D.*_DISABLE_DEPRECATED||g' \
+ ${WRKSRC}/strange-quark/Makefile.in ${WRKSRC}/quark/Makefile.in
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif
+
+ @${ECHO_CMD}
@${CAT} ${PKGMESSAGE}
+ @${ECHO_CMD}
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/multimedia/quark/files/patch-charm-quark::charm-quark ./files/patch-charm-quark::charm-quark
--- /usr/ports/multimedia/quark/files/patch-charm-quark::charm-quark 2013-01-14 17:54:56.000000000 +0100
+++ ./files/patch-charm-quark::charm-quark 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
---- charm-quark/charm-quark.orig Mon Jul 21 02:39:44 2003
-+++ charm-quark/charm-quark Mon Jul 21 02:41:04 2003
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /bin/sh
-
- NAME="charm-quark"
- VERSION="1.0"
diff -ruN --exclude=CVS /usr/ports/multimedia/quark/pkg-descr ./pkg-descr
--- /usr/ports/multimedia/quark/pkg-descr 2013-01-14 17:54:56.000000000 +0100
+++ ./pkg-descr 2013-05-31 19:52:42.000000000 +0200
@@ -1,9 +1,11 @@
Quark is an audio player, for geeks, by geeks. It runs in the background
with access provided via a FIFO in the filesystem. It uses Xine-lib
-for playing music, and can therefore play any file format supported
-by Xine.
+for playing music, and can therefore play any file format supported
+by Xine.
-Quark comes with a couple front-ends to make it more useful.
+Quark comes with a couple front-ends to make it more useful.
- - charm-quark - a CLI interface
- - strange-quark - a GTK System Tray interface
+ - charm-quark - a CLI interface
+ - strange-quark - a GTK System Tray interface
+
+WWW: http://hsgg.github.com/quark/
diff -ruN --exclude=CVS /usr/ports/multimedia/quark/pkg-plist ./pkg-plist
--- /usr/ports/multimedia/quark/pkg-plist 2013-01-14 17:54:56.000000000 +0100
+++ ./pkg-plist 2013-03-30 20:38:19.000000000 +0100
@@ -2,7 +2,7 @@
bin/quark
bin/strange-quark
share/applications/quark.desktop
+%%NLS%%share/locale/ko/LC_MESSAGES/quark.mo
share/pixmaps/quark.png
share/pixmaps/quark48.png
-%%NLS%%share/locale/ko/LC_MESSAGES/quark.mo
@dirrmtry share/applications
--- quark-3.24_4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list