Date: Fri, 2 Jul 2004 16:23:40 -0500 From: Erik Greenwald <erik@smluc.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: erik@math.smsu.edu Subject: Re: ports/68614: [Maintainer Update] devel/gauche-sdl unbreak (dep fix) Message-ID: <20040702212340.GA16318@phoenix.smluc.org>
next in thread | raw e-mail | index | archive | help
woops, the description in the cvs log was misleading, I grok what was
happening now... here's a hackish way to fix it (d'no if there's a
better approach.... the stuff was being installed, but the variable was
not catching the value due to how the bsd.sdl.mk file does it's thing)
I first wanted to do SDL_CONFIG?= so it wouldn't over-ride it, but that
didn't work well, I guess the variable was set to (lambda) unstead of
unset...
replacement patch...
--- devel_gauche-sdl.patch begins here ---
diff -Nurb devel/gauche-sdl.orig/Makefile devel/gauche-sdl/Makefile
--- devel/gauche-sdl.orig/Makefile Fri Jul 2 15:48:12 2004
+++ devel/gauche-sdl/Makefile Fri Jul 2 17:02:47 2004
@@ -19,8 +19,6 @@
RUN_DEPENDS= gosh:${PORTSDIR}/lang/gauche \
${X11BASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/XFree86-4-clients
-BROKEN= "SDL is needed in patch phase but only added in build phase"
-
PLIST_SUB= GAUCHE_VERSION="`gauche-config -V`"\
TARGET="${CONFIGURE_TARGET}"
WRKSRC= ${WRKDIR}/${PORTFAKENAME}
@@ -29,16 +27,18 @@
GNU_CONFIGURE= yes
USE_REINPLACE= yes
-post-patch:
+SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config
+
+pre-configure:
.for DIR in . image mixer ttf
${REINPLACE_CMD} \
- -e "s|^CFLAGS .*|& `${SDL_CONFIG} --cflags`|"\
- -e "s|-lSDL|`${SDL_CONFIG} --libs`|"\
+ -e 's|^CFLAGS .*|& `${SDL_CONFIG} --cflags`|'\
+ -e 's|-lSDL|`${SDL_CONFIG} --libs`|'\
${WRKSRC}/src/${DIR}/Makefile.in
.endfor
${REINPLACE_CMD} \
- -e "s|SDL/SDL|SDL|g"\
- -e "s|%%SDL_CFLAGS%%|`${SDL_CONFIG} --cflags`|"\
+ -e 's|SDL/SDL|SDL|g'\
+ -e 's|%%SDL_CFLAGS%%|`${SDL_CONFIG} --cflags`|'\
${WRKSRC}/configure
.include <bsd.port.mk>
--- devel_gauche-sdl.patch ends here ---
sorry 'bout the bad patch before... (this time I actually waited for it
to successfully finish, first...)
--
-Erik <erik@smluc.org> [http://math.smsu.edu/~erik]
The opinions expressed by me are not necessarily opinions. In all probability,
they are random rambling, and to be ignored. Failure to ignore may result in
severe boredom or confusion. Shake well before opening. Keep Refrigerated.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040702212340.GA16318>