Attachment 118535 Details for Bug 160796 – file.diff

[patch] file.diff

file.diff (text/plain), 5.59 KB, created by Olivier Duchateau on 2011-09-17 22:30:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2011-09-17 22:30:10 UTC

Size: 5.59 KB

patch

obsolete

>diff -ur /usr/ports/x11/xfce4-conf/Makefile xfce4-conf/Makefile
>--- /usr/ports/x11/xfce4-conf/Makefile	2011-09-09 19:19:11.000000000 +0200
>+++ xfce4-conf/Makefile	2011-09-17 22:50:13.000000000 +0200
>@@ -26,10 +26,7 @@
> USE_XFCE=	configenv libutil
> USE_XORG=	x11
> 
>-CONFIGURE_ARGS=	--enable-gtk-doc-html=no \
>-		--disable-debug
>-
>-OPTIONS=	GTKDOC	"install the library documentation"	off \
>+OPTIONS=	APIDOCS	"Install api documentation"	off \
> 		PERL	"Install Perl bindings"			off \
> 		NLS	"Enable Native Language Support"	on
> 
>@@ -37,6 +34,14 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if defined(WITHOUT_APIDOCS)
>+CONFIGURE_ARGS+=--without-html-dir
>+PLIST_SUB+=	APIDOCS="@comment "
>+.else
>+CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
>+PLIST_SUB+=	APIDOCS=""
>+.endif
>+
> .if defined(WITH_PERL)
> MAN3=		Xfce4::Xfconf.3
> BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
>@@ -50,13 +55,6 @@
> PLIST_SUB+=	PERLBIND="@comment "
> .endif
> 
>-.if defined(WITH_GTKDOC)
>-BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
>-CONFIGURE_ARGS+=--enable-gtk-doc
>-.else
>-CONFIGURE_ARGS+=--disable-gtk-doc
>-.endif
>-
> .if !defined(WITHOUT_NLS)
> USE_GETTEXT=	yes
> CONFIGURE_ARGS+=--enable-nls
>diff -ur /usr/ports/x11/xfce4-conf/pkg-plist xfce4-conf/pkg-plist
>--- /usr/ports/x11/xfce4-conf/pkg-plist	2011-03-03 11:12:27.000000000 +0100
>+++ xfce4-conf/pkg-plist	2011-09-17 22:50:13.000000000 +0200
>@@ -11,24 +11,24 @@
> lib/xfce4/xfconf/xfconfd
> libdata/pkgconfig/libxfconf-0.pc
> share/dbus-1/services/org.xfce.Xfconf.service
>-share/gtk-doc/html/xfconf/ch01.html
>-share/gtk-doc/html/xfconf/ch02.html
>-share/gtk-doc/html/xfconf/ch03.html
>-share/gtk-doc/html/xfconf/home.png
>-share/gtk-doc/html/xfconf/index.html
>-share/gtk-doc/html/xfconf/index.sgml
>-share/gtk-doc/html/xfconf/left.png
>-share/gtk-doc/html/xfconf/right.png
>-share/gtk-doc/html/xfconf/style.css
>-share/gtk-doc/html/xfconf/up.png
>-share/gtk-doc/html/xfconf/xfconf-xfconf-backend.html
>-share/gtk-doc/html/xfconf/xfconf-xfconf-binding.html
>-share/gtk-doc/html/xfconf/xfconf-xfconf-channel.html
>-share/gtk-doc/html/xfconf/xfconf-xfconf-errors.html
>-share/gtk-doc/html/xfconf/xfconf-xfconf-types.html
>-share/gtk-doc/html/xfconf/xfconf-xfconf.html
>-share/gtk-doc/html/xfconf/xfconf.devhelp
>-share/gtk-doc/html/xfconf/xfconf.devhelp2
>+%%APIDOCS%%share/gtk-doc/html/xfconf/ch01.html
>+%%APIDOCS%%share/gtk-doc/html/xfconf/ch02.html
>+%%APIDOCS%%share/gtk-doc/html/xfconf/ch03.html
>+%%APIDOCS%%share/gtk-doc/html/xfconf/home.png
>+%%APIDOCS%%share/gtk-doc/html/xfconf/index.html
>+%%APIDOCS%%share/gtk-doc/html/xfconf/index.sgml
>+%%APIDOCS%%share/gtk-doc/html/xfconf/left.png
>+%%APIDOCS%%share/gtk-doc/html/xfconf/right.png
>+%%APIDOCS%%share/gtk-doc/html/xfconf/style.css
>+%%APIDOCS%%share/gtk-doc/html/xfconf/up.png
>+%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-backend.html
>+%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-binding.html
>+%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-channel.html
>+%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-errors.html
>+%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf-types.html
>+%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf-xfconf.html
>+%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf.devhelp
>+%%APIDOCS%%share/gtk-doc/html/xfconf/xfconf.devhelp2
> %%NLS%%share/locale/ar/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/ast/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/bn/LC_MESSAGES/xfconf.mo
>@@ -36,10 +36,10 @@
> %%NLS%%share/locale/cs/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/da/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/de/LC_MESSAGES/xfconf.mo
>+%%NLS%%share/locale/el/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/en_GB/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/es/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/eu/LC_MESSAGES/xfconf.mo
>-%%NLS%%share/locale/el/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/fi/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/fr/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/gl/LC_MESSAGES/xfconf.mo
>@@ -68,6 +68,20 @@
> %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfconf.mo
> %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfconf.mo
>+%%PERLBIND%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod
>+%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so
>+%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/Xfconf.bs
>+%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/.packlist
>+%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/Files.pm
>+%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.h
>+%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/xfconfperl-autogen.h
>+%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.typemap
>+%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf.pm
>+%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf
>+%%PERLBIND%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4
>+%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install
>+%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf
>+%%PERLBIND%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4
> %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
> %%NLS%%@dirrmtry share/locale/ur_PK
> %%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
>@@ -80,12 +94,11 @@
> %%NLS%%@dirrmtry share/locale/kk
> %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
> %%NLS%%@dirrmtry share/locale/ast
>-@dirrm share/gtk-doc/html/xfconf
>-@dirrmtry share/gtk-doc/html
>-@dirrmtry share/gtk-doc
>-@dirrmtry share/dbus-1
>+%%APIDOCS%%@dirrm share/gtk-doc/html/xfconf
>+%%APIDOCS%%@dirrmtry share/gtk-doc/html
>+%%APIDOCS%%@dirrmtry share/gtk-doc
> @dirrm lib/xfce4/xfconf
>-@dirrm lib/xfce4
>+@dirrmtry lib/xfce4
> @dirrm include/xfce4/xfconf-0/xfconf
> @dirrm include/xfce4/xfconf-0
> @dirrmtry include/xfce4

Actions: View | Diff

Attachments on bug 160796: 118535