- Fix build on -current

- Rescpect CXXFLAGS
- Use desktop-file-utils/pathfix
- Support staging

PR:		ports/184909
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 41 insertions, 28 deletions

diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 4e9ab75dab94..78787a3cd317 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -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,36 +17,48 @@ LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
 		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
-XMMS2_DESC=	Enable XMMS2 support
-AMAROK_DESC=	Enable Amarok 1.4 support
+MPD_DESC=	MPD support
+XMMS2_DESC=	XMMS2 support
+AMAROK_DESC=	Amarok 1.4 support
 
 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 --git a/audio/osd-lyrics/files/patch-free-visibility b/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp
index 032d195fef72..37fa0b014e97 100644
--- a/audio/osd-lyrics/files/patch-free-visibility
+++ b/audio/osd-lyrics/files/patch-lib__chardetect__src__entry__impl.cpp
@@ -1,24 +1,13 @@
 --- lib/chardetect/src/entry/impl.cpp.orig
 +++ lib/chardetect/src/entry/impl.cpp
-@@ -42,7 +42,9 @@
+@@ -41,8 +41,10 @@
+ #include "chardetect.h"
  #include "nscore.h"
  #include "nsUniversalDetector.h"
- #include <string.h>
 +#pragma GCC visibility push(default)
+ #include <string.h>
  #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 --git a/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h b/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h
new file mode 100644
index 000000000000..17e0610138ad
--- /dev/null
+++ b/audio/osd-lyrics/files/patch-lib__chardetect__src__prmem.h
@@ -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)
+ {