From owner-svn-ports-all@FreeBSD.ORG Mon Dec 9 14:19:41 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A2F6635C; Mon, 9 Dec 2013 14:19:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8E7E01E5B; Mon, 9 Dec 2013 14:19:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB9EJftr035797; Mon, 9 Dec 2013 14:19:41 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB9EJfqt035795; Mon, 9 Dec 2013 14:19:41 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201312091419.rB9EJfqt035795@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Mon, 9 Dec 2013 14:19:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335991 - head/misc/xosd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2013 14:19:41 -0000 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 .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 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