Bug 68614 - [Maintainer Update] devel/gauche-sdl unbreak (dep fix)
Summary: [Maintainer Update] devel/gauche-sdl unbreak (dep fix)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-07-02 21:20 UTC by Erik Greenwald
Modified: 2004-07-04 22:58 UTC (History)
1 user (show)

See Also:


Attachments
devel_gauche-sdl.patch (754 bytes, patch)
2004-07-02 21:20 UTC, Erik Greenwald
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Erik Greenwald 2004-07-02 21:20:11 UTC
Was marked broken because USE_SDL doesn't install stuff during 
dependancy pass (wtf???).

Added a BUILD_DEPENDS to grab SDL, purged off all sdl type shtuff 
from my machine, did a make build in devel/gauche-sdl, and it worked.
Comment 1 Erik Greenwald 2004-07-02 22:23:40 UTC
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.
Comment 2 Pav Lucistnik freebsd_committer 2004-07-04 22:58:31 UTC
State Changed
From-To: open->closed

Variation on second patch committed. Thank you.