diff options
| author | bapt <bapt@FreeBSD.org> | 2013-06-28 11:51:05 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-06-28 11:51:05 +0000 |
| commit | ba5181b4c873c984e4559cfddf3b6ce79362a9a2 (patch) | |
| tree | 5182ef394eeef9bff78abf27f4a3a05f7fb8ff43 | |
| parent | 39c24b55b95207275ceec7228fd4470225c94152 (diff) | |
| download | FreeBSD-ports-ba5181b4c873c984e4559cfddf3b6ce79362a9a2.zip FreeBSD-ports-ba5181b4c873c984e4559cfddf3b6ce79362a9a2.tar.gz | |
New USES imake to handle the dependency on imake.
This uses accept 'env' as an argument for ports that do use their own or a different do-configure target.
Modify xmkmf so it accept IMAKECPPFLAGS as default flags for imake and pass it to the called imake.
Modify xorg-cf-files (the FreeBSD.cf configuration file) to allow CppCmd to be overwritten.
Pass CppCmd CcCmd and CplusplusCmd via command line to each call of imake via IMAKECPPFLAGS
Pass IMAKE_DEFINE with the above arguments to MAKE_ARGS so that imake spawned from Makefile generated by a previous
imake also inherit the defined CppCmd CcCmd and CplusplusCmd.
Make imake use devel/tradcpp all the time, so that when buidling with clang we do not depend on gcc's cpp.
Make imake respect CC and CXX
Make imake respect USE_GCC (if set imake will use gcc's cpp).
While here:
- Remove a couple of indefinite articles from comments
- Trim headers
- Fix a couple of ports to build with clang or use: USE_GCC=any
- Fix a now useless redefinition of the extraction chain
- Fix a typo in japanese/Wnn7-lib bundled imake template definitions
- Fix some XMKMF execution with no env specified
- Use options helper in x11/xautolock to simplify the port
111 files changed, 282 insertions, 373 deletions
@@ -10,6 +10,18 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20130628: +AUTHOR: bapt@FreeBSD.org + + * New USES: imake + + This uses replaces USE_IMAKE, it handles dependency on imake. Its only argument + is 'env', which prevent from defining the do-configure target. + + * New LATE_INSTALL_TARGET + + This content of this new macro is appended to INSTALL_TARGET + 20130620: AUTHOR: bapt@FreeBSD.org diff --git a/Mk/Uses/imake.mk b/Mk/Uses/imake.mk new file mode 100644 index 0000000..f4db9be --- /dev/null +++ b/Mk/Uses/imake.mk @@ -0,0 +1,52 @@ +# $FreeBSD$ +# +# Provide support for imake based projects +# +# MAINTAINER: x11@FreeBSD.org +# +# Feature: imake +# Usage: USES=imake +# Valid ARGS: env: do not define any target +# + +.if !defined(_INCLUDE_USES_IMAKE_MK) +_INCLUDE_USES_IMAKE_MK= yes + +.if defined(imake_ARGS) +.if ${imake_ARGS} == env +IMAKE_ENV_ONLY= yes +.else +IGNORE= USES=imake ${imake_ARGS} is not a valid argument +.endif +.endif + +.if !defined(NO_INSTALL_MANPAGES) +MANCOMPRESSED?= yes +.endif + +BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake + +.if defined(USE_GCC) +IMAKECPP= ${CPP} +IMAKECPPFLAGS= -DCppCmd=${CPP} -DCcCmd=${CC} -DCplusplusCmd=${CXX} +.else +IMAKECPP= tradcpp +IMAKECPPFLAGS= -DCppCmd=tradcpp -DCcCmd=${CC} -DCplusplusCmd=${CXX} +BUILD_DEPENDS+= tradcpp:${PORTSDIR}/devel/tradcpp +.endif +MAKE_ENV+= IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}" +CONFIGURE_ENV+= IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}" +MAKE_ARGS+= IMAKE_DEFINES="${IMAKECPPFLAGS}" + +.if !defined(IMAKE_ENV_ONLY) +.if !target(do-configure) +do-configure: + @(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF}) +.endif + +.if !defined(NO_INSTALL_MANPAGES) +LATE_INSTALL_ARGS= install.man +.endif +.endif + +.endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 53145e3..a4d1224 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1623,11 +1623,7 @@ check-makevars:: .endif .endif -.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES) -MANCOMPRESSED?= yes -.else MANCOMPRESSED?= no -.endif .if defined(PATCHFILES) .if ${PATCHFILES:M*.zip}x != x @@ -1908,7 +1904,6 @@ LIB_DEPENDS+= Xm.4:${PORTSDIR}/x11-toolkits/open-motif .endif .endif -X_IMAKE_PORT= ${PORTSDIR}/devel/imake X_FONTSERVER_PORT= ${PORTSDIR}/x11-fonts/xfs X_VFBSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-vfbserver X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11-fonts/encodings @@ -1920,19 +1915,6 @@ X_FONTS_TTF_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-truetype X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-type1 X_FONTS_ALIAS_PORT= ${PORTSDIR}/x11-fonts/font-alias -.if defined(USE_IMAKE) -.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \ - ${OSVERSION} >= 1000010 -CONFIGURE_ENV+= IMAKECPP="gcpp" -MAKE_ENV+= IMAKECPP="gcpp" -.else -CONFIGURE_ENV+= IMAKECPP="${CPP}" -MAKE_ENV+= IMAKECPP="${CPP}" -.endif -MAKE_FLAGS?= CC="${CC}" CXX="${CXX}" -BUILD_DEPENDS+= imake:${X_IMAKE_PORT} -.endif - .if defined(USE_DISPLAY) && !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \ @@ -2423,6 +2405,7 @@ MOTIFLIB?= -L${LOCALBASE}/lib -lXm -lXp ALL_TARGET?= all INSTALL_TARGET?= install +INSTALL_TARGET+= ${LATE_INSTALL_ARGS} # Integrate with the license auditing framework .if !defined (DISABLE_LICENSES) @@ -3716,9 +3699,6 @@ do-configure: ${FALSE}; \ fi) .endif -.if defined(USE_IMAKE) - @(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF}) -.endif .endif # Build @@ -3864,14 +3844,8 @@ check-install-conflicts: do-install: .if defined(USE_GMAKE) @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES) - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man) -.endif .else # !defined(USE_GMAKE) @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) -.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES) - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man) -.endif .endif .endif diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile index fde8c15..69b1ec2 100644 --- a/audio/ascd/Makefile +++ b/audio/ascd/Makefile @@ -16,7 +16,8 @@ LICENSE= BSD LIB_DEPENDS= workman:${PORTSDIR}/audio/libworkman -USE_IMAKE= yes +USES= imake + USE_XORG= xpm DATAFILES= ascd-0.13pr6-themes.tgz diff --git a/audio/nas/Makefile b/audio/nas/Makefile index 387ad95..6bf9dc8 100644 --- a/audio/nas/Makefile +++ b/audio/nas/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: nas (formerly netaudio) -# Date created: 03 Nov 1994 -# Whom: jkh -# +# Created by: jkh # $FreeBSD$ -# PORTNAME= nas PORTVERSION= 1.9.3 @@ -14,8 +10,8 @@ EXTRACT_SUFX= .src.tar.gz MAINTAINER= multimedia@FreeBSD.org COMMENT= Network Audio System +USES= imake USE_GCC= any -USE_IMAKE= yes USE_XORG= x11 xext xt xau sm ice xp xpm xmu xaw USE_LDCONFIG= yes MAKE_ENV+= COMPRESS_CMD="${COMPRESS_CMD:S/c//}" diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile index cd28c32..3325cba 100644 --- a/audio/wmsmixer/Makefile +++ b/audio/wmsmixer/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: wmsmixer -# Date created: 2 April 2001 -# Whom: Konstantinos Konstantinidis <kkonstan@daemon.gr> -# +# Created by: Konstantinos Konstantinidis <kkonstan@daemon.gr> # $FreeBSD$ -# PORTNAME= wmsmixer PORTVERSION= 0.5.1 @@ -16,8 +12,9 @@ COMMENT= An audio mixer for the WindowMaker dock PLIST_FILES= bin/wmsmixer PORTDOCS= README + +USES= imake USE_XORG= xpm -USE_IMAKE= YES MAKE_ARGS= CC="${CXX}" CFLAGS="${CXXFLAGS}" do-install: diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile index 3ac42f4..91e9ef1 100644 --- a/audio/xcdplayer/Makefile +++ b/audio/xcdplayer/Makefile @@ -11,8 +11,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= CD player for X +USES= imake USE_XORG= xbitmaps xaw -USE_IMAKE= yes MAKE_JOBS_SAFE= yes MAN1= xcdplayer.1 diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile index c52b47b..a58199a 100644 --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xmcd -# Date created: 16 February 1995 -# Whom: Gennady Sorokopud <gena@NetVision.net.il> -# +# Created by: Gennady Sorokopud <gena@NetVision.net.il> # $FreeBSD$ -# PORTNAME= xmcd PORTVERSION= 3.3.2 @@ -18,8 +14,8 @@ LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis \ FLAC:${PORTSDIR}/audio/flac RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame +USES= imake USE_MOTIF= yes -USE_IMAKE= yes USE_XORG= x11 xext xaw xmu xp xpm xt sm ice MAN1= cda.1 xmcd.1 MANCOMPRESSED= no diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile index 651105c..cc28f44 100644 --- a/audio/xmmix/Makefile +++ b/audio/xmmix/Makefile @@ -12,7 +12,7 @@ COMMENT= Motif-based audio mixer WRKSRC= ${WRKDIR}/xmmix-1.2 -USE_IMAKE= yes +USES= imake USE_MOTIF= yes USE_XORG= x11 xext sm ice xt xp diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile index 91f7394..6515865 100644 --- a/audio/xwave/Makefile +++ b/audio/xwave/Makefile @@ -13,7 +13,7 @@ MAINTAINER= a0516@marimga.de COMMENT= Audio player/recorder/editor for the X Window System WRKSRC= ${WRKDIR}/${PORTNAME}2-981109 -USE_IMAKE= yes +USES= imake USE_XORG= xaw MAKE_JOBS_UNSAFE= yes diff --git a/comms/acfax/Makefile b/comms/acfax/Makefile index 16e564a..613c2d7 100644 --- a/comms/acfax/Makefile +++ b/comms/acfax/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d PLIST_FILES= bin/acfax WRKSRC= ${WRKDIR}/${PORTNAME} -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext xmu xt sm ice post-extract: diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile index 79118bc..b02651b 100644 --- a/deskutils/xmdiary/Makefile +++ b/deskutils/xmdiary/Makefile @@ -15,12 +15,12 @@ COMMENT= Personal and group calendar utility NO_CDROM= Don't sell for profit EXTRACT_ONLY= ${DISTNAME}.tar.gz USE_MOTIF= yes -USE_IMAKE= yes +USES= imake +USE_GCC= any USE_XORG= x11 xext xp xpm xt MAN1= xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \ xdlight.1 xdnotify.1 xdprformat.1 xdremind.1 xdremove.1 \ xdrestore.1 -CFLAGS+= -Werror MAKE_JOBS_SAFE= yes post-patch: diff --git a/deskutils/xrolo/Makefile b/deskutils/xrolo/Makefile index 6cfbfd5..8689535 100644 --- a/deskutils/xrolo/Makefile +++ b/deskutils/xrolo/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xrolo -# Date created: 17 January 1999 -# Whom: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE> -# +# Created by: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE> # $FreeBSD$ -# PORTNAME= xrolo PORTVERSION= 2.6 @@ -21,7 +17,7 @@ LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview WRKSRC= ${WRKDIR}/xrolo -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext MAN1= xrolo.1 PLIST_FILES= bin/xrolo diff --git a/devel/imake/Makefile b/devel/imake/Makefile index a91239b..0303445 100644 --- a/devel/imake/Makefile +++ b/devel/imake/Makefile @@ -3,28 +3,27 @@ PORTNAME= imake PORTVERSION= 1.0.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org COMMENT= Imake and other utilities from X.Org +BUILD_DEPENDS= tradcpp:${PORTSDIR}/devel/tradcpp RUN_DEPENDS= gccmakedep:${PORTSDIR}/devel/gccmakedep \ makedepend:${PORTSDIR}/devel/makedepend \ ${LOCALBASE}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files -USE_PERL5= yes +USES= shebangfix +USE_PERL5_RUN= yes + +SHEBANG_FILES= mkhtmlindex.pl XORG_CAT= util USE_XORG= xproto -# clang's cpp destroys whitespace, particularly hard tabs in makefiles, -# which is fatal for imake. -CPPFLAGS+= -DDEFAULT_CC=\\\"gcc\\\" - -.ifdef USE_IMAKE -.error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again. -.endif +CONFIGURE_ENV= ac_cv_path_RAWCPP=tradcpp MAN1= ccmakedep.1 \ cleanlinks.1 \ @@ -36,16 +35,4 @@ MAN1= ccmakedep.1 \ revpath.1 \ xmkmf.1 -post-patch: - @${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/mkhtmlindex.pl - @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure - -.include <bsd.port.pre.mk> - -# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp. -.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \ - ${OSVERSION} >= 1000010 -CONFIGURE_ENV+= ac_cv_path_RAWCPP="gcpp" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/imake/files/patch-imakemdep.h b/devel/imake/files/patch-imakemdep.h new file mode 100644 index 0000000..87a8662 --- /dev/null +++ b/devel/imake/files/patch-imakemdep.h @@ -0,0 +1,11 @@ +--- ./imakemdep.h.orig 2012-03-08 06:47:32.000000000 +0100 ++++ ./imakemdep.h 2013-06-12 20:22:52.058999526 +0200 +@@ -380,7 +383,7 @@ + defined(__GNUC__) || defined(__GLIBC__) + # ifdef __i386__ + "-D__i386__", +-# if defined(__GNUC__) && (__GNUC__ >= 3) ++# if defined(__GNUC__) && (__GNUC__ >= 3) && !defined(__FreeBSD__) + "-m32", + # endif + # endif diff --git a/devel/imake/files/patch-xmkmf.cpp b/devel/imake/files/patch-xmkmf.cpp index 94a2383..75e4964 100644 --- a/devel/imake/files/patch-xmkmf.cpp +++ b/devel/imake/files/patch-xmkmf.cpp @@ -1,5 +1,14 @@ --- xmkmf.cpp.orig 2012-03-08 06:47:32.000000000 +0100 -+++ xmkmf.cpp 2013-03-17 22:53:14.000000000 +0100 ++++ xmkmf.cpp 2013-06-28 11:55:04.174394058 +0200 +@@ -8,7 +8,7 @@ + topdir= + curdir=. + do_all= +-imake_defines= ++imake_defines="${IMAKECPPFLAGS}" + + while [ $# -gt 0 ] + do @@ -64,3 +64,12 @@ imake $imake_defines $args ;; diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile index 7affdb2..c932ac9 100644 --- a/devel/xxgdb/Makefile +++ b/devel/xxgdb/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xxgdb -# Date created: 2 May 1995 -# Whom: jkh -# +# Created by: jkh # $FreeBSD$ -# PORTNAME= xxgdb PORTVERSION= 1.12 @@ -13,14 +9,12 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= utilities MAINTAINER= cy@FreeBSD.org -COMMENT= An X window interface for gdb +COMMENT= X window interface for gdb -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xaw xext xmu xt MAN1= xxgdb.1 -.include <bsd.port.pre.mk> - # This isn't included in the original Imakefile for some reason. # Yes, I know this will recompile the program every time, but # we have the cookie anyway and it's much easier this way @@ -31,4 +25,4 @@ post-build: post-install: ${INSTALL_PROGRAM} ${WRKSRC}/xxgdbiowin ${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile index d1e2aad..05320a6 100644 --- a/emulators/spim/Makefile +++ b/emulators/spim/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: spim -# Date created: Mon Oct 28, 1996 -# Whom: David O'Brien (obrien@cs.ucdavis.edu) -# +# Created by: David O'Brien (obrien@cs.ucdavis.edu) # $FreeBSD$ -# PORTNAME= spim PORTVERSION= 8.0 @@ -31,14 +26,14 @@ PLIST_DIRS= %%DATADIR%% .if ${PORT_OPTIONS:MGUI} USE_XORG= x11 xaw -BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake +USES+= imake:env PLIST_FILES+= bin/xspim MAN1+= xspim.1 .endif post-build: .if ${PORT_OPTIONS:MGUI} - @(cd ${WRKSRC}/xspim && ${XMKMF} && \ + @(cd ${WRKSRC}/xspim && ${SETENV} ${MAKE_ENV} ${XMKMF} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}) .endif diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile index f6fa431..f396bef 100644 --- a/emulators/xzx/Makefile +++ b/emulators/xzx/Makefile @@ -11,8 +11,7 @@ DISTNAME= ${PORTNAME}-pro-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= ZX Spectrum (48K/128K/+3) Emulator for X11 -# xmkmf is used in configure script; USE_IMAKE makes the build unhappy -BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake +USES= imake:env USE_MOTIF= yes USE_XORG= x11 ice sm xext xpm xt xxf86vm diff --git a/ftp/llnlxdir/Makefile b/ftp/llnlxdir/Makefile index c664844..2e2aa93 100644 --- a/ftp/llnlxdir/Makefile +++ b/ftp/llnlxdir/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: llnlxdir -# Date created: 9 November 1997 -# Whom: Dima Ruban <dima@FreeBSD.org> -# +# Created by: Dima Ruban <dima@FreeBSD.org> # $FreeBSD$ -# PORTNAME= llnlxdir PORTVERSION= 2.1.2 @@ -20,8 +16,8 @@ PLIST_FILES= bin/xdir lib/X11/app-defaults/XDir MAN1= xdir.1 WRKSRC= ${WRKDIR}/llnlxdir2_1_2/sources +USES= imake USE_MOTIF= yes -USE_IMAKE= yes USE_XORG= ice sm x11 xext xp xt .include <bsd.port.mk> diff --git a/ftp/llnlxftp/Makefile b/ftp/llnlxftp/Makefile index 1091305..669316c4 100644 --- a/ftp/llnlxftp/Makefile +++ b/ftp/llnlxftp/Makefile @@ -14,8 +14,8 @@ COMMENT= Motif FTP client PLIST_FILES= bin/xftp lib/X11/app-defaults/XFtp WRKSRC= ${WRKDIR}/llnlxftp2.1/sources +USES= imake USE_MOTIF= yes -USE_IMAKE= yes USE_XORG= ice sm x11 xext xp xt CFLAGS+= -Wno-implicit-int \ diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile index 77be96d..a23572c 100644 --- a/games/bugsx/Makefile +++ b/games/bugsx/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: bugsx -# Date created: 7 December 1997 -# Whom: Don Croyle <croyle@gelemna.org> -# +# Created by: Don Croyle <croyle@gelemna.org> # $FreeBSD$ -# PORTNAME= bugsx PORTVERSION= 1.08 @@ -17,13 +13,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Breed bugs using genetic algorithms -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext WRKSRC= ${WRKDIR}/bugsx -# isn't really gzipped -EXTRACT_CMD= ${TAR} -EXTRACT_BEFORE_ARGS= -xf -EXTRACT_AFTER_ARGS= # empty MAN1= bugsx.1 PLIST_FILES= bin/bugsx diff --git a/games/spider/Makefile b/games/spider/Makefile index 49538e5..08b5719 100644 --- a/games/spider/Makefile +++ b/games/spider/Makefile @@ -13,7 +13,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Challenging double decked solitaire game -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext xaw xmu xt sm ice xpm INSTALL_TARGET= install install.doc MAN1= spider.1 diff --git a/games/xataxx/Makefile b/games/xataxx/Makefile index 9a494ca..320280d 100644 --- a/games/xataxx/Makefile +++ b/games/xataxx/Makefile @@ -14,8 +14,8 @@ COMMENT= Strategy game of position and movement for X Window System OPTIONS_DEFINE= DOCS +USES= imake USE_XORG= x11 xext -USE_IMAKE= yes MAKE_JOBS_SAFE= yes MAN6= xataxx.6 diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile index 1b8ba01..0ee624c 100644 --- a/games/xblackjack/Makefile +++ b/games/xblackjack/Makefile @@ -14,7 +14,7 @@ COMMENT= X11/Motif blackjack game LIB_DEPENDS= Xm:${PORTSDIR}/x11-toolkits/lesstif -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext xp xt xmu MAN1= xblackjack.1 CFLAGS+= -Wno-error=return-type diff --git a/games/xboing/Makefile b/games/xboing/Makefile index 6f8d876..a7fa1d3 100644 --- a/games/xboing/Makefile +++ b/games/xboing/Makefile @@ -14,7 +14,7 @@ COMMENT= X11 arcade game LICENSE= MIT -USE_IMAKE= yes +USES= imake USE_XORG= xpm xext x11 WRKSRC= ${WRKDIR}/xboing MAN1= xboing.1 diff --git a/games/xchomp/Makefile b/games/xchomp/Makefile index 717519a..4adfdec 100644 --- a/games/xchomp/Makefile +++ b/games/xchomp/Makefile @@ -12,8 +12,8 @@ COMMENT= Pac-man-like game under X11 WRKSRC= ${WRKDIR}/xchomp +USES= imake USE_XORG= x11 xext -USE_IMAKE= yes MAKE_JOBS_SAFE= yes PLIST_FILES= bin/xchomp diff --git a/games/xflame/Makefile b/games/xflame/Makefile index e72e23c..bfe928c 100644 --- a/games/xflame/Makefile +++ b/games/xflame/Makefile @@ -9,11 +9,11 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR=kris MAINTAINER= ports@FreeBSD.org -COMMENT= A cool animated flame +COMMENT= cool animated flame DEPRECATED= No more public distfiles -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext NO_INSTALL_MANPAGES= yes diff --git a/games/xinfocom/Makefile b/games/xinfocom/Makefile index a94d3e0..d6b71d6 100644 --- a/games/xinfocom/Makefile +++ b/games/xinfocom/Makefile @@ -17,7 +17,7 @@ COMMENT= An Infocom game interpreter for X11 PLIST_FILES= bin/xinfocom WRKSRC= ${WRKDIR}/xinfocom -USE_IMAKE= yes +USES= imake USE_XORG= xt sm ice xext x11 .include <bsd.port.mk> diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile index df2c015..27ba237 100644 --- a/games/xjewel/Makefile +++ b/games/xjewel/Makefile @@ -15,8 +15,8 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale +USES= imake USE_XORG= x11 xext -USE_IMAKE= yes MAKE_JOBS_SAFE= yes MAN6= xjewel.6 diff --git a/games/xmille/Makefile b/games/xmille/Makefile index 0a94633..9bb837e 100644 --- a/games/xmille/Makefile +++ b/games/xmille/Makefile @@ -14,7 +14,7 @@ COMMENT= X window mille bourne game WRKSRC= ${WRKDIR}/Mille -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext MAN1= xmille.1 MANCOMPRESSED= no diff --git a/games/xmine/Makefile b/games/xmine/Makefile index ecb9f8f..515ed2b 100644 --- a/games/xmine/Makefile +++ b/games/xmine/Makefile @@ -1,7 +1,5 @@ # Created by: joerg -# # $FreeBSD$ -# PORTNAME= xmine PORTVERSION= 1.0.3 @@ -17,7 +15,7 @@ COMMENT= The `Athena' port of the xminesweeper game LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -USE_IMAKE= yes +USES= imake USE_XORG= x11 xaw xext xmu xt xpm sm ice MAN6= xmine.6 MANCOMPRESSED= no diff --git a/games/xneko/Makefile b/games/xneko/Makefile index b586938..76918e2 100644 --- a/games/xneko/Makefile +++ b/games/xneko/Makefile @@ -14,7 +14,7 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= The classic cat-and-mouse NO_WRKSUBDIR= yes -USE_IMAKE= yes +USES= imake USE_XORG= x11 MAN6= xneko.6 PLIST_FILES= bin/xneko diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile index b3ff6fb..b893610 100644 --- a/games/xpilot/Makefile +++ b/games/xpilot/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xpilot -# Date created: 18 July 1995 -# Whom: jmacd -# +# Created by: jmacd # $FreeBSD$ -# PORTNAME= xpilot PORTVERSION= 4.5.5 @@ -14,8 +10,9 @@ MAINTAINER= lme@FreeBSD.org COMMENT= Xpilot(client) and xpilots(server) USE_BZIP2= yes -USE_IMAKE= yes USE_XORG= x11 xext MAN6= xpilot.6 xpilots.6 xp-mapedit.6 xp-replay.6 +USE_GCC= any +USES= imake .include <bsd.port.mk> diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile index 47f92d5..d2db5c3 100644 --- a/games/xpipeman/Makefile +++ b/games/xpipeman/Makefile @@ -16,7 +16,7 @@ COMMENT= Connect the pipes to stop the leaks # LP64 issues ONLY_FOR_ARCHS= i386 amd64 -USE_IMAKE= yes +USES= imake USE_XORG= x11 xaw xext xmu xt sm ice MAN6= xpipeman.6 MANCOMPRESSED= no diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile index 6fa42af..df5d2a7 100644 --- a/games/xpuzzletama/Makefile +++ b/games/xpuzzletama/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xpuzzletama -# Date created: 18 January 1997 -# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> -# +# Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp> # $FreeBSD$ -# PORTNAME= xpuzzletama PORTVERSION= 1.5b @@ -21,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Puzzle tama, a Tetris like game WRKSRC= ${WRKDIR}/${PORTNAME} -USE_IMAKE= yes +USES= imake USE_XORG= xpm NO_INSTALL_MANPAGES= yes diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile index 56c8764..be5a26c 100644 --- a/games/xrisk/Makefile +++ b/games/xrisk/Makefile @@ -8,9 +8,9 @@ CATEGORIES= games MASTER_SITES= http://my.pages.de/pub/comp/unix/games/xrisk/old/ MAINTAINER= ports@FreeBSD.org -COMMENT= A game for X11, much like the popular board game +COMMENT= game for X11, much like the popular board game -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext xt MAN6= xrisk.6 diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile index 543d921..b126953 100644 --- a/games/xrubik/Makefile +++ b/games/xrubik/Makefile @@ -12,7 +12,7 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= X-based rubik's cube(tm) WRKSRC= ${WRKDIR}/xrubik -USE_IMAKE= yes +USES= imake USE_XORG= xt sm ice xext x11 MAN1= xrubik.1 XFREE86_HTML_MAN= no diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile index de066cf..e9eee4b 100644 --- a/games/xscavenger/Makefile +++ b/games/xscavenger/Makefile @@ -13,7 +13,7 @@ COMMENT= Lode Runner clone for X11 WRKSRC_SUBDIR= src -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext MAN6= scavenger.6 diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile index f36b256..59f62cc 100644 --- a/games/xscrabble/Makefile +++ b/games/xscrabble/Makefile @@ -11,8 +11,8 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}_en${EXTRACT_SUFX} MAINTAINER= dinoex@FreeBSD.org COMMENT= X version of the popular board game +USES= imake USE_BZIP2= yes -USE_IMAKE= yes USE_XORG= xaw NO_INSTALL_MANPAGES= yes diff --git a/games/xskat/Makefile b/games/xskat/Makefile index 6dd0573..4acee3d 100644 --- a/games/xskat/Makefile +++ b/games/xskat/Makefile @@ -16,7 +16,7 @@ DISTFILES+= xskat-cards.tar.gz RESTRICTED= The altenburger card file is NOT freely redistributable! .endif -USE_IMAKE= yes +USES= imake USE_XORG= x11 MAN1= xskat.1 xskat-de.1 PLIST_FILES= bin/xskat diff --git a/games/xvmines/Makefile b/games/xvmines/Makefile index e42749e..73801fb 100644 --- a/games/xvmines/Makefile +++ b/games/xvmines/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= xview:${PORTSDIR}/x11-toolkits/xview OPTIONS_DEFINE= DOCS +USES= imake USE_XORG= x11 -USE_IMAKE= yes MAKE_JOBS_SAFE= yes MANCOMPRESSED= no diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile index 408cdc2..eb4aa90 100644 --- a/graphics/ivtools/Makefile +++ b/graphics/ivtools/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: ivtools -# Date created: 13 March 2002 -# Whom: scott -# +# Created by: scott # $FreeBSD$ -# PORTNAME= ivtools PORTVERSION= 1.2.9 @@ -15,14 +11,15 @@ EXTRACT_SUFX= .tgz MAINTAINER= sylvio@FreeBSD.org COMMENT= Drawing editors derived from idraw -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff +USES= imake:env USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf CONFIGURE_ARGS= --with-tiff=${PREFIX} +CONFIGURE_ENV= IMAKECPP=${CPP} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} MAKE_ARGS= ARCH=FREEBSD USE_XORG= x11 xaw ice xext diff --git a/graphics/libaux/Makefile b/graphics/libaux/Makefile index 8d34e90..150e455 100644 --- a/graphics/libaux/Makefile +++ b/graphics/libaux/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libaux -# Date created: 14 March 2001 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libaux PORTVERSION= 1.0 @@ -13,12 +9,12 @@ MASTER_SITES= http://www.freebsdbrasil.com.br/~jmelo/ DISTFILES= libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org -COMMENT= A Nano Window Toolkit and Auxiliary Library for OpenGL +COMMENT= Nano Window Toolkit and Auxiliary Library for OpenGL WRKSRC= ${WRKDIR}/${PORTNAME} +USES= imake USE_GL= glut -USE_IMAKE= yes MAKE_JOBS_UNSAFE= yes do-install: diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile index 0b61351..8637354 100644 --- a/graphics/tgif/Makefile +++ b/graphics/tgif/Makefile @@ -18,8 +18,8 @@ RUN_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm OPTIONS_DEFINE= NLS A4SIZE DOCS A4SIZE_DESC= Set default paper size to A4 +USES= imake USE_GCC= any -USE_IMAKE= yes PORTDOCS= HISTORY README USE_XORG= x11 xext xt sm ice MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile index 10a5e68..2365951 100644 --- a/graphics/vcg/Makefile +++ b/graphics/vcg/Makefile @@ -13,14 +13,13 @@ DISTNAME= ${PORTNAME}.20050204 EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -COMMENT= A Visualization Tool for compiler graphs +COMMENT= Visualization Tool for compiler graphs LICENSE= GPLv2 # (or later) -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake - WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} +USES= imake:env USE_XORG= x11 xext MAKE_JOBS_UNSAFE= yes diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index c06dcea..e9ff08f 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -20,7 +20,7 @@ CONFLICTS= xfig-[12].* xfig-3.1* xfig-3.2.[1234]* WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xaw xext xi xmu xpm xt MAN1= xfig.1 MANCOMPRESSED= yes diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile index d0c26c6..3d1112e 100644 --- a/graphics/xfpovray/Makefile +++ b/graphics/xfpovray/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xfpovray -# Date created: 20 Sep 1997 -# Whom: Thomas Gellekum <tg@FreeBSD.org> -# +# Created by: Thomas Gellekum <tg@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xfpovray PORTVERSION= 1.3.1 @@ -20,7 +16,7 @@ COMMENT= Graphical interface to POV-Ray LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext xpm USE_GMAKE= yes MAKE_JOBS_UNSAFE= yes diff --git a/graphics/xgrasp/Makefile b/graphics/xgrasp/Makefile index cf8105d..9317b67 100644 --- a/graphics/xgrasp/Makefile +++ b/graphics/xgrasp/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xgrasp -# Date created: 23 July 1995 -# Whom: asami -# +# Created by: asami # $FreeBSD$ -# PORTNAME= xgrasp PORTVERSION= 1.7d @@ -18,8 +14,8 @@ COMMENT= Display GL animations on X screen NO_WRKSUBDIR= yes +USES= imake USE_XORG= x11 xext -USE_IMAKE= yes MAKE_JOBS_SAFE= yes MAN1= glib.1 xgrasp.1 diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index 70ecac3..fce87bb 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xli -# Date created: 24 November 1994 -# Whom: Satoshi Asami <asami@FreeBSD.org> -# +# Created by: Satoshi Asami <asami@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xli PORTVERSION= 1.17.0 @@ -20,9 +16,9 @@ CONFLICTS_INSTALL= xloadimage-* LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg +USES= imake USE_XORG= xi USE_GCC= any -USE_IMAKE= yes WRKSRC= ${WRKDIR}/xli-${XLI_SNAPVER} MAN1= xli.1 xlito.1 diff --git a/graphics/xmandel/Makefile b/graphics/xmandel/Makefile index 6722da6..f98244e 100644 --- a/graphics/xmandel/Makefile +++ b/graphics/xmandel/Makefile @@ -17,7 +17,7 @@ COMMENT= Window based interface to Mandelbrot sets and Julia sets EXTRACT_CMD= ${SH} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= # empty -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xaw xext xmu xt USE_PERL5_BUILD=yes NO_WRKSUBDIR= yes diff --git a/graphics/xpx/Makefile b/graphics/xpx/Makefile index dcd0b91..9a59ff8 100644 --- a/graphics/xpx/Makefile +++ b/graphics/xpx/Makefile @@ -1,9 +1,5 @@ -# ports collection makefile for: xpx -# Date created: 25 Oct 1998 -# Whom: Seiichirou Hiraoka -# +# Created by: Seiichirou Hiraoka # $FreeBSD$ -# PORTNAME= xpx PORTVERSION= 1.41 @@ -17,8 +13,8 @@ COMMENT= Simple pixel editing tool to generate data for KISS WRKSRC= ${WRKDIR}/${PORTNAME} +USES= imake USE_XORG= x11 xext -USE_IMAKE= yes XMKMF= xmkmf DOCSDIR= ${PREFIX}/share/doc/ja/${PORTNAME} diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 0e4dfe1..feab3d0 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -16,14 +16,14 @@ PATCH_SITES= http://www.gregroelofs.com/code/ PATCHFILES= xv-3.10a-enhancements.20070520-20081216.diff MAINTAINER?= dinoex@FreeBSD.org -COMMENT?= An X11 program that displays images of various formats +COMMENT?= X11 program that displays images of various formats LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ tiff:${PORTSDIR}/graphics/tiff \ png15:${PORTSDIR}/graphics/png \ jasper:${PORTSDIR}/graphics/jasper -USE_IMAKE= yes +USES= imake USE_XORG= xext x11 xt .if !defined(NOMAN) MAN1= bggen.1 vdcomp.1 xcmap.1 xv.1 xvp2p.1 diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile index a7a2e3b..a747631 100644 --- a/japanese/Wnn7-lib/Makefile +++ b/japanese/Wnn7-lib/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: head files and libraries of Wnn7 -# Date created: 01/07/16 -# Whom: Satoshi Taoka <taoka@FreeBSD.org> -# +# Created by: Satoshi Taoka <taoka@FreeBSD.org> # $FreeBSD$ -# PORTNAME= Wnn7-lib PORTVERSION= 2001.10.17 @@ -16,8 +12,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= hrs@FreeBSD.org COMMENT= Wnn7 client library +USES= imake USE_GCC= any -USE_IMAKE= yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/src PORTDOCS= README @@ -29,10 +25,11 @@ post-patch: ${WRKSRC}/config/Project.tmpl \ ${WRKSRC}/config/X11.tmpl \ ${WRKSRC}/Makefile.ini + @${REINPLACE_CMD} -e 's/((/(/' ${WRKSRC}/config/X11.tmpl # Warning: we cannot use USE_IMAKE. do-build: - cd ${WRKSRC} && make World -f Makefile.ini + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} make World -f Makefile.ini post-install: ${MKDIR} ${PREFIX}/include/wnn7/wnn diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index c352ed7..7dcefd6 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: canna-lib -# Date created: 7 September 2008 -# Whom: hrs -# +# Created by: hrs # $FreeBSD$ -# PORTNAME= canna PORTVERSION= 3.7p3 @@ -17,9 +13,9 @@ DISTNAME= Canna${PORTVERSION:S/.//g} MAINTAINER= hrs@FreeBSD.org COMMENT= A Kana-to-Kanji conversion system, library part +USES= imake USE_BZIP2= yes USE_GCC= any -USE_IMAKE= yes USE_LDCONFIG= yes NO_INSTALL_MANPAGES=yes MAKE_JOBS_UNSAFE= yes @@ -28,12 +24,10 @@ PLIST_SUB= METAFILE="${METAFILE}" \ ALL_TARGET= canna INSTALL_TARGET= instsgs +XMKMF= xmkmf METAFILE= ${DATADIR_REL}/canna-lib-dic.meta -post-configure: - @cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} - post-install: ${MTREE_CMD} -cdink uname,gname,mode,nochange \ -p ${DATADIR}/dic > ${PREFIX}/${METAFILE} diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 1820d45..87c0fd4 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -15,9 +15,10 @@ COMMENT= A Kana-to-Kanji conversion system, binary part LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/canna-lib +USES= imake +USE_GCC= any USE_RC_SUBR= canna USE_BZIP2= yes -USE_IMAKE= yes ALL_TARGET= canna INSTALL_TARGET= instserver instclient PLIST_SUB= METAFILE="${METAFILE}" \ diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index 2ec3967..9172f9d 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION} MAINTAINER= hrs@FreeBSD.org COMMENT= A Japanese text input server for X11 applications -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xaw xext xmu xpm xt SUB_FILES= Kinput2.conf PLIST_FILES= ${PLIST_ALL} diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile index 4b9564f..0476d47 100644 --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -36,7 +36,7 @@ COMMENT= An xterm variant with Japanese support BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf -USE_IMAKE= yes +USES= imake USE_XORG= xaw CFLAGS+= -Wno-return-type diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile index 6743426..6603afa 100644 --- a/japanese/sj3-lib/Makefile +++ b/japanese/sj3-lib/Makefile @@ -13,10 +13,10 @@ PATCHFILES= ${PORTNAME}-qq-2.0.1.21.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= hrs@FreeBSD.org -COMMENT= A Japanese input method, library part +COMMENT= Japanese input method, library part +USES= imake USE_GCC= any -USE_IMAKE= yes USE_LDCONFIG= yes NO_INSTALL_MANPAGES= yes SUB_FILES= sj3_freebsd.tmpl diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile index c986c5e..86f7214 100644 --- a/japanese/sj3-server/Makefile +++ b/japanese/sj3-server/Makefile @@ -13,14 +13,15 @@ PATCHFILES= ${PORTNAME}-qq-2.0.1.21.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= hrs@FreeBSD.org -COMMENT= A Japanese input method, binary part +COMMENT= Japanese input method, binary part LIB_DEPENDS= sj3lib:${PORTSDIR}/japanese/sj3-lib +USES= imake USE_RC_SUBR= sj3 -USE_IMAKE= yes SUB_FILES= sj3_freebsd.tmpl SUB_LIST= DESTDIR=${DESTDIR} +CFLAGS+= -Wno-return-type USERS= _sj3 GROUPS= _sj3 diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile index 24372cb..11910cd 100644 --- a/japanese/skkinput/Makefile +++ b/japanese/skkinput/Makefile @@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= skkinput2/6273 MAINTAINER= koma2@lovepeers.org COMMENT= SKK-like Japanese input method for X11 -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xext xt xmu OPTIONS_RADIO= RG1 diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile index 3140872..358f7a7 100644 --- a/japanese/skkinput3/Makefile +++ b/japanese/skkinput3/Makefile @@ -11,7 +11,8 @@ DISTNAME= skkinput-${PORTVERSION} MAINTAINER= koma2@lovepeers.org COMMENT= SKK-like Japanese input method for X11 -USE_IMAKE= yes +USES= imake +USE_GCC= any USE_XORG= ice sm x11 xext xmu xt OPTIONS_DEFINE= SKK10 @@ -21,6 +22,7 @@ RG1_DESC= Skkserver Selection DBSKKD_DESC= Use ja-dbskkd-cdb as skkserver RSKKSERV_DESC= Use ja-rskkserv as skkserver SKK10_DESC= Use SKK10 elisps +USE_CSTD= gnu89 NO_INSTALL_MANPAGES= yes diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile index 7582880..ceaaf27 100644 --- a/mail/xfaces/Makefile +++ b/mail/xfaces/Makefile @@ -24,8 +24,8 @@ LIB_DEPENDS= compface:${PORTSDIR}/mail/faces # GNU make properly processes some overridden rules in the makefile that # imake generates. Specifically, installing the html docs. +USES= imake USE_GMAKE= yes -USE_IMAKE= yes USE_XORG= ice sm x11 xaw xext xmu xt xpm MAN1= xfaces.1 diff --git a/math/xgobi/Makefile b/math/xgobi/Makefile index f47dd0d..fdadb37 100644 --- a/math/xgobi/Makefile +++ b/math/xgobi/Makefile @@ -19,7 +19,7 @@ CONFIGURE_WRKSRC= ${PATCH_WRKSRC} BUILD_WRKSRC= ${PATCH_WRKSRC} CFLAGS+= -Wno-return-type -USE_IMAKE= true +USES= imake USE_XORG= xbitmaps xaw XFREE86_HTML_MAN= no diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index 11f136f..af407be 100644 --- a/misc/magicpoint/Makefile +++ b/misc/magicpoint/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ mng:${PORTSDIR}/graphics/libmng RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm -USE_IMAKE= yes +USES= imake:env USE_XORG= x11 xext xmu xt sm ice xi xtst WANT_GNOME= yes GNU_CONFIGURE= yes @@ -81,6 +81,7 @@ post-patch: ${WRKSRC}/configure post-configure: + (cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}) cd ${WRKSRC}/contrib/xmindpath && \ ${SH} ${CONFIGURE_SCRIPT} --prefix=${PREFIX} diff --git a/misc/xless/Makefile b/misc/xless/Makefile index a7860b3..88ab3fc 100644 --- a/misc/xless/Makefile +++ b/misc/xless/Makefile @@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= ports@FreeBSD.org COMMENT= X11 viewer for text files. Useful as an add-on tool for other apps -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xaw xext xmu xpm xt MAN1= xless.1 MANCOMPRESSED= yes diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile index 42dfa15..1edb285 100644 --- a/multimedia/xanim/Makefile +++ b/multimedia/xanim/Makefile @@ -19,8 +19,8 @@ NO_CDROM= redistributed without fee # clang's cpp destroys whitespace, particularly hard tabs in makefiles, # which is fatal for imake. +USES= imake USE_GCC= any -USE_IMAKE= yes USE_XORG= xext xt sm ice xext x11 MAN1= xanim.1 MAKE_ARGS+= -j 2 # safe and helps even the single-CPU machines diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile index 1f630dc..d04dfc3 100644 --- a/net/ssvnc/Makefile +++ b/net/ssvnc/Makefile @@ -13,7 +13,6 @@ COMMENT= Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= stunnel:${PORTSDIR}/security/stunnel \ xterm:${PORTSDIR}/x11/xterm @@ -21,6 +20,7 @@ RUN_DEPENDS= stunnel:${PORTSDIR}/security/stunnel \ OPTIONS_DEFINE= ULTRAFTP DOCS ULTRAFTP_DESC= UltraVNC File Transfer support (Java required) +USES= imake:env USE_XORG= xi xmu xt xaw ice xpm xext sm USE_TK_WRAPPER= yes USE_PERL5_RUN= yes @@ -55,7 +55,7 @@ post-patch: .endif do-configure: - @cd ${WRKSRC} && ${GMAKE} config + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} config post-install: @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 69cf3d3..4e06e13 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -22,10 +22,11 @@ CONFLICTS= tridiavnc-[0-9]* vnc-[0-9]* WRKSRC= ${WRKDIR}/vnc_unixsrc +USES= imake +CFLAGS+= -Wno-return-type USE_GCC= yes USE_BZIP2= yes USE_PERL5= yes -USE_IMAKE= yes USE_XORG= xaw ALL_TARGET= World NO_INSTALL_MANPAGES= yes diff --git a/news/knews/Makefile b/news/knews/Makefile index bedc86c..1293ac8 100644 --- a/news/knews/Makefile +++ b/news/knews/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR=dinoex MAINTAINER= dinoex@FreeBSD.org -COMMENT= A threaded nntp newsreader for X +COMMENT= Threaded nntp newsreader for X LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ @@ -18,7 +18,7 @@ RUN_DEPENDS= newsp:${PORTSDIR}/print/mp-letter LICENSE= GPLv2 -USE_IMAKE= yes +USES= imake USE_XORG= xmu xpm xt sm ice xext x11 MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 CC="${CC}" \ XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f diff --git a/print/bibview/Makefile b/print/bibview/Makefile index 02adfd6..d7d21b4 100644 --- a/print/bibview/Makefile +++ b/print/bibview/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: bibview -# Date created: 21 July 1997 -# Whom: dbader@eece.unm.edu -# +# Created by: dbader@eece.unm.edu # $FreeBSD$ -# PORTNAME= bibview PORTVERSION= 2.2 @@ -17,7 +13,7 @@ COMMENT= Graphical interface for manipulating BibTeX bibliography databases MAKE_JOBS_SAFE= yes -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xaw xext xmu xt WRKSRC= ${WRKDIR}/bibview-${PORTVERSION} MAN1= bibview.1 diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile index 10c7b4a..ca6d460 100644 --- a/print/ghostview/Makefile +++ b/print/ghostview/Makefile @@ -13,7 +13,7 @@ COMMENT= X11 front-end for ghostscript, the GNU postscript previewer LICENSE= GPLv2 # (or later) -USE_IMAKE= yes +USES= imake USE_XORG= xbitmaps xaw USE_GHOSTSCRIPT_RUN= yes MAKE_JOBS_SAFE= yes diff --git a/print/transfig/Makefile b/print/transfig/Makefile index 9c0f811..44faaa5 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: transfig -# Date created: 9 August 1996 -# Whom: chuckr@freebsd.org -# +# Created by: chuckr@freebsd.org # $FreeBSD$ -# PORTNAME= transfig PORTVERSION= 3.2.5d @@ -20,9 +16,9 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png MAKE_JOBS_SAFE= yes -USE_GCC= any +USES= imake +CFLAGS+= -Wno-return-type USE_GHOSTSCRIPT_RUN= yes -USE_IMAKE= yes USE_XORG= xpm MAN1= fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1 diff --git a/sysutils/contool/Makefile b/sysutils/contool/Makefile index 285827e..09a6ea3 100644 --- a/sysutils/contool/Makefile +++ b/sysutils/contool/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview NO_CDROM= source code cannot be sold, nor can you incorporate the source code into a product which is subsequently sold NO_WRKSUBDIR= yes -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext MAN1= contool.1 diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile index 93d1f2b..67e125c 100644 --- a/sysutils/xbattbar/Makefile +++ b/sysutils/xbattbar/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xbattbar -# Date created: Fri Feb 18 10:05:12 JST 2000 -# Whom: sumikawa -# +# Created by: sumikawa # $FreeBSD$ -# PORTNAME= xbattbar PORTVERSION= 1.4.2 @@ -15,7 +11,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= sumikawa@FreeBSD.org COMMENT= Simple battery meter -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext WRKSRC= ${WRKDIR}/xbattbar-${PORTVERSION} MAN1= xbattbar.1 diff --git a/sysutils/xcpustate/Makefile b/sysutils/xcpustate/Makefile index 5128942..d61be32 100644 --- a/sysutils/xcpustate/Makefile +++ b/sysutils/xcpustate/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: xcpustate -# Date created: 31-Dec-1995 -# Whom: David O'Brien <obrien@cs.ucdavis.edu> -# +# Created by: David O'Brien <obrien@cs.ucdavis.edu> # $FreeBSD$ -# PORTNAME= xcpustate PORTVERSION= 2.9 @@ -16,14 +11,14 @@ EXTRACT_SUFX= .shar MAINTAINER= ports@FreeBSD.org COMMENT= System monitoring utility graphically showing cpu load and status -EXTRACT_CMD= ${CAT} +EXTRACT_CMD= ${SH} EXTRACT_BEFORE_ARGS= # none -EXTRACT_AFTER_ARGS= | ${SH} +EXTRACT_AFTER_ARGS= # none NO_WRKSUBDIR= yes +USES= imake USE_XORG= ice sm x11 xaw xext xmu xt -USE_IMAKE= yes MAN1= ${PORTNAME}.1 PLIST_FILES= bin/${PORTNAME} diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile index 6f1ab29..75539e7 100644 --- a/x11-clocks/asclock/Makefile +++ b/x11-clocks/asclock/Makefile @@ -17,8 +17,8 @@ CONFLICTS= asclock-gtk-[0-9]* asclock-xlib-[0-9]* # clang's cpp destroys whitespace, particularly hard tabs in makefiles, # which is fatal for imake. +USES= imake USE_GCC= any -USE_IMAKE= yes USE_XORG= xpm xext x11 MAN1= asclock.1 PLIST_FILES= bin/asclock diff --git a/x11-clocks/bclock/Makefile b/x11-clocks/bclock/Makefile index 2e32246..e45268b 100644 --- a/x11-clocks/bclock/Makefile +++ b/x11-clocks/bclock/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: bclock -# Date created: 13 May 1997 -# Whom: Brian Handy <handy@physics.montana.edu> -# +# Created by: Brian Handy <handy@physics.montana.edu> # $FreeBSD$ -# PORTNAME= bclock PORTVERSION= 1.0 @@ -15,7 +11,7 @@ MASTER_SITE_SUBDIR= X11/clocks MAINTAINER= ports@FreeBSD.org COMMENT= Round, analog X11 clock with Bezier curve hands -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xext xmu xt MAN1= bclock.1 diff --git a/x11-clocks/lmclock/Makefile b/x11-clocks/lmclock/Makefile index 16ad7b5..e9efd9e 100644 --- a/x11-clocks/lmclock/Makefile +++ b/x11-clocks/lmclock/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= CRITICAL MAINTAINER= ehaupt@FreeBSD.org COMMENT= Xerox Lisp machine clock clone -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext MAKE_JOBS_SAFE= yes diff --git a/x11-clocks/mouseclock/Makefile b/x11-clocks/mouseclock/Makefile index cd45b20..416880f 100644 --- a/x11-clocks/mouseclock/Makefile +++ b/x11-clocks/mouseclock/Makefile @@ -11,10 +11,9 @@ MASTER_SITE_SUBDIR= X11/clocks MAINTAINER= ports@FreeBSD.org COMMENT= Display the current time using the X root cursor +USES= imake USE_GMAKE= yes -USE_IMAKE= yes USE_XORG= x11 xext -XMKMF= xmkmf NO_INSTALL_MANPAGES= yes post-configure: diff --git a/x11-clocks/swisswatch/Makefile b/x11-clocks/swisswatch/Makefile index 2f7acaa..952b834 100644 --- a/x11-clocks/swisswatch/Makefile +++ b/x11-clocks/swisswatch/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: swisswatch -# Date created: 16 December 1995 -# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp> -# +# Created by: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp> # $FreeBSD$ -# PORTNAME= swisswatch PORTVERSION= 0.06 @@ -13,10 +9,10 @@ MASTER_SITES= ${MASTER_SITE_PORTS_JP} EXTRACT_SUFX= .tar.Z MAINTAINER= sanpei@FreeBSD.org -COMMENT= A Swiss railway clock emulation, and a fancy default appearance +COMMENT= Swiss railway clock emulation, and a fancy default appearance +USES= imake USE_GCC= any -USE_IMAKE= yes USE_XORG= ice sm x11 xext xmu xt MAN1= swisswatch.1 diff --git a/x11-clocks/t3d/Makefile b/x11-clocks/t3d/Makefile index 482415a..7231d8f 100644 --- a/x11-clocks/t3d/Makefile +++ b/x11-clocks/t3d/Makefile @@ -19,7 +19,7 @@ EXTRACT_BEFORE_ARGS= -dc EXTRACT_AFTER_ARGS= | ${SH} NO_WRKSUBDIR= yes -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext MAN1= t3d.1 diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile index bee8416..79fbc18 100644 --- a/x11-fonts/jmk-x11-fonts/Makefile +++ b/x11-fonts/jmk-x11-fonts/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USE_IMAKE= yes +USES= imake do-install: @${MKDIR} ${PREFIX}/lib/X11/fonts/jmk diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile index ed74538..44bc8d7 100644 --- a/x11-fonts/sgifonts/Makefile +++ b/x11-fonts/sgifonts/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= lib/X11/fonts/local/sgi PKGMESSAGE= ${WRKDIR}/pkg-message -USE_IMAKE= yes +USES= imake EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -O -xf EXTRACT_AFTER_ARGS= sgi-fonts.tar.gz | ${TAR} -xf - diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile index 9ef8bb7..97e55f4 100644 --- a/x11-toolkits/Xaw3d/Makefile +++ b/x11-toolkits/Xaw3d/Makefile @@ -14,8 +14,8 @@ COMMENT= 3-D Athena Widget set that looks like Motif LICENSE= MIT WRKSRC= ${WRKDIR}/xc/lib/Xaw3d +USES= imake USE_GCC= any -USE_IMAKE= yes USE_XORG= x11 xext xmu xt sm ice xpm USE_LDCONFIG= yes diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile index 9657a69..042f7d2 100644 --- a/x11-toolkits/xview-clients/Makefile +++ b/x11-toolkits/xview-clients/Makefile @@ -21,7 +21,7 @@ PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:patch CONFIGURE_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:configure LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext WRKSRC= ${WRKDIRPREFIX}${.CURDIR}/../xview/work/${DISTNAME} ALL_TARGET= Clients diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile index 1ebeb5b..ac2d63a 100644 --- a/x11-toolkits/xview/Makefile +++ b/x11-toolkits/xview/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ ONLY_FOR_ARCHS= i386 REINPLACE_ARGS= -i "" -USE_IMAKE= yes +USES= imake USE_XORG= x11 USE_LDCONFIG= yes IMAKEINCLUDE= "-I${WRKSRC}/config -I${LOCALBASE}/lib/X11/config" diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index e3bd29a..5009733 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= asclock:${PORTSDIR}/x11-clocks/asclock NO_LATEST_LINK= yes USE_XORG= xpm xext x11 -USE_IMAKE= yes +USES= imake INSTALL_TARGET= install install.man MANCOMPRESSED= yes MAN1= afterstep.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1 @@ -42,7 +42,7 @@ post-patch: done pre-build: - @ cd ${WRKSRC}; ${SH} MakeMakefiles + @ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SH} MakeMakefiles post-install: @ ${MKDIR} ${PREFIX}/lib/X11/afterstep/backgrounds/ diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile index 5121a98..9b1001b 100644 --- a/x11-wm/fvwm/Makefile +++ b/x11-wm/fvwm/Makefile @@ -13,10 +13,9 @@ COMMENT= The fvwm window manager NO_LATEST_LINK= yes MAKE_JOBS_UNSAFE= yes -USE_IMAKE= yes +USES= imake USE_XORG= xbitmaps xpm xext x11 xmu # must overwrite the default from bsd.port.mk -XMKMF= xmkmf ALL_TARGET= Makefiles all MAN1= FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmClean.1 \ FvwmDebug.1 FvwmIconBox.1 FvwmIdent.1 FvwmPager.1 FvwmSave.1 \ diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile index 0ec7bfb..c72a3f7 100644 --- a/x11-wm/olvwm/Makefile +++ b/x11-wm/olvwm/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: olvwm -# Date created: 21 October 1994 -# Whom: smace -# +# Created by: smace # $FreeBSD$ -# PORTNAME= olvwm PORTVERSION= 4.2 @@ -31,7 +27,7 @@ LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview REINPLACE_ARGS= -i "" NO_WRKSUBDIR= yes -USE_IMAKE= yes +USES= imake USE_XORG= xpm MAN1= olvwm.1 olvwmrc.1 XFREE86_HTML_MAN= no diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile index 3ab0291..df2ed0d 100644 --- a/x11-wm/piewm/Makefile +++ b/x11-wm/piewm/Makefile @@ -8,10 +8,10 @@ CATEGORIES= x11-wm MASTER_SITES= http://www.crynwr.com/piewm/ MAINTAINER= david@catwhisker.org -COMMENT= A tvtwm with pie (circular) menus +COMMENT= tvtwm with pie (circular) menus +USES= imake DISABLE_SIZE= yes -USE_IMAKE= yes USE_XORG= xbitmaps xpm xmu MAN1= piewm.1 diff --git a/x11-wm/treewm/Makefile b/x11-wm/treewm/Makefile index 03421e4..073f8ae 100644 --- a/x11-wm/treewm/Makefile +++ b/x11-wm/treewm/Makefile @@ -12,7 +12,7 @@ COMMENT= Window manager that arranges windows in a tree LICENSE= GPLv2 -BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake +USES= imake:env USE_BZIP2= yes USE_GMAKE= yes diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile index 6799c3c..0bce7f4 100644 --- a/x11/bricons/Makefile +++ b/x11/bricons/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: bricons -# Date created: 31 Jul 1996 -# Whom: shanee@augusta.de -# +# Created by: shanee@augusta.de # $FreeBSD$ -# PORTNAME= bricons PORTVERSION= 3.0 @@ -18,9 +14,9 @@ COMMENT= Quick start up utility for applications on an X display WRKSRC= ${WRKDIR}/${PORTNAME} +USES= imake USE_PERL5_BUILD=yes USE_XORG= xaw -USE_IMAKE= yes MAKE_JOBS_SAFE= yes MAN1= bricons.1 diff --git a/x11/dynamag/Makefile b/x11/dynamag/Makefile index d9057d8..1ecf089 100644 --- a/x11/dynamag/Makefile +++ b/x11/dynamag/Makefile @@ -15,7 +15,7 @@ COMMENT= Magnifying utility which updates continuously ALL_TARGET= dynamag NO_INSTALL_MANPAGES= yes PLIST_FILES= bin/dynamag -USE_IMAKE= yes +USES= imake USE_XORG= x11 xaw xext xmu xt xpm sm ice WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 14bfff7..94d7271 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -14,8 +14,7 @@ COMMENT= Basic applications for the KDE system RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env \ kompmgr:${PORTSDIR}/x11-wm/kompmgr \ ${LOCALBASE}/etc/pam.d/kde:${PORTSDIR}/security/pam_kde -BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake \ - bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ +BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient @@ -27,6 +26,7 @@ EXPIRATION_DATE= 2013-07-01 USE_KDELIBS_VER=3 +USES= imake:env USE_OPENLDAP= yes USE_OPENSSL= yes diff --git a/x11/props/Makefile b/x11/props/Makefile index c91bf75..8d3f428 100644 --- a/x11/props/Makefile +++ b/x11/props/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: props -# Date created: 3 January 1998 -# Whom: jraynard -# +# Created by: jraynard # $FreeBSD$ -# PORTNAME= props PORTVERSION= 1.0 @@ -21,7 +17,7 @@ CONFLICTS= xview-clients-3.2.1.4.19* LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview WRKSRC= ${WRKDIR}/props -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext MAKE_ARGS= INFOFILES="" diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile index 221fdbf..a11fd42 100644 --- a/x11/x3270/Makefile +++ b/x11/x3270/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: x3270 -# Date created: 31 January 1995 -# Whom: janek -# +# Created by: janek # $FreeBSD$ -# PORTNAME= x3270 PORTVERSION= 3.3.10 @@ -18,8 +14,7 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale -USE_IMAKE= yes -USES= iconv +USES= iconv imake:env USE_XORG= ice sm x11 xaw xext xmu xt GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/lib/X11/fonts/local --disable-dbcs diff --git a/x11/xascii/Makefile b/x11/xascii/Makefile index c274aae..adf2172 100644 --- a/x11/xascii/Makefile +++ b/x11/xascii/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xascii -# Date created: 10 April 2012 -# Whom: Cy Schubert <cy@FreeBSD.org> -# +# Created by: Cy Schubert <cy@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xascii PORTVERSION= 1.0 @@ -17,7 +13,7 @@ MAINTAINER= cy@FreeBSD.org COMMENT= Display an ASCII table in decimal, octal, and hexadecimal. MAKE_ARGS+= PREFIX=${PREFIX} -USE_IMAKE= YES +USES= imake USE_XORG= x11 xt xaw MAN1= xascii.1 PLIST_FILES= bin/xascii diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile index efdab93..32b2adf 100644 --- a/x11/xautolock/Makefile +++ b/x11/xautolock/Makefile @@ -16,13 +16,9 @@ OPTIONS_DEFINE= XLOCK OPTIONS_DEFAULT= XLOCK XLOCK_DESC= Force dependency on x11/xlockmore -.include <bsd.port.options.mk> +XLOCK_RUN_DEPENDS= xlock:${PORTSDIR}/x11/xlockmore -.if ${PORT_OPTIONS:MXLOCK} -RUN_DEPENDS+= xlock:${PORTSDIR}/x11/xlockmore -.endif - -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext xscrnsaver MAN1= xautolock.1 PLIST_FILES= bin/xautolock diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile index aa1fc49..e474601 100644 --- a/x11/xcb/Makefile +++ b/x11/xcb/Makefile @@ -14,7 +14,7 @@ COMMENT= Tool for managing x11 cut-buffers LICENSE= MIT -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xaw xext xmu xt MAN1= xcb.1 diff --git a/x11/xcoloredit/Makefile b/x11/xcoloredit/Makefile index 18f5ad7..bf5aab8 100644 --- a/x11/xcoloredit/Makefile +++ b/x11/xcoloredit/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xcoloredit -# Date created: 6 Jun 1997 -# Whom: Satoshi TAOKA -# +# Created by: Satoshi TAOKA # $FreeBSD$ -# PORTNAME= xcoloredit PORTVERSION= 1.2 @@ -16,8 +12,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Find colour values by graphical colour mixing +USES= imake USE_XORG= ice sm x11 xaw xext xmu xpm xt -USE_IMAKE= yes MAKE_JOBS_SAFE= yes MANCOMPRESSED= yes diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile index ca0a577..7cc45a8 100644 --- a/x11/xgrab/Makefile +++ b/x11/xgrab/Makefile @@ -15,9 +15,8 @@ COMMENT= X11 image grabber BUILD_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb -USES= display:build +USES= display:build imake USE_XORG= x11 -USE_IMAKE= yes MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \ XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f diff --git a/x11/xlogout/Makefile b/x11/xlogout/Makefile index ea37841..a9ea951 100644 --- a/x11/xlogout/Makefile +++ b/x11/xlogout/Makefile @@ -10,8 +10,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= naddy@FreeBSD.org COMMENT= Simple logout button +USES= imake WRKSRC= ${WRKDIR}/xlogout -USE_IMAKE= yes USE_XORG= ice sm x11 xaw xext xmu xpm xt MAKE_JOBS_SAFE= yes MAN1= xlogout.1 diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile index 82f9884..87dbef6 100644 --- a/x11/xmotd/Makefile +++ b/x11/xmotd/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xmotd -# Date created: 29 January 2001 -# Whom: Matthew West <mwest@uct.ac.za> -# +# Created by: Matthew West <mwest@uct.ac.za> # $FreeBSD$ -# PORTNAME= xmotd DISTVERSION= 1.17.3b @@ -12,9 +8,9 @@ CATEGORIES= x11 MASTER_SITES= http://www.ee.ryerson.ca/~elf/pub/ MAINTAINER= ports@FreeBSD.org -COMMENT= A message-of-the-day browser for X11 and dumb-terminals +COMMENT= message-of-the-day browser for X11 and dumb-terminals -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xaw xext xmu xt NO_INSTALL_MANPAGES= yes XFREE86_HTML_MAN= no @@ -25,6 +21,7 @@ PLIST_FILES= bin/xmotd OPTIONS_DEFINE= HTML MOTIF XPM HTML_DESC= Use HTML widget instead of ASCII text + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MHTML} diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index 3e3bd6a..7fa17e1 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -3,6 +3,7 @@ PORTNAME= xorg-cf-files PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -12,14 +13,8 @@ LICENSE= MIT XORG_CAT= util -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} 's|\(define ExtraXaw[^ ]*\) [$$].*|\1 /**/|' \ ${WRKSRC}/X11.tmpl -.if defined(CC) && ${CC:T:M*clang*} == "clang" - ${REINPLACE_CMD} -e 's|/usr/bin/cpp|${LOCALBASE}/bin/ucpp|' \ - -e 's|-traditional|-s|' ${WRKSRC}/FreeBSD.cf -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/xorg-cf-files/files/patch-FreeBSD.cf b/x11/xorg-cf-files/files/patch-FreeBSD.cf index 524dee8..827c369 100644 --- a/x11/xorg-cf-files/files/patch-FreeBSD.cf +++ b/x11/xorg-cf-files/files/patch-FreeBSD.cf @@ -1,5 +1,5 @@ ---- FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 -+++ FreeBSD.cf Fri Sep 10 19:52:31 2004 +--- ./FreeBSD.cf.orig 2009-10-16 23:45:42.000000000 +0200 ++++ ./FreeBSD.cf 2013-06-27 17:14:30.661790922 +0200 @@ -78,6 +78,7 @@ #define HasIssetugid YES #define HasPoll YES @@ -25,7 +25,17 @@ #endif /* This fixes linking C programs against libGLU on FreeBSD 3.x */ -@@ -338,7 +333,7 @@ +@@ -178,7 +173,9 @@ + #ifndef CplusplusCmd + #define CplusplusCmd c++ + #endif ++#ifndef CppCmd + #define CppCmd /usr/bin/cpp ++#endif + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ +@@ -338,7 +335,7 @@ #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat @@ -34,7 +44,7 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -466,14 +461,14 @@ +@@ -470,14 +467,14 @@ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ #ifndef DefaultGcc2i386Opt #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) @@ -51,7 +61,7 @@ #endif #ifndef PreIncDir -@@ -493,6 +493,10 @@ +@@ -498,6 +495,10 @@ #define SystemManDirectory /usr/share/man #endif diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile index ded1c42..6351ac1 100644 --- a/x11/xprompt/Makefile +++ b/x11/xprompt/Makefile @@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= mph MAINTAINER= ports@FreeBSD.org COMMENT= Displays a dialog box and prompts user for text -USE_IMAKE= yes +USES= imake USE_XORG= ice sm x11 xaw xext xmu xt MAN1= xprompt.1 diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile index 140cc46..28bb36b 100644 --- a/x11/xstroke/Makefile +++ b/x11/xstroke/Makefile @@ -13,9 +13,8 @@ COMMENT= Fullscreen gesture recognition LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -USES= bison +USES= bison imake USE_XORG= xft x11 xext xi xtst -USE_IMAKE= yes MAN1= xstroke.1 PLIST_FILES= bin/xstroke %%ETCDIR%%/alphabet diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile index 2b649cb..6a12a8c 100644 --- a/x11/xvkbd/Makefile +++ b/x11/xvkbd/Makefile @@ -16,8 +16,8 @@ OPTIONS_DEFAULT= XTEST XAW3D_DESC= Xaw3d widget library support XTEST_DESC= XTEST extensions support +USES= imake USE_XORG= ice sm x11 xaw xext xmu xpm xt -USE_IMAKE= yes MAN1= xvkbd.1 diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile index 7feecc9..b4ce68d 100644 --- a/x11/xwit/Makefile +++ b/x11/xwit/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xwit -# Date created: 15 June 1998 -# Whom: Thomas Gellekum <tg@FreeBSD.org> -# +# Created by: Thomas Gellekum <tg@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xwit PORTVERSION= 3.4 @@ -16,7 +12,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:source1 \ MAINTAINER= ehaupt@FreeBSD.org COMMENT= X interface tool -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext MAKE_JOBS_SAFE= yes diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile index 971ef09..87aab5d 100644 --- a/x11/xxkb/Makefile +++ b/x11/xxkb/Makefile @@ -12,10 +12,8 @@ COMMENT= XKB keyboard layout indicator and switcher LICENSE= ART10 -BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv - +USES= iconv imake USE_XORG= xpm -USE_IMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME} MAN1= ${PORTNAME}.1 |
