From b50c44981d13d21fa7acbcd57908a0fbd663b054 Mon Sep 17 00:00:00 2001 From: Patrick Li Date: Wed, 2 Jan 2002 04:16:51 +0000 Subject: Fix for -CURRENT, malloc.h->stdlib.h Spotted by: Bento --- chinese/hc/Makefile | 3 +++ editors/yudit/Makefile | 4 ++++ games/xmastermind/Makefile | 4 ++++ graphics/vertex/Makefile | 4 ++++ graphics/xfractint/Makefile | 4 ++++ graphics/xmandel/Makefile | 9 ++++++--- math/vtk/Makefile | 2 ++ math/vtk43/Makefile | 2 ++ math/vtk5/Makefile | 2 ++ mbone/vic/Makefile | 4 ++++ multimedia/vic/Makefile | 4 ++++ x11-wm/w9wm/Makefile | 3 +++ x11-wm/w9wm/pkg-descr | 2 ++ 13 files changed, 44 insertions(+), 3 deletions(-) diff --git a/chinese/hc/Makefile b/chinese/hc/Makefile index a6551700f211..7e737ac6b68f 100644 --- a/chinese/hc/Makefile +++ b/chinese/hc/Makefile @@ -21,6 +21,9 @@ EXTRACT_ONLY= hc-30.tar.gz ALL_TARGET= hc b2g g2b MAN1= hc.1 +pre-patch: + @${PERL} -pi -e 's|malloc.h|stdlib.h|' ${WRKSRC}/hclib.c + do-install: @${MKDIR} ${PREFIX}/share/chinese ${INSTALL_PROGRAM} ${WRKSRC}/hc ${PREFIX}/bin diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile index a795b78369e7..377fee727e29 100644 --- a/editors/yudit/Makefile +++ b/editors/yudit/Makefile @@ -29,6 +29,10 @@ MAKE_ENV= LC_ALL= MAN1= yudit.1 makeumap.1 stripumap.1 uniconv.1 uniprint.1 USE_GMAKE= YES +pre-patch: + @${PERL} -pi.orig -e 's|malloc.h|stdlib.h|' \ + ${WRKSRC}/src/UFontMap.cpp + post-install: cd ${PREFIX}/bin/ && strip yudit stripumap uniconv uniprint diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile index 75d34d4f8147..6db089b6caf4 100644 --- a/games/xmastermind/Makefile +++ b/games/xmastermind/Makefile @@ -17,6 +17,10 @@ LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms USE_X_PREFIX= yes +pre-patch: + @${PERL} -pi.orig -e 's|malloc.h|stdlib.h|' \ + ${WRKSRC}/list.h + do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/xmastermind ${PREFIX}/bin @ ${MKDIR} ${PREFIX}/share/doc/xmastermind diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile index b13febcee2a5..e7ae1f30ebbb 100644 --- a/graphics/vertex/Makefile +++ b/graphics/vertex/Makefile @@ -30,4 +30,8 @@ INSTALL_TARGET= vertex_install MAN1= ${PORTNAME}.1 +pre-patch: + @${FIND} ${WRKSRC} -name "*.[c,h]" | ${XARGS} ${PERL} -pi -e \ + 's|malloc.h|stdlib.h|' + .include diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile index d0b64e1ba5d4..1b09aa6c750f 100644 --- a/graphics/xfractint/Makefile +++ b/graphics/xfractint/Makefile @@ -19,4 +19,8 @@ USE_XLIB= yes NO_WRKSUBDIR= yes MAN1= xfractint.1 +pre-patch: + @${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${PERL} -pi -e \ + 's|malloc.h|stdlib.h|' + .include diff --git a/graphics/xmandel/Makefile b/graphics/xmandel/Makefile index 0a20fea7ad04..402b8c8e651a 100644 --- a/graphics/xmandel/Makefile +++ b/graphics/xmandel/Makefile @@ -9,18 +9,21 @@ PORTNAME= xmandel PORTVERSION= 1.0 CATEGORIES= graphics MASTER_SITES= ftp://ftp.cray.com/src/graphics/xmandel/ -EXTRACT_SUFX= .shar # The README says the location is ftp.cray.com:/usr/ftp/src/graphics/xmandel, # but this has changed apparently. DISTNAME= ${PORTNAME} +EXTRACT_SUFX= .shar -EXTRACT_CMD= sh +MAINTAINER= andreas@marvin.robin.de + +EXTRACT_CMD= ${SH} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= # empty USE_IMAKE= yes NO_WRKSUBDIR= yes MAN1= xmandel.1 -MAINTAINER= andreas@marvin.robin.de +pre-patch: + @${PERL} -pi.orig -e 's|malloc.h|stdlib.h|' ${WRKSRC}/mandel.c .include diff --git a/math/vtk/Makefile b/math/vtk/Makefile index 157de5d1f8a0..ee4c6cadef2f 100644 --- a/math/vtk/Makefile +++ b/math/vtk/Makefile @@ -39,6 +39,8 @@ post-patch: s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g; \ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ ${WRKSRC}/user.make + @${FIND} ${WRKSRC} -name "*.cxx" | ${XARGS} ${PERL} -pi -e \ + 's|malloc.h|stdlib.h|' post-install: .if !defined(WITHOUT_PYTHON) diff --git a/math/vtk43/Makefile b/math/vtk43/Makefile index 157de5d1f8a0..ee4c6cadef2f 100644 --- a/math/vtk43/Makefile +++ b/math/vtk43/Makefile @@ -39,6 +39,8 @@ post-patch: s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g; \ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ ${WRKSRC}/user.make + @${FIND} ${WRKSRC} -name "*.cxx" | ${XARGS} ${PERL} -pi -e \ + 's|malloc.h|stdlib.h|' post-install: .if !defined(WITHOUT_PYTHON) diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 157de5d1f8a0..ee4c6cadef2f 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -39,6 +39,8 @@ post-patch: s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g; \ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ ${WRKSRC}/user.make + @${FIND} ${WRKSRC} -name "*.cxx" | ${XARGS} ${PERL} -pi -e \ + 's|malloc.h|stdlib.h|' post-install: .if !defined(WITHOUT_PYTHON) diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index 1c142b3fbaf2..0866c835fa97 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -28,6 +28,10 @@ CONFIGURE_ARGS= -x-libraries=${PREFIX}/lib \ -with-tk=${LOCALBASE} MAN1= vic.1 +pre-patch: + @${FIND} ${WRKSRC} -name "*.[c,h]" | ${XARGS} ${PERL} -pi -e \ + 's|malloc.h|stdlib.h|' + post-install: strip ${PREFIX}/bin/vic strip ${PREFIX}/bin/histtolut diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile index 1c142b3fbaf2..0866c835fa97 100644 --- a/multimedia/vic/Makefile +++ b/multimedia/vic/Makefile @@ -28,6 +28,10 @@ CONFIGURE_ARGS= -x-libraries=${PREFIX}/lib \ -with-tk=${LOCALBASE} MAN1= vic.1 +pre-patch: + @${FIND} ${WRKSRC} -name "*.[c,h]" | ${XARGS} ${PERL} -pi -e \ + 's|malloc.h|stdlib.h|' + post-install: strip ${PREFIX}/bin/vic strip ${PREFIX}/bin/histtolut diff --git a/x11-wm/w9wm/Makefile b/x11-wm/w9wm/Makefile index b6d61f6f8e21..a1cf98418569 100644 --- a/x11-wm/w9wm/Makefile +++ b/x11-wm/w9wm/Makefile @@ -17,4 +17,7 @@ MAKEFILE= Makefile.no-imake MAN1= w9wm.1 +pre-patch: + @${PERL} -pi.orig -e 's|malloc.h|stdlib.h|' ${WRKSRC}/client.c + .include diff --git a/x11-wm/w9wm/pkg-descr b/x11-wm/w9wm/pkg-descr index 50d955e8fd1d..29a04617c8d4 100644 --- a/x11-wm/w9wm/pkg-descr +++ b/x11-wm/w9wm/pkg-descr @@ -12,5 +12,7 @@ w9wm brings support for virtual screens (provided you use the second button, aka middle button to select one virtual screen) as well as for key bindings (to switch from one window to another). +WWW: http://inferno.cs.univ-paris8.fr/~drieu/w9wm/ + - George Reid greid@ukug.uk.freebsd.org -- cgit v1.2.3