ports/184499: [patch] audio/easytag fix dependences, support staging

Wed Dec 4 19:40:00 UTC 2013

>Number:         184499
>Category:       ports
>Synopsis:       [patch] audio/easytag fix dependences, support staging
>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:   Wed Dec 04 19:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Vladimir Kondratiev
>Release:        
>Organization:
>Environment:
>Description:
1. easytag depends on taglib not on mp4v2 since 2.1.8
2. support staging
3. add license
4. make NLS support conditional
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: easytag/Makefile
===================================================================

--- easytag/Makefile	(revision 335625)
+++ easytag/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	easytag
 PORTVERSION=	2.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	GNOME
 
@@ -10,38 +10,30 @@
 MAINTAINER=	novel at FreeBSD.org
 COMMENT=	GTK2 Tag editor for MP3 and OGG files
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
 		libid3tag.so:${PORTSDIR}/audio/libid3tag \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libFLAC.so:${PORTSDIR}/audio/flac \
-		libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
+		libtag.so:${PORTSDIR}/audio/taglib
 
-MAN1=		easytag.1
 CONFLICTS=	easytag-devel-[0-9]*
 
-NO_STAGE=	yes
 USE_XZ=		yes
-USES=		gettext gmake pkgconfig
-USE_GNOME=	gnomehack gnomeprefix gtk20 desktopfileutils
+USES=		gmake pkgconfig pathfix desktop-file-utils
+USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GTK
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	WAVPACK
+OPTIONS_DEFINE=	WAVPACK NLS
 
-.include <bsd.port.options.mk>
+OPTIONS_SUB=	yes
+WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_CONFIGURE_ENABLE=	wavpack
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MWAVPACK}
-LIB_DEPENDS+=		wavpack:${PORTSDIR}/audio/wavpack
-CONFIGURE_ARGS+=	--enable-wavpack
-.else
-CONFIGURE_ARGS+=	--disable-wavpack
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \
-		${WRKSRC}/src/mp4_header.c \
-		${WRKSRC}/src/mp4_tag.c
-
 .include <bsd.port.mk>
Index: easytag/pkg-plist
===================================================================
--- easytag/pkg-plist	(revision 335625)
+++ easytag/pkg-plist	(working copy)
@@ -1,33 +1,9 @@
 bin/easytag
-%%DOCSDIR%%/HACKING
-%%DOCSDIR%%/THANKS
-%%DOCSDIR%%/TODO
+man/man1/easytag.1.gz
 share/applications/easytag.desktop
-share/locale/bg/LC_MESSAGES/easytag.mo
-share/locale/cs/LC_MESSAGES/easytag.mo
-share/locale/da/LC_MESSAGES/easytag.mo
-share/locale/de/LC_MESSAGES/easytag.mo
-share/locale/el/LC_MESSAGES/easytag.mo
-share/locale/es/LC_MESSAGES/easytag.mo
-share/locale/fr/LC_MESSAGES/easytag.mo
-share/locale/he/LC_MESSAGES/easytag.mo
-share/locale/hu/LC_MESSAGES/easytag.mo
-share/locale/it/LC_MESSAGES/easytag.mo
-share/locale/ja/LC_MESSAGES/easytag.mo
-share/locale/lt/LC_MESSAGES/easytag.mo
-share/locale/nl/LC_MESSAGES/easytag.mo
-share/locale/pl/LC_MESSAGES/easytag.mo
-share/locale/pt_BR/LC_MESSAGES/easytag.mo
-share/locale/ro/LC_MESSAGES/easytag.mo
-share/locale/ru/LC_MESSAGES/easytag.mo
-share/locale/sl/LC_MESSAGES/easytag.mo
-share/locale/sr/LC_MESSAGES/easytag.mo
-share/locale/sr at Latn/LC_MESSAGES/easytag.mo
-share/locale/sr at latin/LC_MESSAGES/easytag.mo
-share/locale/sv/LC_MESSAGES/easytag.mo
-share/locale/uk/LC_MESSAGES/easytag.mo
-share/locale/zh_CN/LC_MESSAGES/easytag.mo
-share/locale/zh_TW/LC_MESSAGES/easytag.mo
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 share/icons/hicolor/128x128/apps/easytag.png
 share/icons/hicolor/16x16/apps/easytag.png
 share/icons/hicolor/256x256/apps/easytag.png
@@ -35,6 +11,47 @@
 share/icons/hicolor/48x48/apps/easytag.png
 share/icons/hicolor/64x64/apps/easytag.png
 share/icons/hicolor/scalable/apps/easytag.svg
- at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at dirrm %%DOCSDIR%%
+%%NLS%%share/locale/bg/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/da/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/de/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/el/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/es/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/he/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/it/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/sr at Latn/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/sr at latin/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/easytag.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/easytag.mo
+%%NLS%%@dirrmtry share/locale/sr at latin/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr at latin
+ at dirrmtry share/icons/hicolor/scalable/apps
+ at dirrmtry share/icons/hicolor/scalable
+ at dirrmtry share/icons/hicolor/64x64/apps
+ at dirrmtry share/icons/hicolor/64x64
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32
+ at dirrmtry share/icons/hicolor/256x256/apps
+ at dirrmtry share/icons/hicolor/256x256
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor/128x128/apps
+ at dirrmtry share/icons/hicolor/128x128
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%


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