ports/184909: audio/osd-lyrics: Fix build on -current

[KATO Tsuguru]

>Number:         184909
>Category:       ports
>Synopsis:       audio/osd-lyrics: Fix build on -current
>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:   Mon Dec 16 18:10:31 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Support CXXFLAGS properly
- Support desktop-file-utils/pathfix

New file:
files/patch-lib__chardetect__src__entry__impl.cpp
files/patch-lib__chardetect__src__prmem.h
Remove file:
files/patch-free-visibility

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/osd-lyrics/Makefile audio/osd-lyrics/Makefile
--- /usr/ports/audio/osd-lyrics/Makefile	2013-12-12 02:41:42.000000000 +0900
+++ audio/osd-lyrics/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -3,7 +3,7 @@
 
 PORTNAME=	osdlyrics
 PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio deskutils
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	osd-lyrics
@@ -17,18 +17,17 @@
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libcurl.so:${PORTSDIR}/ftp/curl
 
+USES=		desktop-file-utils gettext gmake iconv pathfix pkgconfig
+USE_GNOME=	gtk20
+USE_SQLITE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	DATADIRNAME=share
 # Cannot enable -Werror yet: Clang does not like the code `printf(_("..."))',
 # see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814
 #CONFIGURE_ARGS=	--with-werror
-USES=		gettext gmake iconv pkgconfig
-NO_STAGE=	yes
-USE_GNOME=	gtk20
-USE_SQLITE=	yes
 INSTALLS_ICONS=	yes
-PORTDOCS=	AUTHORS ChangeLog NEWS README
-LDFLAGS=	-L${LOCALBASE}/lib ${ICONV_LIB}
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 
 OPTIONS_DEFINE=	DOCS MPD XMMS2 AMAROK
 MPD_DESC=	Enable MPD support
@@ -37,16 +36,28 @@
 
 MPD_LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 MPD_CONFIGURE_OFF=	--disable-mpd
+
 XMMS2_LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2
 XMMS2_CONFIGURE_OFF=	--disable-xmms2
+
 AMAROK_CONFIGURE_ENABLE=	amarok1
 
 .include <bsd.port.options.mk>
 
+post-patch:
+.for i in src/Makefile.in src/tests/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/-lstdc++/d' ${WRKSRC}/${i}
+.endfor
+.for i in lib/chardetect/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/-O2/d' ${WRKSRC}/${i}
+.endfor
+
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in AUTHORS ChangeLog NEWS README
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+.endfor
 
 .include <bsd.port.mk>
diff -urN /usr/ports/audio/osd-lyrics/files/patch-free-visibility audio/osd-lyrics/files/patch-free-visibility
--- /usr/ports/audio/osd-lyrics/files/patch-free-visibility	2013-11-06 21:52:21.000000000 +0900
+++ audio/osd-lyrics/files/patch-free-visibility	1970-01-01 09:00:00.000000000 +0900
@@ -1,24 +0,0 @@
---- lib/chardetect/src/entry/impl.cpp.orig
-+++ lib/chardetect/src/entry/impl.cpp
-@@ -42,7 +42,9 @@
- #include "nscore.h"
- #include "nsUniversalDetector.h"
- #include <string.h>
-+#pragma GCC visibility push(default)
- #include <stdlib.h>
-+#pragma GCC visibility pop
- 
- #ifdef _WIN32
- #   include <windows.h>
---- lib/chardetect/src/prmem.h.orig
-+++ lib/chardetect/src/prmem.h
-@@ -37,7 +37,9 @@
- #ifndef nsDummyPrmem_h__
- #define nsDummyPrmem_h__
- 
-+#pragma GCC visibility push(default)
- #include <stdlib.h>
-+#pragma GCC visibility pop
- 
- inline void* PR_Malloc(size_t len)
- {
diff -urN /usr/ports/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp
--- /usr/ports/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp	1970-01-01 09:00:00.000000000 +0900
+++ audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp	2013-12-17 00:00:00.000000000 +0900
@@ -0,0 +1,13 @@
+--- lib/chardetect/src/entry/impl.cpp.orig
++++ lib/chardetect/src/entry/impl.cpp
+@@ -41,8 +41,10 @@
+ #include "chardetect.h"
+ #include "nscore.h"
+ #include "nsUniversalDetector.h"
++#pragma GCC visibility push(default)
+ #include <string.h>
+ #include <stdlib.h>
++#pragma GCC visibility pop
+ 
+ #ifdef _WIN32
+ #   include <windows.h>
diff -urN /usr/ports/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h
--- /usr/ports/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h	1970-01-01 09:00:00.000000000 +0900
+++ audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h	2013-12-17 00:00:00.000000000 +0900
@@ -0,0 +1,12 @@
+--- lib/chardetect/src/prmem.h.orig
++++ lib/chardetect/src/prmem.h
+@@ -37,7 +37,9 @@
+ #ifndef nsDummyPrmem_h__
+ #define nsDummyPrmem_h__
+ 
++#pragma GCC visibility push(default)
+ #include <stdlib.h>
++#pragma GCC visibility pop
+ 
+ inline void* PR_Malloc(size_t len)
+ {
diff -urN /usr/ports/audio/osd-lyrics/pkg-plist audio/osd-lyrics/pkg-plist
--- /usr/ports/audio/osd-lyrics/pkg-plist	2013-11-06 21:52:21.000000000 +0900
+++ audio/osd-lyrics/pkg-plist	2013-12-17 00:00:00.000000000 +0900
@@ -1,5 +1,9 @@
 bin/osdlyrics
 share/applications/osdlyrics.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/icons/hicolor/16x16/animations/osdlyrics-loading.png
 share/icons/hicolor/64x64/apps/osdlyrics-trayicon.png
 share/icons/hicolor/64x64/apps/osdlyrics.png
@@ -27,3 +31,4 @@
 %%DATADIR%%/icons/osdlyrics.png
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: