diff --git a/x11-toolkits/ocaml-labltk/Makefile b/x11-toolkits/ocaml-labltk/Makefile index b37267bda580..daf4a3944ae2 100644 --- a/x11-toolkits/ocaml-labltk/Makefile +++ b/x11-toolkits/ocaml-labltk/Makefile @@ -1,41 +1,39 @@ # Created by: Michael Grünewald PORTNAME= labltk PORTVERSION= 8.06.5 CATEGORIES= x11-toolkits MASTER_SITES= https://download.ocamlcore.org/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= ocaml- MAINTAINER= danfe@FreeBSD.org COMMENT= Objective Caml interface to Tk LICENSE= LGPL20 USES= gmake tk HAS_CONFIGURE= yes CONFIGURE_ARGS= -tkdefs "-I${LOCALBASE}/include -I${TCL_INCLUDEDIR}\ -I${TK_INCLUDEDIR}" \ -tklibs "-L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER}\ -ltk${TK_SHLIB_VER}" -verbose MAKE_JOBS_UNSAFE=yes USE_OCAML= yes ALL_TARGET= all opt post-patch: @${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} \ -e 's/$$(INSTALLDIR)/$$(DESTDIR)$$(INSTALLDIR)/g' \ -e 's/$$(INSTALLBINDIR)/$$(DESTDIR)$$(INSTALLBINDIR)/g' \ -e 's/$$(STUBLIBDIR)/$$(DESTDIR)$$(STUBLIBDIR)/g' \ -e 's/mkdir /& -p /g' - @${REINPLACE_CMD} -e 's|%%SCRIPTBASE%%|${PREFIX}/lib/ocaml/labltk/|g' \ - ${WRKSRC}/lib/Makefile pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs post-install: ${INSTALL_DATA} ${WRKSRC}/support/META ${STAGEDIR}${PREFIX}/lib/ocaml/${PORTNAME} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs/dlllabltk.so .include diff --git a/x11-toolkits/ocaml-labltk/files/patch-configure b/x11-toolkits/ocaml-labltk/files/patch-configure deleted file mode 100644 index 9e7541d3a7de..000000000000 --- a/x11-toolkits/ocaml-labltk/files/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig 2014-09-18 04:08:33 UTC -+++ configure -@@ -44,10 +44,6 @@ exec 3>&1 - - # Parse command-line arguments - --if echo "$configure_options" | grep -q -e '--\?[a-zA-Z0-9-]\+='; then -- err "Arguments to this script look like '-libdir /foo/bar', not '-libdir=/foo/bar' (note the '=')." --fi -- - while : ; do - case "$1" in - "") break;; -@@ -222,6 +218,8 @@ if test $has_tk = true && test -z "$tk_l - esac - if test -n "$tklibdir"; then - case "$system" in -+ freebsd) tk_libs="-L$tklibdir" ;; -+ bsd_elf) tk_libs="-L$tklibdir" ;; - *bsd*) tk_libs="-R$tklibdir -L$tklibdir" ;; - *) tk_libs="-L$tklibdir" ;; - esac diff --git a/x11-toolkits/ocaml-labltk/files/patch-lib_Makefile b/x11-toolkits/ocaml-labltk/files/patch-lib_Makefile deleted file mode 100644 index bdf33aa7a2cb..000000000000 --- a/x11-toolkits/ocaml-labltk/files/patch-lib_Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/Makefile.orig 2014-09-18 04:08:33 UTC -+++ lib/Makefile -@@ -75,7 +75,7 @@ $(LIBNAME)top$(EXE) : $(LIBNAME).cma ../ - $(LIBNAME): Makefile - @echo Generate $@ - @echo "#!/bin/sh" > $@ -- @echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) "$$@"' >> $@ -+ @echo 'exec %%SCRIPTBASE%%/$(LIBNAME)top$(EXE) -I %%SCRIPTBASE%% "$$@"' >> $@ - - install-script: $(LIBNAME) - cp $(LIBNAME) $(INSTALLBINDIR) -@@ -114,4 +114,4 @@ installopt: - cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).$(A) - chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa - chmod 644 $(INSTALLDIR)/$(LIBNAME).$(A) --endif -\ No newline at end of file -+endif