From 51738bce779403f5ffeb02674d24d0edee6e4e1c Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Mon, 30 Jul 2007 15:03:09 +0000 Subject: [PATCH] - Unbreak by removing check for unused X11/Intrinsic.h - Reorganize post-patch for better readability Approved by: garga (mentor, implicit) --- lang/otcl/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile index a4c93b71c186..b9f23f7a2c2d 100644 --- a/lang/otcl/Makefile +++ b/lang/otcl/Makefile @@ -37,12 +37,15 @@ CFLAGS+= -DHAVE_UNISTD_H CONFIGURE_ARGS+= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/conf/configure.in.x11 + @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ + -e's|X11/Intrinsic.h|X11/Xlib.h|g' \ + ${WRKSRC}/configure ${WRKSRC}/conf/configure.in.x11 @${REINPLACE_CMD} -e 's|../lib/tcl$$TCL_HI_VERS|${TCL_LIBDIR}|g' \ - -e 's|../include|${TCL_INCLUDEDIR}/generic|g' ${WRKSRC}/conf/configure.in.tcl + -e 's|../include|${TCL_INCLUDEDIR}/generic|g' \ + ${WRKSRC}/conf/configure.in.tcl @${REINPLACE_CMD} -e 's|../lib/tk$$TK_HI_VERS|${TK_LIBDIR}|g' \ - -e 's|../include|${TK_INCLUDEDIR}/generic|g' ${WRKSRC}/conf/configure.in.tk + -e 's|../include|${TK_INCLUDEDIR}/generic|g' \ + ${WRKSRC}/conf/configure.in.tk post-install: ${LN} -sf libotcl.so ${PREFIX}/lib/libotcl.so.1