Date: Thu, 20 Feb 2014 11:07:51 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345215 - in head/lang/ohugs: . files Message-ID: <201402201107.s1KB7peo008720@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Thu Feb 20 11:07:51 2014 New Revision: 345215 URL: http://svnweb.freebsd.org/changeset/ports/345215 QAT: https://qat.redports.org/buildarchive/r345215/ Log: - Convert to USES=tk - Convert to new LIB_DEPENDS format - STAGE-clean Added: head/lang/ohugs/files/patch-Makefile (contents, props changed) head/lang/ohugs/files/patch-src_tkhaskell.c (contents, props changed) Modified: head/lang/ohugs/Makefile Modified: head/lang/ohugs/Makefile ============================================================================== --- head/lang/ohugs/Makefile Thu Feb 20 10:58:13 2014 (r345214) +++ head/lang/ohugs/Makefile Thu Feb 20 11:07:51 2014 (r345215) @@ -13,23 +13,24 @@ COMMENT= Interpreter for Haskell with ob OPTIONS_DEFINE= X11 -NO_STAGE= yes .include <bsd.port.options.mk> -LIB_DEPENDS= readline.6:${PORTSDIR}/devel/readline +LIB_DEPENDS= libreadline.so.6:${PORTSDIR}/devel/readline .if empty(PORT_OPTIONS:MX11) -LIB_DEPENDS= Tix8.4.3.0:${PORTSDIR}/x11-toolkits/tix +LIB_DEPENDS= libTix8.4.3.0.so:${PORTSDIR}/x11-toolkits/tix .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/.src//} BUILD_WRKSRC= ${WRKSRC}/src USES= bison LDFLAGS+= -lm -lreadline -ltermcap -.if empty(PORT_OPTIONS:MX11) -USE_TK= 84+ + +.if ${PORT_OPTIONS:MX11} +USES+= tk CFLAGS+= -I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -ltk${TK_VER:S/.//} -ltcl${TCL_VER:S/.//} -lTix8.4.3 +LDFLAGS+= -L${LOCALBASE}/lib -ltk${TK_SHLIB_VER} -ltcl${TCL_SHLIB_VER} -lTix8.4.3 .endif + MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ INSTBIN=${PREFIX}/bin INSTLIB=${PREFIX}/lib/ohugs Added: head/lang/ohugs/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ohugs/files/patch-Makefile Thu Feb 20 11:07:51 2014 (r345215) @@ -0,0 +1,25 @@ +--- Makefile.orig 2014-02-20 12:06:18.000000000 +0100 ++++ Makefile 2014-02-20 12:08:16.000000000 +0100 +@@ -5,14 +5,14 @@ + cd src; make + + install: ohugs +- rm -rf $(INSTLIB) +- rm -f $(INSTBIN)/ohugs $(INSTBIN)/rohugs +- mkdir -p $(INSTLIB) +- tar cf - lib/*.hs libhugs/*.hs | (cd $(INSTLIB); tar xf -) +- cp -p src/ohugs src/rohugs $(INSTLIB)/ +- sed -e "s#XX_INSTLIB#$(INSTLIB)#" ohugs > $(INSTBIN)/ohugs +- sed -e "s#XX_INSTLIB#$(INSTLIB)#" rohugs > $(INSTBIN)/rohugs +- chmod 755 $(INSTBIN)/ohugs $(INSTBIN)/rohugs ++ rm -rf $(DESTDIR)$(INSTLIB) ++ rm -f $(DESTDIR)$(INSTBIN)/ohugs $(DESTDIR)$(INSTBIN)/rohugs ++ mkdir -p $(DESTDIR)$(INSTLIB) ++ tar cf - lib/*.hs libhugs/*.hs | (cd $(DESTDIR)$(INSTLIB); tar xf -) ++ $(BSD_INSTALL_PROGRAM) src/ohugs src/rohugs $(DESTDIR)$(INSTLIB) ++ sed -e "s#XX_INSTLIB#$(INSTLIB)#" ohugs > $(DESTDIR)$(INSTBIN)/ohugs ++ sed -e "s#XX_INSTLIB#$(INSTLIB)#" rohugs > $(DESTDIR)$(INSTBIN)/rohugs ++ chmod 755 $(DESTDIR)$(INSTBIN)/ohugs $(DESTDIR)$(INSTBIN)/rohugs + + clean: + cd src; make clean Added: head/lang/ohugs/files/patch-src_tkhaskell.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ohugs/files/patch-src_tkhaskell.c Thu Feb 20 11:07:51 2014 (r345215) @@ -0,0 +1,45 @@ +--- src/tkhaskell.c.orig 2014-02-20 12:00:29.000000000 +0100 ++++ src/tkhaskell.c 2014-02-20 12:02:44.000000000 +0100 +@@ -160,17 +160,17 @@ + Tcl_SetVar(interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY); + + if (Tcl_Init(interp) == TCL_ERROR) { +- fprintf(stderr, "%s\n", interp->result); ++ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp)); + return(0); + } + + if (Tk_Init(interp) == TCL_ERROR) { +- fprintf(stderr, "%s\n", interp->result); ++ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp)); + return FALSE; + } + #if O_TIX + if (Tix_Init(interp) == TCL_ERROR) { +- fprintf(stderr, "%s\n", interp->result); ++ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp)); + return FALSE; + } + #endif +@@ -242,17 +242,17 @@ + String cmd; { + char errmsg[200]; + if (Tcl_Eval(interp,cmd) != TCL_OK) { +- fprintf(stderr, "###Tk/Tcl: %s\n", interp->result); ++ fprintf(stderr, "###Tk/Tcl: %s\n", Tcl_GetStringResult(interp)); + strcpy(errmsg,"###internalError {"); +- strcat (errmsg,interp -> result); ++ strcat (errmsg, Tcl_GetStringResult(interp)); + strcat (errmsg, " }"); + if (Tcl_Eval(interp,errmsg) != TCL_OK){ +- fprintf(stderr, "###%s\n", interp->result); ++ fprintf(stderr, "###%s\n", Tcl_GetStringResult(interp)); + exit(1); + return (""); + } + } +- return (interp -> result); ++ return (Tcl_GetStringResult(interp)); + } + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402201107.s1KB7peo008720>