svn commit: r325992 - in head: Mk Mk/Uses devel/imake devel/imake/files editors/asedit emulators/spim games/cosmo graphics/xmagv graphics/xpx japanese/canna-lib japanese/canna-server misc/magicpoin...

Tijl Coosemans tijl at FreeBSD.org
Mon Sep 2 13:26:39 UTC 2013 

Author: tijl
Date: Mon Sep  2 13:26:34 2013
New Revision: 325992
URL: http://svnweb.freebsd.org/changeset/ports/325992

Log:
  Two imake related changes:
  
  1) Move -a from XMKMF command variable to a new XMKMF_ARGS variable.
     For ports that don't need -a introduce USES=imake:notall.
     This way ports no longer have to redefine XMKMF.
  
  2) xmkmf -a runs imake with the flags in IMAKECPPFLAGS as extra arguments
     to set CPP, CC and CXX.  This creates the top Makefile, and then xmkmf
     runs make Makefiles.  This Makefiles target runs imake for each
     subdirectory but these imake invocations did not have the flags from
     IMAKECPPFLAGS so the resulting makefiles used the wrong C preprocessor
     when clang is used (/usr/bin/cpp instead of /usr/local/bin/tradcpp).
     Instead of letting xmkmf pass IMAKECPPFLAGS from the environment to
     imake let imake handle IMAKECPPFLAGS itself just like it handles
     IMAKEINCLUDE.
  
     This exposed configure errors in x11-clocks/mouseclock and x11-wm/fvwm.
  
  Approved by:	portmgr (bapt)

Added:
  head/x11-clocks/mouseclock/files/patch-Imakefile   (contents, props changed)
Deleted:
  head/devel/imake/files/patch-xmkmf.cpp
Modified:
  head/Mk/Uses/imake.mk
  head/Mk/bsd.commands.mk
  head/devel/imake/Makefile
  head/devel/imake/files/patch-imake.c
  head/editors/asedit/Makefile
  head/emulators/spim/Makefile
  head/games/cosmo/Makefile
  head/graphics/xmagv/Makefile
  head/graphics/xpx/Makefile
  head/japanese/canna-lib/Makefile
  head/japanese/canna-server/Makefile
  head/misc/magicpoint/Makefile
  head/print/xdvi/Makefile
  head/security/xspy/Makefile
  head/x11-clocks/mouseclock/Makefile
  head/x11-wm/fvwm/Makefile
  head/x11/xgrab/Makefile
  head/x11/xxkb/Makefile

Modified: head/Mk/Uses/imake.mk
==============================================================================
--- head/Mk/Uses/imake.mk	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/Mk/Uses/imake.mk	Mon Sep  2 13:26:34 2013	(r325992)
@@ -7,6 +7,7 @@
 # Feature:		imake
 # Usage:		USES=imake
 # Valid ARGS:		env: do not define any target
+#			notall: do not pass -a to xmkmf
 #
 
 .if !defined(_INCLUDE_USES_IMAKE_MK)
@@ -15,6 +16,8 @@ _INCLUDE_USES_IMAKE_MK=	yes
 .if defined(imake_ARGS)
 .if ${imake_ARGS} == env
 IMAKE_ENV_ONLY=	yes
+.elif ${imake_ARGS} == notall
+IMAKE_NOTALL=	yes
 .else
 IGNORE=		USES=imake ${imake_ARGS} is not a valid argument
 .endif
@@ -36,12 +39,15 @@ BUILD_DEPENDS+=		tradcpp:${PORTSDIR}/dev
 .endif
 MAKE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
 CONFIGURE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
-MAKE_ARGS+=		IMAKE_DEFINES="${IMAKECPPFLAGS}"
+
+.if !defined(IMAKE_NOTALL)
+XMKMF_ARGS+=		-a
+.endif
 
 .if !defined(IMAKE_ENV_ONLY)
 .if !target(do-configure)
 do-configure:
-	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
+	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS})
 .endif
 
 .if !defined(NO_INSTALL_MANPAGES)

Modified: head/Mk/bsd.commands.mk
==============================================================================
--- head/Mk/bsd.commands.mk	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/Mk/bsd.commands.mk	Mon Sep  2 13:26:34 2013	(r325992)
@@ -97,7 +97,7 @@ UNMAKESELF_CMD?=	${LOCALBASE}/bin/unmake
 UNZIP_CMD?=	${LOCALBASE}/bin/unzip
 WHICH?=		/usr/bin/which
 XARGS?=		/usr/bin/xargs
-XMKMF?=		${LOCALBASE}/bin/xmkmf -a
+XMKMF?=		${LOCALBASE}/bin/xmkmf
 YACC?=		/usr/bin/yacc
 
 XZ?=	-Mmax

Modified: head/devel/imake/Makefile
==============================================================================
--- head/devel/imake/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/devel/imake/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -3,6 +3,7 @@
 
 PORTNAME=	imake
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 

Modified: head/devel/imake/files/patch-imake.c
==============================================================================
--- head/devel/imake/files/patch-imake.c	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/devel/imake/files/patch-imake.c	Mon Sep  2 13:26:34 2013	(r325992)
@@ -1,6 +1,21 @@
---- imake.c.orig	Tue Jan 30 14:57:37 2007
-+++ imake.c	Tue Jan 30 14:55:59 2007
-@@ -1153,29 +1153,17 @@
+--- imake.c.orig	2013-07-23 06:53:04.000000000 +0200
++++ imake.c	2013-08-31 14:57:48.000000000 +0200
+@@ -531,6 +531,14 @@
+ 				AddCppArg(p);
+ 			}
+ 	}
++	if ((p = getenv("IMAKECPPFLAGS"))) {
++		AddCppArg(p);
++		for (; *p; p++)
++			if (*p == ' ') {
++				*p++ = '\0';
++				AddCppArg(p);
++			}
++	}
+ 	if ((p = getenv("IMAKECPP")))
+ 		cpp = p;
+ 	if ((p = getenv("IMAKEMAKE")))
+@@ -1142,29 +1150,17 @@
    int mib[2];
    size_t len;
    int osrel = 0;

Modified: head/editors/asedit/Makefile
==============================================================================
--- head/editors/asedit/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/editors/asedit/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -12,9 +12,8 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Text editor for X/Motif
 
-USES=		imake motif
+USES=		imake:notall motif
 USE_XORG=	ice sm x11 xext xmu xp xt
-XMKMF=		xmkmf
 
 MAN1=		asedit.1
 

Modified: head/emulators/spim/Makefile
==============================================================================
--- head/emulators/spim/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/emulators/spim/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -34,7 +34,7 @@ MAN1+=		xspim.1
 
 post-build:
 .if ${PORT_OPTIONS:MGUI}
-	@(cd ${WRKSRC}/xspim && ${SETENV} ${MAKE_ENV} ${XMKMF} && \
+	@(cd ${WRKSRC}/xspim && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS} && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE})
 .endif
 

Modified: head/games/cosmo/Makefile
==============================================================================
--- head/games/cosmo/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/games/cosmo/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -22,9 +22,8 @@ NO_CDROM=	Possible copyright infringemen
 
 WRKSRC=		${WRKDIR}/cosmo2
 DIST_SUBDIR=	cosmo
-USES=		imake
+USES=		imake:notall
 USE_XORG=	x11 xext
-XMKMF=		xmkmf
 NO_INSTALL_MANPAGES=	yes
 
 post-install:

Modified: head/graphics/xmagv/Makefile
==============================================================================
--- head/graphics/xmagv/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/graphics/xmagv/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -16,7 +16,6 @@ USES=		imake:env
 WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext
-XMKMF=		xmkmf
 MANLANG=	. ja
 MAN1=		xmagv.1
 

Modified: head/graphics/xpx/Makefile
==============================================================================
--- head/graphics/xpx/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/graphics/xpx/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -13,9 +13,8 @@ COMMENT=	Simple pixel editing tool to ge
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		imake
+USES=		imake:notall
 USE_XORG=	x11 xext
-XMKMF=		xmkmf
 
 DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
 PORTDOCS=	xpx.doc xpxrc.eg

Modified: head/japanese/canna-lib/Makefile
==============================================================================
--- head/japanese/canna-lib/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/japanese/canna-lib/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -13,7 +13,7 @@ DISTNAME=	Canna${PORTVERSION:S/.//g}
 MAINTAINER=	hrs at FreeBSD.org
 COMMENT=	A Kana-to-Kanji conversion system, library part
 
-USES=		imake
+USES=		imake:notall
 USE_BZIP2=	yes
 USE_GCC=	any
 USE_LDCONFIG=	yes
@@ -24,7 +24,6 @@ PLIST_SUB=	METAFILE="${METAFILE}" \
 
 ALL_TARGET=	canna
 INSTALL_TARGET=	instsgs
-XMKMF=		xmkmf
 
 METAFILE=	${DATADIR_REL}/canna-lib-dic.meta
 

Modified: head/japanese/canna-server/Makefile
==============================================================================
--- head/japanese/canna-server/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/japanese/canna-server/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -19,7 +19,6 @@ USES=		imake
 USE_GCC=	any
 USE_RC_SUBR=	canna
 USE_BZIP2=	yes
-ALL_TARGET=	canna
 INSTALL_TARGET=	instserver instclient
 PLIST_SUB=	METAFILE="${METAFILE}" \
 		MTREE_CMD="${MTREE_CMD}"
@@ -46,9 +45,6 @@ MLINKS= uilib.3 XKanjiControl.3 uilib.3 
 
 METAFILE=	${DATADIR_REL}/canna-server-dic.meta
 
-post-configure:
-	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
-
 post-install:
 	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man
 	${MTREE_CMD} -cdink uname,gname,mode,nochange \

Modified: head/misc/magicpoint/Makefile
==============================================================================
--- head/misc/magicpoint/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/misc/magicpoint/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -83,7 +83,7 @@ post-patch:
 		${WRKSRC}/configure
 
 post-configure:
-	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF})
+	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS})
 	cd ${WRKSRC}/contrib/xmindpath && \
 		${SH} ${CONFIGURE_SCRIPT} --prefix=${PREFIX}
 

Modified: head/print/xdvi/Makefile
==============================================================================
--- head/print/xdvi/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/print/xdvi/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -16,12 +16,11 @@ COMMENT=	DVI previewer for the X Window 
 
 CONFLICTS=	teTeX-*
 
-USES=		gmake imake
+USES=		gmake imake:notall
 USE_XORG=	ice sm x11 xaw xext xmu xt xpm
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PLIST_SUB=	LOCALBASE=${LOCALBASE}
-XMKMF=		xmkmf
 .if defined(PACKAGE_BUILDING)
 SCRIPTS_ENV=	PACKAGE_BUILDING=${PACKAGE_BUILDING}
 .else

Modified: head/security/xspy/Makefile
==============================================================================
--- head/security/xspy/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/security/xspy/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -11,9 +11,8 @@ MAINTAINER=	onatan at gmail.com
 COMMENT=	A utility for monitoring keystrokes on remote X servers
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USES=		imake
+USES=		imake:notall
 USE_XORG=	x11
-XMKMF=		xmkmf
 
 ALL_TARGET=	xspy
 

Modified: head/x11-clocks/mouseclock/Makefile
==============================================================================
--- head/x11-clocks/mouseclock/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/x11-clocks/mouseclock/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mouseclock
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/clocks
@@ -11,13 +11,8 @@ MASTER_SITE_SUBDIR=	X11/clocks
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Display the current time using the X root cursor
 
-USES=		imake
-USE_GMAKE=	yes
-USE_XORG=	x11 xext
-NO_INSTALL_MANPAGES=	yes
-
-post-configure:
-	@${TOUCH} ${WRKSRC}/mouseclock.man
+USES=		imake:notall
+USE_XORG=	x11
 
 post-install:
 .if !defined(NOPORTDOCS)

Added: head/x11-clocks/mouseclock/files/patch-Imakefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-clocks/mouseclock/files/patch-Imakefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -0,0 +1,23 @@
+--- Imakefile.orig	1996-05-05 18:51:27.000000000 +0200
++++ Imakefile	2013-09-01 17:04:26.000000000 +0200
+@@ -1,16 +1,10 @@
+ 
+-#define IHaveSubdirs
+-#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
++OBJS = mouseclock.o
++SRCS = mouseclock.c
++SYS_LIBRARIES = $(XONLYLIB)
+ 
+-        DEPLIBS = $(DEPXLIB)
+-LOCAL_LIBRARIES = $(XLIB)
+-	CDEBUGFLAGS =
+-	CCOPTIONS = -O3 -s -pipe -Wall
+ 
+-AllTarget(mouseclock)
+-
+-MakeMakeSubdirs($(SUBDIRS),install)
+-SimpleProgramTarget(mouseclock)
++ComplexProgramTargetNoMan(mouseclock)
+ 
+ arc : clean
+ 	(cd .. ; tar zcvf mouseclock.tar.gz mouseclock)

Modified: head/x11-wm/fvwm/Makefile
==============================================================================
--- head/x11-wm/fvwm/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/x11-wm/fvwm/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fvwm
 PORTVERSION=	1.24r
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-1/
 
@@ -11,17 +11,16 @@ MAINTAINER=	dinoex at FreeBSD.org
 COMMENT=	The fvwm window manager
 
 NO_LATEST_LINK=	yes
-MAKE_JOBS_UNSAFE=	yes
 
 USES=		imake
 USE_XORG=	xbitmaps xpm xext x11 xmu
-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 \
 		FvwmSaveDesk.1 FvwmScroll.1 FvwmWinList.1 GoodStuff.1 fvwm.1 \
 		xpmroot.1
 
 pre-configure:
+	@${REINPLACE_CMD} -e '/DependSubdirs/y,/*#,   ,' ${WRKSRC}/Imakefile
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/configure.h \
 		${WRKSRC}/sample.fvwmrc/system.fvwmrc

Modified: head/x11/xgrab/Makefile
==============================================================================
--- head/x11/xgrab/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/x11/xgrab/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -15,13 +15,11 @@ COMMENT=	X11 image grabber
 
 BUILD_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
 
-USES=		display:build imake
+USES=		display:build imake:notall
 USE_XORG=	x11
 
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
 		XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults  -f
-# "make depend" blows up
-XMKMF=		xmkmf
 CFLAGS+=	-Wno-error=return-type
 
 MAN1=		xgrab.1 xgrabsc.1

Modified: head/x11/xxkb/Makefile
==============================================================================
--- head/x11/xxkb/Makefile	Mon Sep  2 13:22:27 2013	(r325991)
+++ head/x11/xxkb/Makefile	Mon Sep  2 13:26:34 2013	(r325992)
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	LIBRSVG2 DOCS
 
 .if ${PORT_OPTIONS:MLIBRSVG2}
 LIB_DEPENDS=	rsvg-2:${PORTSDIR}/graphics/librsvg2
-XMKMF=		xmkmf -a -DWITH_SVG_SUPPORT
+XMKMF_ARGS=	-DWITH_SVG_SUPPORT
 .endif
 
 post-build:

More information about the svn-ports-head mailing list