diff options
| -rw-r--r-- | lang/ohugs/Makefile | 19 | ||||
| -rw-r--r-- | lang/ohugs/files/patch-src::Makefile | 25 |
2 files changed, 10 insertions, 34 deletions
diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile index 23548f3688b1..163a5f3a7209 100644 --- a/lang/ohugs/Makefile +++ b/lang/ohugs/Makefile @@ -14,13 +14,21 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= haskell@FreeBSD.org COMMENT= Interpreter for Haskell with object-oriented features +LIB_DEPENDS= readline.5:${PORTSDIR}/devel/readline .if !defined(WITHOUT_X11) -LIB_DEPENDS= tix8184:${PORTSDIR}/x11-toolkits/tix +LIB_DEPENDS+= tix8184:${PORTSDIR}/x11-toolkits/tix .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/.src//} -USE_REINPLACE= yes +BUILD_WRKSRC= ${WRKSRC}/src USE_BISON= yes +LDFLAGS+= -lm -lreadline -ltermcap +.if !defined(WITHOUT_X11) +CFLAGS+= -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include -I${X11BASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -ltk84 -ltcl84 -ltix8184 +.endif +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + INSTBIN=${PREFIX}/bin INSTLIB=${PREFIX}/lib/ohugs .include <bsd.port.pre.mk> @@ -28,12 +36,5 @@ post-patch: .if defined(WITHOUT_X11) @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-src::prelude.h .endif - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile -.if !defined(WITHOUT_X11) - @${REINPLACE_CMD} -e 's|#CFLAGS+=|CFLAGS+= -I${PREFIX}/include/tk8.4 \ - -I${PREFIX}/include/tcl8.4 -I${PREFIX}/include -I${X11BASE}/include| ; \ - s|#LDFLAGS+=|LDFLAGS+=-L${PREFIX}/lib -ltk84 -ltcl84 -ltix8184|' \ - ${WRKSRC}/src/Makefile -.endif .include <bsd.port.post.mk> diff --git a/lang/ohugs/files/patch-src::Makefile b/lang/ohugs/files/patch-src::Makefile deleted file mode 100644 index 384b290cc375..000000000000 --- a/lang/ohugs/files/patch-src::Makefile +++ /dev/null @@ -1,25 +0,0 @@ ---- src/Makefile.orig Wed Mar 5 20:00:00 2003 -+++ src/Makefile Wed Mar 5 20:00:43 2003 -@@ -34,15 +34,19 @@ - # ensure that the whole collection of files is recompiled with the correct - # settings. - --CC = gcc -+#CC = gcc - - # Choose your operating system - # If you don't have Tk, delete the stuff mentioning tcl, tk and X11, - # and set O_TK to 0 in prelude.h. - - # Solaris --CFLAGS = -g -I/usr/X11/include -I/usr/pd/tcl/8.0/include --LDFLAGS = -lm -lX11 -lsocket -lreadline -ltermcap -lnsl -R/usr/X11/lib -R/usr/pd/tcl/8.0/lib -L/usr/pd/tcl/8.0/lib -ltk8.0 -ltcl8.0 -ltix4.1.8.0 -+#CFLAGS = -g -I/usr/X11/include -I/usr/pd/tcl/8.0/include -+#LDFLAGS = -lm -lX11 -lsocket -lreadline -ltermcap -lnsl -R/usr/X11/lib -R/usr/pd/tcl/8.0/lib -L/usr/pd/tcl/8.0/lib -ltk8.0 -ltcl8.0 -ltix4.1.8.0 -+ -+LDFLAGS+= -lm -lreadline -ltermcap -+#CFLAGS+= -+#LDFLAGS+= - - # NetBSD - #CFLAGS = -g -I/usr/X11/include -I/usr/pkg/include/tk8.0 -I/usr/pkg/include -I/usr/pkg/include/tcl8.0 |