From owner-svn-ports-head@freebsd.org Sun Sep 13 14:25:00 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D169A0385F; Sun, 13 Sep 2015 14:25:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 615D911CB; Sun, 13 Sep 2015 14:25:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8DEP0mW093264; Sun, 13 Sep 2015 14:25:00 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8DEOxgd093250; Sun, 13 Sep 2015 14:24:59 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201509131424.t8DEOxgd093250@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 13 Sep 2015 14:24:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396826 - head/x11/metisse X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Sep 2015 14:25:00 -0000 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 +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 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 +post-patch-GCONF-off: + @${REINPLACE_CMD} -e 's, install-gladeDATA,,' \ + ${WRKSRC}/fvwm-insitu/modules/FvwmConfig/Makefile.in + +.include 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