diff -urN /usr/ports/devel/make++/Makefile devel/make++/Makefile
--- /usr/ports/devel/make++/Makefile	2010-09-22 01:55:28.000000000 +0900
+++ devel/make++/Makefile	2011-08-03 03:11:06.000000000 +0900
@@ -7,17 +7,35 @@
 #
 
 PORTNAME=	make++
-PORTVERSION=	1.19
-PORTREVISION=	1
+PORTVERSION=	1.40.1a
 CATEGORIES=	devel perl5
-MASTER_SITES=	SF/makepp/makepp/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:S/+/p/g}/${PORTVERSION:S/a//}
 DISTNAME=	${PORTNAME:S/+/p/g}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A drop-in replacement for GNU make
 
+LICENSE=	ART10 GPLv1 GPLv2 GPLv3
+LICENSE_COMB=	dual
+
+WRKSRC=		${WRKDIR}/${PORTNAME:S/+/p/g}-${PORTVERSION:R}
+
 USE_PERL5=	yes
-DATADIR=	${PREFIX}/share/makepp
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
+
+DATADIR=	${PREFIX}/share/${PORTNAME:S/+/p/g}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/+/p/g}
+
+MAN1=		makepp.1 makepp_build_algorithm.1 \
+		makepp_builtin.1 makepp_command.1 \
+		makepp_cookbook.1 makepp_extending.1 \
+		makepp_functions.1 makepp_incompatibilities.1 \
+		makepp_release_notes.1 makepp_repositories.1 \
+		makepp_rules.1 makepp_scanning.1 \
+		makepp_signatures.1 makepp_statements.1 \
+		makepp_tutorial.1 makepp_tutorial_compilation.1 \
+		makepp_variables.1 makeppclient.1
 
 .include <bsd.port.pre.mk>
 
@@ -25,19 +43,13 @@
 RUN_DEPENDS+=	p5-Digest-MD5>=2.16:${PORTSDIR}/security/p5-Digest-MD5
 .endif
 
-do-build:
-	@${PERL} -pi -e "s|\@htmldir\@|${PREFIX}/share/makepp/html|g ; \
-		s|\@datadir\@|${PREFIX}/share/makepp|g" ${WRKSRC}/makepp
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/makepp ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}/Signature
-	${INSTALL_SCRIPT} ${WRKSRC}/recursive_makepp ${DATADIR}
-	@(cd ${WRKSRC} ; \
-	  ${FIND} . -name "*.pm" -maxdepth 1 -exec ${INSTALL_SCRIPT} {} ${DATADIR} \;)
-	@(cd ${WRKSRC}/Signature ; \
-	  ${FIND} . -name "*.pm" -exec ${INSTALL_SCRIPT} {} ${DATADIR}/Signature \;)
-	@(cd ${WRKSRC} ; \
-	  ${FIND} . -name "*.mk" -exec ${INSTALL_SCRIPT} {} ${DATADIR} \;)
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=--htmldir=none
+.else
+CONFIGURE_ARGS+=--htmldir=${DOCSDIR}/html
+.endif
+
+post-extract:
+	@${RM} -f ${WRKSRC}/makepp_tests/wildcard_repositories.test
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/devel/make++/distinfo devel/make++/distinfo
--- /usr/ports/devel/make++/distinfo	2011-07-04 01:58:10.000000000 +0900
+++ devel/make++/distinfo	2011-08-03 02:26:40.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (makepp-1.19.tar.gz) = 47951629d562e95b0a96157c4a278f2b9c25de9673ba618cfca2098b03bd0ce6
-SIZE (makepp-1.19.tar.gz) = 217453
+SHA256 (makepp-1.40.1a.tar.gz) = eb9991e9c726836e9b214377976dc15f66f4f6045f9713cd36c8c6b73c1f8e83
+SIZE (makepp-1.40.1a.tar.gz) = 278170
diff -urN /usr/ports/devel/make++/pkg-plist devel/make++/pkg-plist
--- /usr/ports/devel/make++/pkg-plist	2006-04-21 22:43:17.000000000 +0900
+++ devel/make++/pkg-plist	2011-08-03 03:08:02.000000000 +0900
@@ -1,22 +1,56 @@
 bin/makepp
-share/makepp/AutoloadComponent.pm
-share/makepp/FileInfo.pm
-share/makepp/FileInfo_makepp.pm
-share/makepp/Glob.pm
-share/makepp/MakeEvent.pm
-share/makepp/Makefile.pm
-share/makepp/Makesubs.pm
-share/makepp/Rule.pm
-share/makepp/Signature.pm
-share/makepp/TextSubs.pm
-share/makepp/c_compilation_md5.mk
-share/makepp/infer_objects.mk
-share/makepp/makepp_builtin_rules.mk
-share/makepp/makepp_default_makefile.mk
-share/makepp/recursive_makepp
-share/makepp/Signature/c_compilation_md5.pm
-share/makepp/Signature/exact_match.pm
-share/makepp/Signature/md5.pm
-share/makepp/Signature/target_newer.pm
-@dirrm share/makepp/Signature
-@dirrm share/makepp
+bin/makeppclient
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_build_algorithm.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_builtin.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_command.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_cookbook.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_extending.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_functions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_incompatibilities.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_release_notes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_repositories.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_rules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_scanning.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_signatures.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_statements.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_tutorial_compilation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepp_variables.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makeppclient.html
+%%DATADIR%%/ActionParser/Legacy.pm
+%%DATADIR%%/ActionParser/Specific.pm
+%%DATADIR%%/ActionParser.pm
+%%DATADIR%%/CommandParser/Basic.pm
+%%DATADIR%%/CommandParser/Gcc.pm
+%%DATADIR%%/CommandParser/Vcs.pm
+%%DATADIR%%/CommandParser.pm
+%%DATADIR%%/FileInfo.pm
+%%DATADIR%%/FileInfo_makepp.pm
+%%DATADIR%%/Glob.pm
+%%DATADIR%%/MakeEvent.pm
+%%DATADIR%%/Makefile.pm
+%%DATADIR%%/Makesubs.pm
+%%DATADIR%%/Rule.pm
+%%DATADIR%%/Scanner/C.pm
+%%DATADIR%%/Scanner/Vera.pm
+%%DATADIR%%/Scanner/Verilog.pm
+%%DATADIR%%/Scanner.pm
+%%DATADIR%%/Signature/c_compilation_md5.pm
+%%DATADIR%%/Signature/exact_match.pm
+%%DATADIR%%/Signature/md5.pm
+%%DATADIR%%/Signature/target_newer.pm
+%%DATADIR%%/Signature/verilog_simulation_md5.pm
+%%DATADIR%%/Signature/verilog_synthesis_md5.pm
+%%DATADIR%%/Signature.pm
+%%DATADIR%%/TextSubs.pm
+%%DATADIR%%/makepp_builtin_rules.mk
+%%DATADIR%%/makepp_default_makefile.mk
+%%DATADIR%%/recursive_makepp
+@dirrm %%DATADIR%%/Signature
+@dirrm %%DATADIR%%/Scanner
+@dirrm %%DATADIR%%/CommandParser
+@dirrm %%DATADIR%%/ActionParser
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html