Clean up `audio/osd-lyrics' port a bit:

- Remove useless `pathfix' from USES and add more useful `localbase'
- Prefer AMAROK_CONFIGURE_ON over AMAROK_CONFIGURE_ENABLE for consistency
  with other options (configure arguments)
- Use option-dependent `post-install' target and remove needless .include
  <bsd.port.options.mk> thanks to that
- Unroll a .for loop over one file and optimize away another .for loop
  by using implicit iteration over ${PORTDOCS} instead

1 files changed, 7 insertions, 15 deletions

diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 94b9556..300f15e 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -17,7 +17,7 @@ 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
+USES=		desktop-file-utils gettext gmake iconv localbase pkgconfig
 USE_GNOME=	gtk20 intltool
 USE_SQLITE=	yes
 GNU_CONFIGURE=	yes
@@ -25,12 +25,11 @@ GNU_CONFIGURE=	yes
 # see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814
 #CONFIGURE_ARGS=	--with-werror
 INSTALLS_ICONS=	yes
-PORTDOCS=	AUTHORS ChangeLog NEWS README
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=	DOCS MPD XMMS2 AMAROK
+
 MPD_DESC=	MPD support
 XMMS2_DESC=	XMMS2 support
 AMAROK_DESC=	Amarok 1.4 support
@@ -41,24 +40,17 @@ 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>
+AMAROK_CONFIGURE_ON=	--enable-amarok1
 
 post-patch:
 .for i in src/Makefile.in src/tests/Makefile.in
 	@${REINPLACE_CMD} -e '/-lstdc++/d' -e '/^CCLD =/s/=.*/= $$(CXX)/' \
 		${WRKSRC}/${i}
 .endfor
-.for i in lib/chardetect/Makefile.in
-	@${REINPLACE_CMD} -e \
-		'/-O2/d' ${WRKSRC}/${i}
-.endfor
+	@${REINPLACE_CMD} -e '/-O2/d' ${WRKSRC}/lib/chardetect/Makefile.in
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in AUTHORS ChangeLog NEWS README
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>