svn commit: r335991 - head/misc/xosd
Danilo Egea Gondolfo
danilo at FreeBSD.org
Mon Dec 9 14:19:41 UTC 2013
Author: danilo
Date: Mon Dec 9 14:19:40 2013
New Revision: 335991
URL: http://svnweb.freebsd.org/changeset/ports/335991
Log:
- Add stage support
- Use options helpers
- Convert LIB_DEPENDS to new syntax
Modified:
head/misc/xosd/Makefile
head/misc/xosd/pkg-plist
Modified: head/misc/xosd/Makefile
==============================================================================
--- head/misc/xosd/Makefile Mon Dec 9 14:09:59 2013 (r335990)
+++ head/misc/xosd/Makefile Mon Dec 9 14:19:40 2013 (r335991)
@@ -24,13 +24,6 @@ CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L$
CONFIGURE_ARGS= --disable-beep_media_player_plugin
PATCH_STRIP= -p1
-MAN1= osd_cat.1 xosd-config.1
-MAN3= xosd.3 xosd_create.3 xosd_destroy.3 xosd_display.3 \
- xosd_get_number_lines.3 xosd_hide.3 xosd_is_onscreen.3 \
- xosd_set_align.3 xosd_set_bar_length.3 \
- xosd_set_horizontal_offset.3 xosd_set_pos.3 \
- xosd_set_shadow_offset.3 xosd_set_vertical_offset.3 \
- xosd_show.3 xosd_uninit.3
PORTDOCS= AUTHORS ChangeLog TODO
OPTIONS_DEFINE= XMMS MSEC XFT DOCS
@@ -39,34 +32,29 @@ XMMS_DESC= Build and install XMMS-OSD pl
MSEC_DESC= Use milliseconds timeout (breaks compatibility!)
XFT_DESC= Unofficial Xft support
-NO_STAGE= yes
+OPTIONS_SUB= yes
+
+XMMS_LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms \
+ libgdk_pixbuf.so:${PORTSDIR}/graphics/gdk-pixbuf
+XMMS_CONFIGURE_ENABLE= new-plugin
+
+MSEC_EXTRA_PATCHES= ${FILESDIR}/extra-patch-msec-timeout
+
+XFT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-xft
+XFT_USE= GNOME=pango XORG=xft
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MXMMS}
COMMENT+= (with XMMS plugin)
-LIB_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-# shlib version is needed for libgdk_pixbuf, otherwise it could be bogusly
-# satisfied by installed `graphics/gdk-pixbuf2'
-PLIST_SUB= XMMS=""
-.else
-CONFIGURE_ARGS+= --disable-new-plugin
-PLIST_SUB= XMMS="@comment "
.endif
.if ${PORT_OPTIONS:MMSEC}
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-msec-timeout
DELAY_UNITS= milliseconds
.else
DELAY_UNITS= seconds
.endif
-.if ${PORT_OPTIONS:MXFT}
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-xft
-USE_GNOME= pango
-USE_XORG+= xft
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS}, ; \
s,echo aout,echo elf,' ${WRKSRC}/configure
@@ -81,9 +69,7 @@ post-patch:
.endif
post-install:
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/misc/xosd/pkg-plist
==============================================================================
--- head/misc/xosd/pkg-plist Mon Dec 9 14:09:59 2013 (r335990)
+++ head/misc/xosd/pkg-plist Mon Dec 9 14:19:40 2013 (r335991)
@@ -5,6 +5,23 @@ lib/libxosd.a
lib/libxosd.la
lib/libxosd.so
lib/libxosd.so.4
+man/man1/osd_cat.1.gz
+man/man1/xosd-config.1.gz
+man/man3/xosd.3.gz
+man/man3/xosd_create.3.gz
+man/man3/xosd_destroy.3.gz
+man/man3/xosd_display.3.gz
+man/man3/xosd_get_number_lines.3.gz
+man/man3/xosd_hide.3.gz
+man/man3/xosd_is_onscreen.3.gz
+man/man3/xosd_set_align.3.gz
+man/man3/xosd_set_bar_length.3.gz
+man/man3/xosd_set_horizontal_offset.3.gz
+man/man3/xosd_set_pos.3.gz
+man/man3/xosd_set_shadow_offset.3.gz
+man/man3/xosd_set_vertical_offset.3.gz
+man/man3/xosd_show.3.gz
+man/man3/xosd_uninit.3.gz
share/aclocal/libxosd.m4
%%DATADIR%%/bottom-left.png
%%DATADIR%%/bottom-right.png
More information about the svn-ports-head
mailing list