svn commit: r322621 - in head: editors/thoteditor emulators/xcpc emulators/xzx ftp/llnlxdir ftp/llnlxftp games/CaribbeanStud games/d2x-xl games/imaze games/xabacus games/xbill games/xminehunter gam...
Baptiste Daroussin
bapt at FreeBSD.org
Wed Jul 10 06:55:34 UTC 2013
Author: bapt
Date: Wed Jul 10 06:55:28 2013
New Revision: 322621
URL: http://svnweb.freebsd.org/changeset/ports/322621
Log:
Convert from USE_MOTIF to USES=motif
While here:
- Trim headers
- Convert some USE_GMAKE to USES=gmake
Modified:
head/editors/thoteditor/Makefile
head/emulators/xcpc/Makefile
head/emulators/xzx/Makefile
head/ftp/llnlxdir/Makefile
head/ftp/llnlxftp/Makefile
head/games/CaribbeanStud/Makefile
head/games/d2x-xl/Makefile
head/games/imaze/Makefile
head/games/xabacus/Makefile
head/games/xbill/Makefile
head/games/xminehunter/Makefile
head/games/xshisen/Makefile
head/games/znibbles/Makefile
head/graphics/SciPlot/Makefile
head/graphics/geomview/Makefile
head/graphics/ida/Makefile
head/graphics/inventor/Makefile
head/graphics/libGLw/Makefile
head/graphics/opendx/Makefile
head/graphics/plotutils/Makefile
head/graphics/white_dune/Makefile
head/graphics/xmfract/Makefile
head/graphics/xpdf/Makefile
Modified: head/editors/thoteditor/Makefile
==============================================================================
--- head/editors/thoteditor/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/editors/thoteditor/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: thot
-# Date created: 1 Aug 1997
-# Whom: Pedro Giffuni (orig)
-#
+# Created by: Pedro Giffuni
# $FreeBSD$
-#
PORTNAME= thoteditor
PORTVERSION= 2.1e
@@ -15,21 +11,20 @@ MASTER_SITE_SUBDIR= apps/editors/X/thot
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
-COMMENT= An structured document editor, offering a graphical WYSIWYG interface
-
-.include <bsd.port.pre.mk>
+COMMENT= Structured document editor, offering a graphical WYSIWYG interface
THOT_SUBDIR= Target
-USE_MOTIF= yes
+USES= gmake motif
WRKSRC= $(WRKDIR)/Thot/$(THOT_SUBDIR)
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-thot --enable-plugin --without-insure --without-amaya --disable-java --disable-intr --disable-jit --disable-math --disable-ilu
-USE_GMAKE= yes
ALL_TARGET= all schemas
MAKE_JOBS_UNSAFE= yes
MAN1= cextract.1
MAN5= cextrc.5
+.include <bsd.port.pre.mk>
+
do-configure:
$(CP) $(WRKSRC)/../thot/Makefile.in $(WRKSRC)/../thot/Makefile.in.patched
$(SED) -e "s&%%MOTIFLIB%%&$(MOTIFLIB)&" <$(WRKSRC)/../thot/Makefile.in.patched >$(WRKSRC)/../thot/Makefile.in
Modified: head/emulators/xcpc/Makefile
==============================================================================
--- head/emulators/xcpc/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/emulators/xcpc/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -8,7 +8,7 @@ CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= pixel at hugbox.org
-COMMENT= A portable Amstrad 464&/664/6128 emulator
+COMMENT= Portable Amstrad 464&/664/6128 emulator
HAS_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -29,7 +29,7 @@ MOTIF_DESC= With Motif widget set
ATHENA_DESC= With Athen widget set
XSHM_DESC= With XShm support
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--disable-xshm
.endif
.if ${PORT_OPTIONS:MMOTIF}
-USE_MOTIF=yes
+USES+= motif
CONFIGURE_ARGS+=--with-motif1
.else
CONFIGURE_ARGS+=--without-motif1
@@ -57,4 +57,4 @@ CONFIGURE_ARGS+=--with-athena
CONFIGURE_ARGS+=--without-athena
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/emulators/xzx/Makefile
==============================================================================
--- head/emulators/xzx/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/emulators/xzx/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -11,9 +11,8 @@ DISTNAME= ${PORTNAME}-pro-${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= ZX Spectrum (48K/128K/+3) Emulator for X11
-USES= imake:env
+USES= imake:env motif
-USE_MOTIF= yes
USE_XORG= x11 ice sm xext xpm xt xxf86vm
# License forbids redistribution
Modified: head/ftp/llnlxdir/Makefile
==============================================================================
--- head/ftp/llnlxdir/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/ftp/llnlxdir/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -16,8 +16,7 @@ PLIST_FILES= bin/xdir lib/X11/app-defaul
MAN1= xdir.1
WRKSRC= ${WRKDIR}/llnlxdir2_1_2/sources
-USES= imake
-USE_MOTIF= yes
+USES= imake motif
USE_XORG= ice sm x11 xext xp xt
.include <bsd.port.mk>
Modified: head/ftp/llnlxftp/Makefile
==============================================================================
--- head/ftp/llnlxftp/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/ftp/llnlxftp/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -14,8 +14,7 @@ COMMENT= Motif FTP client
PLIST_FILES= bin/xftp lib/X11/app-defaults/XFtp
WRKSRC= ${WRKDIR}/llnlxftp2.1/sources
-USES= imake
-USE_MOTIF= yes
+USES= imake motif
USE_XORG= ice sm x11 xext xp xt
CFLAGS+= -Wno-implicit-int \
Modified: head/games/CaribbeanStud/Makefile
==============================================================================
--- head/games/CaribbeanStud/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/games/CaribbeanStud/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -1,6 +1,4 @@
-# New ports collection makefile for: CaribbeanStud
-# Date created: 4 July 1998
-# Whom: Andrey Zakhvatov
+# Created by: Andrey Zakhvatov
#
# $FreeBSD$
#
@@ -17,7 +15,7 @@ MAINTAINER= ports at FreeBSD.org
COMMENT= Caribbean Stud gambling game for X Window System
MAKEFILE= Xmakefile
-USE_MOTIF= yes
+USES= motif
CFLAGS+= -Wno-deprecated
do-install:
Modified: head/games/d2x-xl/Makefile
==============================================================================
--- head/games/d2x-xl/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/games/d2x-xl/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -24,9 +24,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug --enable-release=yes \
--with-sharepath=${PREFIX}/share/d2x-xl
USE_SDL= sdl mixer image
-USE_GMAKE= yes
+USES= gmake motif
USE_AUTOTOOLS= aclocal autoheader automake autoconf
-USE_MOTIF= yes
MAKE_JOBS_SAFE= yes
AUTOMAKE_ARGS= --add-missing --copy
Modified: head/games/imaze/Makefile
==============================================================================
--- head/games/imaze/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/games/imaze/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -49,7 +49,7 @@ TOOLKIT= athena
.endif
.if ${PORT_OPTIONS:MMOTIF}
-USE_MOTIF= yes
+USES+= motif
TOOLKIT= motif
.endif
Modified: head/games/xabacus/Makefile
==============================================================================
--- head/games/xabacus/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/games/xabacus/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -26,7 +26,7 @@ MAN6= xabacus.6
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMOTIF}
-USE_MOTIF= yes
+USES= motif
.else
CONFIGURE_ARGS+= --without-motif
.endif
Modified: head/games/xbill/Makefile
==============================================================================
--- head/games/xbill/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/games/xbill/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -35,7 +35,7 @@ ATHENA_DESC= Athena widget set
GTK_DESC= GTK widget set
MOTIF_DESC= Motif widget set
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MATHENA}
CONFIGURE_ARGS+= --disable-gtk --disable-motif
@@ -43,7 +43,7 @@ USE_XORG= xaw xmu xt x11 sm ice
.elif ${PORT_OPTIONS:MMOTIF}
CONFIGURE_ARGS+= --disable-athena --disable-gtk
USE_XORG= xt x11 sm ice xpm
-USE_MOTIF= yes
+USES= motif
.else # ${PORT_OPTIONS:MGTK}
CONFIGURE_ARGS+= --disable-athena --disable-motif
USE_GNOME= gtk12
@@ -54,4 +54,4 @@ post-patch:
@${REINPLACE_CMD} -e '/WIDGET_LIBS=/ s|-lXm"$$|-lXm -lXpm"|' \
${WRKSRC}/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/games/xminehunter/Makefile
==============================================================================
--- head/games/xminehunter/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/games/xminehunter/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xminehunter
-# Date created: 09 January 1997
-# Whom: Thomas Gellekum <tg at FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= xminehunter
PORTVERSION= 0.4
@@ -13,11 +9,11 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
MAINTAINER= ports at FreeBSD.org
-COMMENT= A Motif minesweeper game
+COMMENT= Motif minesweeper game
+USES= motif
USE_XORG= xpm
WRKSRC= ${WRKDIR}/xminehunter
-USE_MOTIF= yes
ALL_TARGET= xminehunter
.include <bsd.port.mk>
Modified: head/games/xshisen/Makefile
==============================================================================
--- head/games/xshisen/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/games/xshisen/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xshisen
-# Date created: 9 Oct 1996
-# Whom: Yukihiro Nakai <Nakai at Mlab.t.u-tokyo.ac.jp>
-#
+# Created by: Yukihiro Nakai <Nakai at Mlab.t.u-tokyo.ac.jp>
# $FreeBSD$
-#
PORTNAME= xshisen
PORTVERSION= 1.51
@@ -24,7 +20,7 @@ MANLANG= "" ja
MAN6= xshisen.6
.if !defined(WITHOUT_MOTIF)
-USE_MOTIF= yes
+USES= motif
CONFIGURE_ARGS+= --with-motif
.endif
Modified: head/games/znibbles/Makefile
==============================================================================
--- head/games/znibbles/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/games/znibbles/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: znibbles
-# Date created: 21 Aug 1999
-# Whom: Yin-Jieh Chen <yinjieh at csie.nctu.edu.tw>
-#
+# Created by: Yin-Jieh Chen <yinjieh at csie.nctu.edu.tw>
# $FreeBSD$
-#
PORTNAME= znibbles
PORTVERSION= 0.0.7
@@ -21,7 +17,7 @@ LICENSE_COMB= dual
OPTIONS_DEFINE= GTK1
OPTIONS_DEFAULT= GTK1
-USE_MOTIF= yes
+USES= motif
WANT_GNOME= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
Modified: head/graphics/SciPlot/Makefile
==============================================================================
--- head/graphics/SciPlot/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/graphics/SciPlot/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -1,7 +1,5 @@
# Created by: thierry at pompo.net
-#
# $FreeBSD$
-#
PORTNAME= SciPlot
PORTVERSION= 1.36
@@ -13,8 +11,7 @@ MASTER_SITE_SUBDIR= widgets
MAINTAINER= thierry at FreeBSD.org
COMMENT= Full-featured Xt widget to display 2D data in a graph
-USES= imake
-USE_MOTIF= yes
+USES= imake motif
USE_XORG= xp
MAKE_ENV= EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME}
USE_LDCONFIG= yes
Modified: head/graphics/geomview/Makefile
==============================================================================
--- head/graphics/geomview/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/graphics/geomview/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: geomview
-# Date created: 5 November 1996
-# Whom: fenner
-#
+# Created by: fenner
# $FreeBSD$
-#
PORTNAME= geomview
PORTVERSION= 1.9.4
@@ -20,8 +16,8 @@ NOT_FOR_ARCHS_REASON= Segfaults on amd64
OPTIONS_DEFINE= MOTION_AVG DOCS EXAMPLES
MOTION_AVG_DESC= Use experimental motion averaging code
+USES= motif
USE_BZIP2= yes
-USE_MOTIF= yes
USE_GL= glu
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-motif=${LOCALBASE} --with-opengl=${LOCALBASE}
Modified: head/graphics/ida/Makefile
==============================================================================
--- head/graphics/ida/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/graphics/ida/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -21,10 +21,8 @@ OPTIONS_DEFAULT= GIF PNG TIFF
PCD_DESC= Enable PhotoCD support
SANE_DESC= Enable SANE support
-USE_MOTIF= yes
USE_PERL5_BUILD=yes
-USES= iconv
-USE_GMAKE= yes
+USES= iconv gmake motif
MAKEFILE= GNUmakefile
MAKE_ARGS= JPEG_VER=80 verbose=yes
MAKE_JOBS_SAFE= yes
Modified: head/graphics/inventor/Makefile
==============================================================================
--- head/graphics/inventor/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/graphics/inventor/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: OpenInventor
-# Date created: 14 December 2002
-# Whom: Christian Gusenbauer
-#
+# Created by: Christian Gusenbauer
# $FreeBSD$
-#
PORTNAME= inventor
PORTVERSION= 2.1.5.p10
@@ -24,9 +20,7 @@ CONFLICTS= Coin-* SoXt-*
USE_XORG= x11 xi
USE_GL= glw
-USE_GMAKE= yes
-USES= iconv
-USE_MOTIF= yes
+USES= iconv gmake motif
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
Modified: head/graphics/libGLw/Makefile
==============================================================================
--- head/graphics/libGLw/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/graphics/libGLw/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -12,10 +12,9 @@ MAINTAINER= x11 at FreeBSD.org
COMMENT= OpenGL widgets library
USE_BZIP2= yes
-USES= pathfix pkgconfig
+USES= pathfix pkgconfig motif
USE_LDCONFIG= yes
USE_GL= gl
-USE_MOTIF= yes
USE_XORG= x11 xt xext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static --enable-motif
Modified: head/graphics/opendx/Makefile
==============================================================================
--- head/graphics/opendx/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/graphics/opendx/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -16,16 +16,14 @@ LIB_DEPENDS= MagickWand:${PORTSDIR}/grap
cdf.0:${PORTSDIR}/science/cdf
USE_XORG= xinerama xext xpm xmu sm ice
-USES= bison
+USES= bison motif gmake
USE_GCC= any
USE_GL= yes
-USE_MOTIF= yes
USE_AUTOTOOLS= libtool
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV= ARCH="${OPSYS:L}"
CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USE_GMAKE= yes
NO_MTREE= yes
PLIST_SUB= ARCH=${OPSYS:L}
PKGMESSAGE= ${WRKDIR}/pkg-message
Modified: head/graphics/plotutils/Makefile
==============================================================================
--- head/graphics/plotutils/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/graphics/plotutils/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: plotutils
-# Date created: 19 June 1998
-# Whom: Chuck Robey (chuckr)
-#
+# Created by: Chuck Robey (chuckr)
# $FreeBSD$
-#
PORTNAME= plotutils
PORTVERSION= 2.6
@@ -13,11 +9,11 @@ CATEGORIES= graphics
MASTER_SITES= GNU
MAINTAINER= stephen at FreeBSD.org
-COMMENT= A plotting library and toolkit
+COMMENT= Plotting library and toolkit
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
-USE_MOTIF= yes
+USES= motif
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --enable-libplotter --enable-libxmi --with-motif
USE_LDCONFIG= yes
Modified: head/graphics/white_dune/Makefile
==============================================================================
--- head/graphics/white_dune/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/graphics/white_dune/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: white_dune
-# Date created: Apr 12, 2002
-# Whom: ijliao
-#
+# Created by: ijliao
# $FreeBSD$
-#
PORTNAME= white_dune
PORTVERSION= ${DISTVERSION:S/pl/./}
@@ -23,8 +18,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphic
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+USES= motif
USE_XORG= xft
-USE_MOTIF= yes
USE_GL= gl glu glut
USE_SDL= sdl
GNU_CONFIGURE= yes
Modified: head/graphics/xmfract/Makefile
==============================================================================
--- head/graphics/xmfract/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/graphics/xmfract/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -13,7 +13,7 @@ COMMENT= The dos based 'fractint' with a
LICENSE= GPLv2
-USE_MOTIF= yes
+USES= motif
USE_AUTOTOOLS= aclocal autoconf
ACLOCAL_ARGS= # none
CONFIGURE_ARGS= --with-editres \
@@ -23,7 +23,7 @@ MAKE_JOBS_SAFE= yes
.include <bsd.port.pre.mk>
.if ${ARCH} != "i386"
-IGNORE= fails to run with: XCreateImage failed
+BROKEN= fails to run with: XCreateImage failed
.endif
.include <bsd.port.post.mk>
Modified: head/graphics/xpdf/Makefile
==============================================================================
--- head/graphics/xpdf/Makefile Wed Jul 10 06:49:35 2013 (r322620)
+++ head/graphics/xpdf/Makefile Wed Jul 10 06:55:28 2013 (r322621)
@@ -14,7 +14,7 @@ COMMENT= Display PDF files and convert t
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
GNU_CONFIGURE= yes
-USE_GMAKE= yes
+USES= gmake
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -57,7 +57,7 @@ MAN5= xpdfrc.5
.if ${PORT_OPTIONS:MX11}
CONFIGURE_ARGS+= --with-x
-USE_MOTIF= yes
+USES+= motif
MAN1+= xpdf.1
PLIST_SUB+= X11=""
.else
More information about the svn-ports-all
mailing list