4 files changed, 11 insertions, 30 deletions
diff --git a/devel/ocaml-camlp4/Makefile b/devel/ocaml-camlp4/Makefile
index 56692428b933..07d08c901f6a 100644
--- a/devel/ocaml-camlp4/Makefile
+++ b/devel/ocaml-camlp4/Makefile
@@ -2,16 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	camlp4
-PORTVERSION=	4.02.1+1
-PORTREVISION=	1
+PORTVERSION=	4.05+2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	michipili@gmail.com
-COMMENT=	Camlp4 is a system for writing extensible parsers for OCaml
+COMMENT=	System for writing extensible parsers for OCaml
 
 LICENSE=	LGPL20
 
+BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	ocaml
 
diff --git a/devel/ocaml-camlp4/distinfo b/devel/ocaml-camlp4/distinfo
index dafc83be6c4b..058ba6be8a87 100644
--- a/devel/ocaml-camlp4/distinfo
+++ b/devel/ocaml-camlp4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464772487
-SHA256 (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 06ec2c075a3960a757ba133bba468f06622624f9a44e18e3de7d609fa06f62d2
-SIZE (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 645754
+TIMESTAMP = 1533176554
+SHA256 (ocaml-camlp4-4.05+2_GH0.tar.gz) = db242c0f4896ddd9dc7d6e8064cba8bf099fb9a4d4f5ed35120978501cd3a935
+SIZE (ocaml-camlp4-4.05+2_GH0.tar.gz) = 647609
diff --git a/devel/ocaml-camlp4/files/patch-Makefile b/devel/ocaml-camlp4/files/patch-Makefile
index bf1e1fab001b..7e45c5769b8a 100644
--- a/devel/ocaml-camlp4/files/patch-Makefile
+++ b/devel/ocaml-camlp4/files/patch-Makefile
@@ -1,18 +1,11 @@
---- Makefile.orig	2014-10-21 11:41:15 UTC
+--- Makefile.orig	2017-10-11 20:17:38 UTC
 +++ Makefile
-@@ -19,12 +19,12 @@ all: byte native
+@@ -21,7 +21,7 @@ all: byte native
  
  .PHONY: install
  install:
--	./build/install.sh
-+	env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) ./build/install.sh
+-	env DESTDIR=$(DESTDIR) sh ./build/install.sh
++	env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) sh ./build/install.sh
  
  .PHONY: install-META
  install-META: camlp4/META
--	mkdir -p ${PKGDIR}/camlp4/
--	cp -f camlp4/META ${PKGDIR}/camlp4/
-+	mkdir -p ${DESTDIR}${PKGDIR}/camlp4/
-+	cp -f camlp4/META ${DESTDIR}${PKGDIR}/camlp4/
- 
- camlp4/META: camlp4/META.in
- 	sed -e s/@@VERSION@@/${version}/g $? > $@
diff --git a/devel/ocaml-camlp4/files/patch-build_install.sh b/devel/ocaml-camlp4/files/patch-build_install.sh
deleted file mode 100644
index b99f59baa514..000000000000
--- a/devel/ocaml-camlp4/files/patch-build_install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/install.sh.orig	2014-10-21 11:41:15 UTC
-+++ build/install.sh
-@@ -26,8 +26,8 @@ SAVED_LIBDIR="${LIBDIR}"
- 
- . ./config.sh
- 
--BINDIR="${SAVED_BINDIR:-${BINDIR}}"
--LIBDIR="${SAVED_LIBDIR:-${LIBDIR}}"
-+BINDIR="${DESTDIR}${SAVED_BINDIR:-${BINDIR}}"
-+LIBDIR="${DESTDIR}${SAVED_LIBDIR:-${LIBDIR}}"
- 
- not_installed=$PWD/_build/not_installed
-