Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Aug 2013 01:49:13 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        vg@FreeBSD.org
Subject:   ports/181180: [PATCH] audio/gvolwheel: trim USES, NLS, add docs, desktop file
Message-ID:  <0MLOMM-1V8UOc1NmE-000gL0@mail.gmx.com>
Resent-Message-ID: <201308092350.r79No0g8016734@freefall.freebsd.org>

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

>Number:         181180
>Category:       ports
>Synopsis:       [PATCH] audio/gvolwheel: trim USES, NLS, add docs, desktop file
>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 Aug 09 23:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p17 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p17 FreeBSD 9.1-RELEASE-p17 #0: Sun Jul 28 00:39:53 UTC 2013
>Description:

- Bump portrevision
- USES gmake pkgconfig pathfix icon
- Add docs
- Trim NLS
- Add DOCS and NLS Option
- Add Desktop entry file
- Add patch linux/soundcard --> sys/soundcard
- Add Icons
- Trim WWW
- Trim pkg-plist, remove docs

Added file(s):
files/patch-Makefile.in
files/pkg-message.in

Port maintainer (vg@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20130804004601-32886/

>Fix:

--- gvolwheel-1.0_1.patch begins here ---
diff -ruN /usr/ports/audio/gvolwheel/Makefile ./Makefile
--- /usr/ports/audio/gvolwheel/Makefile	2013-07-24 11:13:12.000000000 +0200
+++ ./Makefile	2013-08-04 00:45:22.000000000 +0200
@@ -3,6 +3,7 @@
 
 PORTNAME=	gvolwheel
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -15,26 +16,37 @@
 
 CONFIGURE_ARGS+=--enable-oss
 GNU_CONFIGURE=	yes
-USES=		pkgconfig pathfix iconv
-USE_GMAKE=	yes
+USES=		gmake pkgconfig pathfix iconv
 USE_GNOME=	gtk30
 
-OPTIONS_DEFINE=	NLS
-NLS_DESC=	Native language support
+PORTDOCS=	AUTHORS ChangeLog README
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
-USES+=		gettext
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
+
+SUB_FILES=	pkg-message
 
-pre-configure:
-	${ECHO} "${DOCSDIR}"
+DESKTOP_ENTRIES="GVolWheel" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "GTK;AudioVideo;Audio;Mixer;" true
+
+.include <bsd.port.options.mk>
+
+post-patch:
 	${REINPLACE_CMD} -e 's|linux/soundcard|sys/soundcard|g' \
 		${WRKSRC}/src/callbacks.c ${WRKSRC}/src/actions.c
 
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+	${LN} -sf ${PREFIX}/share/pixmaps/gvolwheel/audio-volume-high.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
+
 .include <bsd.port.mk>
diff -ruN /usr/ports/audio/gvolwheel/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/audio/gvolwheel/files/patch-Makefile.in	2013-06-02 19:00:34.000000000 +0200
+++ ./files/patch-Makefile.in	2013-08-03 17:40:09.000000000 +0200
@@ -1,11 +1,18 @@
---- Makefile.in.orig	2010-04-03 19:20:45.000000000 +0800
-+++ Makefile.in	2010-06-08 13:08:12.000000000 +0800
-@@ -268,7 +268,7 @@
+--- Makefile.in.orig	2012-04-08 00:37:17.000000000 +0200
++++ Makefile.in	2013-08-03 17:39:52.000000000 +0200
+@@ -315,14 +315,8 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = src po 
 -gvolwheeldocdir = ${prefix}/doc/gvolwheel
 +gvolwheeldocdir = ${prefix}/share/doc/gvolwheel
  gvolwheeldoc_DATA = \
- 	README\
- 	COPYING\
+-	README\
+-	COPYING\
+-	AUTHORS\
+-	ChangeLog\
+-	INSTALL\
+-	NEWS 
+ 
+ EXTRA_DIST = $(gvolwheeldoc_DATA) \
+ 	$(intltool_DATA)\
diff -ruN /usr/ports/audio/gvolwheel/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/audio/gvolwheel/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/pkg-message.in	2013-08-03 18:21:59.000000000 +0200
@@ -0,0 +1,21 @@
+===============================================================================
+
+GVolWheel has been installed.
+
+
+You could adjust which mixer you wish to use with
+
+GVolWheel / Preferences / Default mixer
+
+
+Default is used ALSA with
+
+    gnome-alsamixer
+
+
+You could use aumix with similar settings
+
+    aumix -d /dev/mixer2 -I
+
+
+===============================================================================
diff -ruN /usr/ports/audio/gvolwheel/pkg-descr ./pkg-descr
--- /usr/ports/audio/gvolwheel/pkg-descr	2013-06-02 19:00:34.000000000 +0200
+++ ./pkg-descr	2013-08-03 16:47:28.000000000 +0200
@@ -3,4 +3,4 @@
 through a tray icon you can scroll on. Easily integrate with minimal
 desktops (Openbox,IceWM,XFCE etc).
 
-WWW:	http://sourceforge.net/projects/gvolwheel/
+WWW: http://sourceforge.net/projects/gvolwheel/
diff -ruN /usr/ports/audio/gvolwheel/pkg-plist ./pkg-plist
--- /usr/ports/audio/gvolwheel/pkg-plist	2013-06-02 19:00:34.000000000 +0200
+++ ./pkg-plist	2013-08-03 22:30:49.000000000 +0200
@@ -1,14 +1,8 @@
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%NLS%%share/locale/ru/LC_MESSAGES/gvolwheel.mo
 bin/gvolwheel
+%%NLS%%share/locale/ru/LC_MESSAGES/gvolwheel.mo
+share/pixmaps/gvolwheel.png
 share/pixmaps/gvolwheel/audio-volume-high.png
 share/pixmaps/gvolwheel/audio-volume-low.png
 share/pixmaps/gvolwheel/audio-volume-medium.png
 share/pixmaps/gvolwheel/audio-volume-muted.png
-@dirrm %%DOCSDIR%%
 @dirrm share/pixmaps/gvolwheel
--- gvolwheel-1.0_1.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?0MLOMM-1V8UOc1NmE-000gL0>