svn commit: r366779 - head/x11/libxfce4util

[Olivier Duchateau]

On Sun, 31 Aug 2014 15:21:58 +0000 (UTC)
Tijl Coosemans <tijl at FreeBSD.org> wrote:

> Author: tijl
> Date: Sun Aug 31 15:21:58 2014
> New Revision: 366779
> URL: http://svnweb.freebsd.org/changeset/ports/366779
> QAT: https://qat.redports.org/buildarchive/r366779/
> 
> Log:
>   - Add USES=libtool and INSTALL_TARGET=install-strip
>   - Use USES=tar:bzip2
>   - Use option helpers
>   - Install documentation in DOCSDIR

Please, revert your change with documentation. It's API's documentation, not usage.

> 
> Modified:
>   head/x11/libxfce4util/Makefile
>   head/x11/libxfce4util/pkg-plist
> 
> Modified: head/x11/libxfce4util/Makefile
> ==============================================================================
> --- head/x11/libxfce4util/Makefile	Sun Aug 31 15:21:24 2014	(r366778)
> +++ head/x11/libxfce4util/Makefile	Sun Aug 31 15:21:58 2014	(r366779)
> @@ -3,6 +3,7 @@
>  
>  PORTNAME=	libxfce4util
>  PORTVERSION=	4.10.1
> +PORTREVISION=	1
>  CATEGORIES=	x11 xfce
>  MASTER_SITES=	${MASTER_SITE_XFCE}
>  MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
> @@ -12,31 +13,19 @@ MAINTAINER=	xfce at FreeBSD.org
>  COMMENT=	Extension library for the Xfce desktop environment
>  
>  GNU_CONFIGURE=	yes
> -USE_BZIP2=	yes
> +INSTALL_TARGET=	install-strip
> +USES=		gmake libtool pathfix perl5 pkgconfig tar:bzip2
>  USE_GNOME=	glib20 intltool intlhack
>  USE_LDCONFIG=	yes
>  USE_XFCE=	configenv
> -USES=		gmake pathfix perl5 pkgconfig
>  
> -OPTIONS_DEFINE=		NLS DOCS
> +OPTIONS_DEFINE=	DOCS NLS
> +OPTIONS_SUB=	yes
>  
> -.include <bsd.port.options.mk>
> +DOCS_CONFIGURE_ENABLE=	gtk-doc-html
> +DOCS_CONFIGURE_ON=	--with-html-dir=${PREFIX}/share/doc
>  
> -.if ${PORT_OPTIONS:MNLS}
> -USES+=		gettext
> -CONFIGURE_ARGS+=--enable-nls
> -PLIST_SUB+=	NLS=""
> -.else
> -CONFIGURE_ARGS+=--disable-nls
> -PLIST_SUB+=	NLS="@comment "
> -.endif
> -
> -.if ${PORT_OPTIONS:MDOCS}
> -CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
> -PLIST_SUB+=	APIDOCS=""
> -.else
> -CONFIGURE_ARGS+=--without-html-dir
> -PLIST_SUB+=	APIDOCS="@comment "
> -.endif
> +NLS_CONFIGURE_ENABLE=	nls
> +NLS_USES=		gettext
>  
>  .include <bsd.port.mk>
> 
> Modified: head/x11/libxfce4util/pkg-plist
> ==============================================================================
> --- head/x11/libxfce4util/pkg-plist	Sun Aug 31 15:21:24 2014	(r366778)
> +++ head/x11/libxfce4util/pkg-plist	Sun Aug 31 15:21:58 2014	(r366779)
> @@ -11,35 +11,35 @@ include/xfce4/libxfce4util/xfce-posix-si
>  include/xfce4/libxfce4util/xfce-rc.h
>  include/xfce4/libxfce4util/xfce-resource.h
>  include/xfce4/libxfce4util/xfce-utf8.h
> -lib/libxfce4util.la
>  lib/libxfce4util.so
>  lib/libxfce4util.so.6
> +lib/libxfce4util.so.6.0.0
>  libdata/pkgconfig/libxfce4util-1.0.pc
>  sbin/xfce4-kiosk-query
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/home.png
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/index.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/index.sgml
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/left.png
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-POSIX-Signal-Handling.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-core.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/reference.html
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/right.png
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/style.css
> -%%APIDOCS%%share/gtk-doc/html/libxfce4util/up.png
> +%%PORTDOCS%%%%DOCSDIR%%/home.png
> +%%PORTDOCS%%%%DOCSDIR%%/index.html
> +%%PORTDOCS%%%%DOCSDIR%%/index.sgml
> +%%PORTDOCS%%%%DOCSDIR%%/left.png
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-File-Utilities.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-Internationalisation.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-Miscellaneous-Utilities.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-POSIX-Signal-Handling.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-Resource-Config-File-Support.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-Resource-lookup-functions.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-Software-Licenses.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-Unicode-Support-Functions.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-Version-Information.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-Xfce-Generics.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-Xfce-Kiosk-functions.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-core.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-datatypes.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-fundamentals.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util-utilities.html
> +%%PORTDOCS%%%%DOCSDIR%%/libxfce4util.devhelp2
> +%%PORTDOCS%%%%DOCSDIR%%/reference.html
> +%%PORTDOCS%%%%DOCSDIR%%/right.png
> +%%PORTDOCS%%%%DOCSDIR%%/style.css
> +%%PORTDOCS%%%%DOCSDIR%%/up.png
>  %%NLS%%share/locale/am/LC_MESSAGES/libxfce4util.mo
>  %%NLS%%share/locale/ar/LC_MESSAGES/libxfce4util.mo
>  %%NLS%%share/locale/ast/LC_MESSAGES/libxfce4util.mo
> @@ -108,8 +108,6 @@ sbin/xfce4-kiosk-query
>  %%NLS%%@dirrmtry share/locale/dz
>  %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
>  %%NLS%%@dirrmtry share/locale/ast
> -%%APIDOCS%%@dirrm share/gtk-doc/html/libxfce4util
> -%%APIDOCS%%@dirrmtry share/gtk-doc/html
> -%%APIDOCS%%@dirrmtry share/gtk-doc
> +%%PORTDOCS%%@dirrm %%DOCSDIR%%
>  @dirrm include/xfce4/libxfce4util
>  @dirrmtry include/xfce4
> 


-- 
olivier