Date: Sun, 13 Sep 2015 14:24:59 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396826 - head/x11/metisse Message-ID: <201509131424.t8DEOxgd093250@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Sep 13 14:24:59 2015 New Revision: 396826 URL: https://svnweb.freebsd.org/changeset/ports/396826 Log: Clean options by using options helpers Remove gtk1 option Nuke usage of HAVE_GOME. Please notice that the port is stil wrong as it still relies on the configure script to autodetect things instead of controling it depending on options. At least it is now a bit cleaner Modified: head/x11/metisse/Makefile head/x11/metisse/pkg-plist Modified: head/x11/metisse/Makefile ============================================================================== --- head/x11/metisse/Makefile Sun Sep 13 14:11:08 2015 (r396825) +++ head/x11/metisse/Makefile Sun Sep 13 14:24:59 2015 (r396826) @@ -44,89 +44,46 @@ INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= MMX GLX ATSPI STROKE RPLAY FRIBIDI GLIB GTK2 GCONF \ - GTK1 DOCS -OPTIONS_DEFINE_i386= GLX_X86 +OPTIONS_DEFINE= GLX ATSPI STROKE RPLAY FRIBIDI GLIB GTK2 GCONF \ + DOCS +OPTIONS_DEFINE_i386= GLX_X86 MMX +OPTIONS_DEFINE_amd64= MMX +OPTIONS_SUB= yes GLX_X86_DESC= GLX with x86 optimizations ATSPI_DESC= Widget tracking support RPLAY_DESC= RPlay support in FvwmEvent GLIB_DESC= Use GLib 2.x for module integration GTK2_DESC= Use GDK-PixBuf-2.0 for image loading -GTK1_DESC= Legacy GTK+ 1.2.x support -OPTIONS_DEFAULT= MMX GLX -OPTIONS_DEFAULT_i386= GLX_X86 +OPTIONS_DEFAULT= GLX +OPTIONS_DEFAULT_i386= GLX_X86 MMX +OPTIONS_DEFAULT_amd64= MMX + +MMX_CONFIGURE_ENABLE= mmx +GLX_CONFIGURE_ENABLE= glx +GLX_X86_CONFIGURE_ENABLE= glx-x86 +ATSPI_USE= GNOME=atspi +STROKE_LIB_DEPENDS= libstroke.so:${PORTSDIR}/devel/libstroke +MRPLAY_LIB_DEPENDS= librplay.so:${PORTSDIR}/audio/rplay +FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi +GLIB_USE= GNOME=glib20 +GTK2_USE= GNOME=gtk20 -.include <bsd.port.pre.mk> +GCONF_USE_GNOME+= gconf2 libglade2 -.if ${MACHINE_CPU:Mmmx} && ${PORT_OPTIONS:MMMX} -CONFIGURE_ARGS+= --enable-mmx -.endif - -.if ${PORT_OPTIONS:MGLX} -CONFIGURE_ARGS+= --enable-glx -.endif - -.if ${PORT_OPTIONS:MGLX_X86} -CONFIGURE_ARGS+= --enable-glx-x86 -.endif - -.if ${PORT_OPTIONS:MATSPI} -USE_GNOME+= atspi -.endif - -.if ${PORT_OPTIONS:MSTROKE} -LIB_DEPENDS+= libstroke.so:${PORTSDIR}/devel/libstroke -.endif - -.if ${PORT_OPTIONS:MRPLAY} -LIB_DEPENDS+= librplay.so:${PORTSDIR}/audio/rplay -.endif - -.if ${PORT_OPTIONS:MFRIBIDI} -LIB_DEPENDS+= libfribidi.so:${PORTSDIR}/converters/fribidi -.endif - -.if ${HAVE_GNOME:Mglib20} || ${PORT_OPTIONS:MGLIB} -USE_GNOME+= glib20 -.endif - -.if ${HAVE_GNOME:Mgtk20} || ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 -.endif - -.if ${HAVE_GNOME:Mgconf2} && ${HAVE_GNOME:Mlibglade2} || ${PORT_OPTIONS:MGCONF} -USE_GNOME+= gconf2 libglade2 -PLIST_SUB+= GCONF="" -.else -_NOGLADEDIR= yes -PLIST_SUB+= GCONF="@comment " -.endif - -.if ${HAVE_GNOME:Mgtk12} || ${PORT_OPTIONS:MGTK1} -USE_GNOME+= gtk12 -.endif - -_GTK= ${USE_GNOME:Mgtk12} -.if !empty(_GTK) -PLIST_SUB+= GTK="" -.else -PLIST_SUB+= GTK="@comment " -.endif - -post-patch: .SILENT +post-patch: # Catch up with new <fribidi-types.h> header name - ${REINPLACE_CMD} -e 's,fribidi_types\.h,fribidi-types.h,' \ + @${REINPLACE_CMD} -e 's,fribidi_types\.h,fribidi-types.h,' \ ${WRKSRC}/fvwm-insitu/libs/FBidi.c # Fix desktop entries path - ${REINPLACE_CMD} -E 's,^(configdir =).*,\1 ${DESKTOPDIR},' \ + @${REINPLACE_CMD} -E 's,^(configdir =).*,\1 ${DESKTOPDIR},' \ ${WRKSRC}/fvwm-insitu/opale/session/Makefile.in -.if defined(_NOGLADEDIR) - ${REINPLACE_CMD} -e 's, install-gladeDATA,,' \ - ${WRKSRC}/fvwm-insitu/modules/FvwmConfig/Makefile.in -.endif - ${REINPLACE_CMD} -e 's,return;,return 0;,' \ + @${REINPLACE_CMD} -e 's,return;,return 0;,' \ ${WRKSRC}/fvwm-insitu/configure -.include <bsd.port.post.mk> +post-patch-GCONF-off: + @${REINPLACE_CMD} -e 's, install-gladeDATA,,' \ + ${WRKSRC}/fvwm-insitu/modules/FvwmConfig/Makefile.in + +.include <bsd.port.mk> Modified: head/x11/metisse/pkg-plist ============================================================================== --- head/x11/metisse/pkg-plist Sun Sep 13 14:11:08 2015 (r396825) +++ head/x11/metisse/pkg-plist Sun Sep 13 14:24:59 2015 (r396826) @@ -50,7 +50,6 @@ libexec/fvwm-insitu/2.5.20/FvwmDragWell libexec/fvwm-insitu/2.5.20/FvwmEvent libexec/fvwm-insitu/2.5.20/FvwmForm %%GCONF%%libexec/fvwm-insitu/2.5.20/FvwmGConf -%%GTK%%libexec/fvwm-insitu/2.5.20/FvwmGtk libexec/fvwm-insitu/2.5.20/FvwmGtkDebug libexec/fvwm-insitu/2.5.20/FvwmIconBox libexec/fvwm-insitu/2.5.20/FvwmIconMan @@ -85,7 +84,6 @@ man/man1/FvwmDebug.1.gz man/man1/FvwmDragWell.1.gz man/man1/FvwmEvent.1.gz man/man1/FvwmForm.1.gz -%%GTK%%man/man1/FvwmGtk.1.gz man/man1/FvwmGtkDebug.1.gz man/man1/FvwmIconBox.1.gz man/man1/FvwmIconMan.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509131424.t8DEOxgd093250>