From owner-svn-ports-all@FreeBSD.ORG Wed Jul 10 06:49:40 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 31D41D59; Wed, 10 Jul 2013 06:49:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 211C217D2; Wed, 10 Jul 2013 06:49:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6A6neTx022563; Wed, 10 Jul 2013 06:49:40 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6A6naLA022538; Wed, 10 Jul 2013 06:49:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201307100649.r6A6naLA022538@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 10 Jul 2013 06:49:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322620 - in head: databases/sqsh databases/xmbase-grok deskutils/mrundlg deskutils/plan deskutils/xmaddressbook deskutils/xmdiary devel/ddd editors/asedit editors/emacs editors/emacs-d... 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.14 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: Wed, 10 Jul 2013 06:49:40 -0000 Author: bapt Date: Wed Jul 10 06:49:35 2013 New Revision: 322620 URL: http://svnweb.freebsd.org/changeset/ports/322620 Log: Convert from USE_MOTIF to USES=motif Modified: head/databases/sqsh/Makefile head/databases/xmbase-grok/Makefile head/deskutils/mrundlg/Makefile head/deskutils/plan/Makefile head/deskutils/xmaddressbook/Makefile head/deskutils/xmdiary/Makefile head/devel/ddd/Makefile head/editors/asedit/Makefile head/editors/emacs-devel/Makefile head/editors/emacs/Makefile head/editors/emacs23/Makefile head/editors/nedit/Makefile head/editors/ted/Makefile head/editors/vim/Makefile head/editors/xemacs-devel-mule/Makefile head/editors/xemacs-devel/Makefile head/editors/xemacs/Makefile head/editors/xemacs21-mule/Makefile head/editors/xvile/Makefile Modified: head/databases/sqsh/Makefile ============================================================================== --- head/databases/sqsh/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/databases/sqsh/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -29,7 +29,7 @@ PLIST_FILES= bin/sqsh etc/sqshrc.default .include .if ${PORT_OPTIONS:MX11} -USE_MOTIF= yes +USES= motif CONFIGURE_ARGS+= --with-motif --with-x .else PKGNAMESUFFIX= -nox11 Modified: head/databases/xmbase-grok/Makefile ============================================================================== --- head/databases/xmbase-grok/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/databases/xmbase-grok/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xmbase-grok -# Date created: Sat Aug 30 13:29:42 CEST 1997 -# Whom: Andreas Klemm -# +# Created by: Andreas Klemm # $FreeBSD$ -# PORTNAME= xmbase-grok PORTVERSION= 1.5 @@ -19,8 +15,8 @@ COMMENT= Graphical Resource Organizer Ki BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src +USES= motif USE_XORG= x11 xt -USE_MOTIF= yes MAKE_ENV= MYCC="${CC}" DEBUG="${CFLAGS}" YO="" INCDIR="" \ GBIN="${PREFIX}/bin" GLIB="${DATADIR}" \ CF="-I${LOCALBASE}/include" LF="${MOTIFLIB} -lXt -lX11 -lm" Modified: head/deskutils/mrundlg/Makefile ============================================================================== --- head/deskutils/mrundlg/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/deskutils/mrundlg/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -9,10 +9,9 @@ CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_FREEBSD} MAINTAINER= sixxgate@hotmail.com -COMMENT= An application / program launcher for Motif +COMMENT= Application / program launcher for Motif -USES= imake -USE_MOTIF= yes +USES= imake motif USE_BZIP2= yes USE_XORG= x11 xmu xt MAN1= mrundlg.1 Modified: head/deskutils/plan/Makefile ============================================================================== --- head/deskutils/plan/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/deskutils/plan/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -1,9 +1,6 @@ -# New ports collection makefile for: plan -# Date created: 14 April 1996 -# Whom: Daniel Eischen -# +# Created by: Daniel Eischen # $FreeBSD$ -# + # Also update ports/japanese/plan/ (ja-plan) when this port is updated PORTNAME= plan @@ -13,9 +10,9 @@ MASTER_SITES= ftp://plan.ftp.fu-berlin.d MASTER_SITE_SUBDIR= applications MAINTAINER= ports@FreeBSD.org -COMMENT= An X/Motif schedule planner with calendar +COMMENT= X/Motif schedule planner with calendar -USE_MOTIF= yes +USES= motif WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src ALL_TARGET= freebsd MAN1= netplan.1 plan.1 Modified: head/deskutils/xmaddressbook/Makefile ============================================================================== --- head/deskutils/xmaddressbook/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/deskutils/xmaddressbook/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -12,8 +12,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= X11/Motif-based addressbook program -USES= imake -USE_MOTIF= yes +USES= imake motif USE_XORG= ice sm x11 xext xi xp xt oldx WRKSRC= ${WRKDIR}/xmaddressbook MAN1= xmaddressbook.1 Modified: head/deskutils/xmdiary/Makefile ============================================================================== --- head/deskutils/xmdiary/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/deskutils/xmdiary/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -14,8 +14,7 @@ COMMENT= Personal and group calendar uti NO_CDROM= Don't sell for profit EXTRACT_ONLY= ${DISTNAME}.tar.gz -USE_MOTIF= yes -USES= imake +USES= imake motif USE_GCC= any USE_XORG= x11 xext xp xpm xt MAN1= xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \ Modified: head/devel/ddd/Makefile ============================================================================== --- head/devel/ddd/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/devel/ddd/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: ddd -# Date created: Tue Jan 28, 1997 -# Whom: David O'Brien (obrien@NUXI.com) -# +# Created by: David O'Brien # $FreeBSD$ -# PORTNAME= ddd PORTVERSION= 3.3.12 @@ -16,9 +11,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sergio@softshark.org COMMENT= Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB -USE_GMAKE= yes +USES= gmake motif USE_XORG= xpm -USE_MOTIF= yes GNU_CONFIGURE= yes CFLAGS+= -Wno-deprecated Modified: head/editors/asedit/Makefile ============================================================================== --- head/editors/asedit/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/asedit/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -12,8 +12,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Text editor for X/Motif -USES= imake -USE_MOTIF= yes +USES= imake motif USE_XORG= ice sm x11 xext xmu xp xt XMKMF= xmkmf Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/emacs-devel/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --with-x-toolkit=athena USE_XORG= xaw CONFIGURE_ARGS+= --with-x-toolkit=athena --without-xaw3d .elif ${PORT_OPTIONS:MMOTIF} -USE_MOTIF= yes +USES+= motif CONFIGURE_ARGS+= --with-x-toolkit=motif .endif Modified: head/editors/emacs/Makefile ============================================================================== --- head/editors/emacs/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/emacs/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -22,8 +22,7 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-2 EMACS_VER= 24.3 GNU_CONFIGURE= yes -USES= ncurses -USE_GMAKE= yes +USES= ncurses gmake USE_XZ= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -113,7 +112,7 @@ CONFIGURE_ARGS+= --with-x-toolkit=athena USE_XORG= xaw CONFIGURE_ARGS+= --with-x-toolkit=athena --without-xaw3d .elif ${PORT_OPTIONS:MMOTIF} -USE_MOTIF= yes +USES+= motif CONFIGURE_ARGS+= --with-x-toolkit=motif .endif Modified: head/editors/emacs23/Makefile ============================================================================== --- head/editors/emacs23/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/emacs23/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -98,7 +98,7 @@ CONFIGURE_ARGS+= --with-x-toolkit=athena USE_XORG= xaw CONFIGURE_ARGS+= --with-x-toolkit=athena --without-xaw3d .elif ${PORT_OPTIONS:MMOTIF} -USE_MOTIF= yes +USES+= motif CONFIGURE_ARGS+= --with-x-toolkit=motif .endif Modified: head/editors/nedit/Makefile ============================================================================== --- head/editors/nedit/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/nedit/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -1,9 +1,5 @@ -# New ports collection makefile for: nedit -# Date created: 7 April 1996 -# Whom: Daniel Eischen -# +# Created by: Daniel Eischen # $FreeBSD$ -# PORTNAME= nedit PORTVERSION= 5.5 @@ -23,11 +19,11 @@ DISTFILES= nedit-5.5-src.tar.bz2 nedit.a EXTRACT_ONLY= nedit-5.5-src.tar.bz2 MAINTAINER= deischen@FreeBSD.org -COMMENT= An X11/Motif GUI text editor for programs and plain text files +COMMENT= X11/Motif GUI text editor for programs and plain text files LICENSE= GPLv1 +USES= motif USE_BZIP2= yes -USE_MOTIF= yes USE_XORG= xpm MAN1= nclient.1 nedit.1 ALL_TARGET= freebsd Modified: head/editors/ted/Makefile ============================================================================== --- head/editors/ted/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/ted/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -50,7 +50,7 @@ INDDIR= ${DATADIR}/dfa USE_GNOME= gtk20 CONFIGURE_ARGS+=--with-GTK .else -USE_MOTIF= yes +USES+= motif CONFIGURE_ARGS+=--with-MOTIF .endif Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/vim/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -160,7 +160,7 @@ USE_XORG+= xt glproto . endif . if ${PORT_OPTIONS:MMOTIF} -USE_MOTIF= yes +USES+= motif CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MAKE_ARGS+= MOTIFHOME=${LOCALBASE} . endif Modified: head/editors/xemacs-devel-mule/Makefile ============================================================================== --- head/editors/xemacs-devel-mule/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/xemacs-devel-mule/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -120,7 +120,7 @@ PKGDIR= ${.CURDIR}/../../editors/xemacs PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} -.include +.include .if ${OSVERSION} >= 900000 BROKEN= does not build on FreeBSD 9.X @@ -145,7 +145,7 @@ CONFIGURE_ARGS+= --with-x11=no @${ECHO_MSG} "which will force the use of athena widgets for dialogs." .endif CONFIGURE_ARGS+=--with-jpeg=yes --with-png=yes --with-tiff=yes --with-xface=yes -USE_MOTIF= yes +USES= motif # hack to avoid shipping binaries linked with Motif .if defined(MOTIF_STATIC) @@ -259,4 +259,4 @@ post-install: .endif .endif -.include +.include Modified: head/editors/xemacs-devel/Makefile ============================================================================== --- head/editors/xemacs-devel/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/xemacs-devel/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -1,9 +1,5 @@ -# New ports collection makefile for: X-Emacs -# Date created: 25 Oct 2001 -# Whom: Gary Jennejohn (gj@FreeBSD.org) -# +# Created by: Gary Jennejohn # $FreeBSD$ -# PORTNAME= xemacs-devel PORTVERSION= ${XEMACS_VER:S/-/./} @@ -79,10 +75,10 @@ ALL_TARGET= all dist PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} -.include +.include .if exists(${LOCALBASE}/lib/libXm.so) -USE_MOTIF= yes +USES+= motif HAVE_MOTIF= yes .endif @@ -157,4 +153,4 @@ post-install:: # @${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}." #.endif -.include +.include Modified: head/editors/xemacs/Makefile ============================================================================== --- head/editors/xemacs/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/xemacs/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -60,7 +60,7 @@ ALL_TARGET= all dist PLIST_SUB+= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} -.include +.include # Undump and malloc do not behave on amd64 at the moment .if ${ARCH} == amd64 @@ -95,7 +95,7 @@ CONFIGURE_ARGS+= --with-png --with-jpeg USE_XORG= xpm x11 xbitmaps xaw CFLAGS+= -I${LOCALBASE}/include/libpng15 .if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC) -USE_MOTIF= yes +USES+= motif WITH_SCROLLBARS= --with-scrollbars=motif WITH_DIALOGS= --with-dialogs=motif WITH_WIDGETS= --with-widgets=motif @@ -113,6 +113,8 @@ CONFIGURE_ARGS+= --with-athena=3d CONFIGURE_ARGS+= --without-x11 .endif +.include + .if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!="" USE_GNOME+= gnomehier PLIST_SUB+= DESKTOP="" Modified: head/editors/xemacs21-mule/Makefile ============================================================================== --- head/editors/xemacs21-mule/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/xemacs21-mule/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -90,7 +90,7 @@ PKGDIR= ${.CURDIR}/../../editors/xemacs PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} -.include +.include # Undump and malloc do not behave on amd64 at the moment .if ${ARCH} == "amd64" @@ -112,7 +112,7 @@ pre-fetch: @${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, " @${ECHO_MSG} "which will force the use of athena widgets for dialogs." .endif -USE_MOTIF= yes +USES+= motif # hack to avoid shipping binaries linked with Motif .if defined(MOTIF_STATIC) @@ -215,4 +215,4 @@ post-install:: .endif .endif -.include +.include Modified: head/editors/xvile/Makefile ============================================================================== --- head/editors/xvile/Makefile Wed Jul 10 06:44:19 2013 (r322619) +++ head/editors/xvile/Makefile Wed Jul 10 06:49:35 2013 (r322620) @@ -74,7 +74,7 @@ CONFIGURE_ARGS+= --with-screen=x11 .endif .if ${PORT_OPTIONS:MMOTIF} -USE_MOTIF= yes +USES+= motif CONFIGURE_ARGS+= --with-screen=motif .endif