4 files changed, 20 insertions, 23 deletions

diff --git a/devel/make++/Makefile b/devel/make++/Makefile
index dfb0b414021e..54136e21712d 100644
--- a/devel/make++/Makefile
+++ b/devel/make++/Makefile
@@ -7,16 +7,18 @@
 #
 
 PORTNAME=	make++
-PORTVERSION=	1.10
-CATEGORIES=	devel
-MASTER_SITES=	http://lnc.usc.edu/~holt/makepp/
+PORTVERSION=	1.18
+CATEGORIES=	devel perl5
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME:S/+/p/g}
 DISTNAME=	${PORTNAME:S/+/p/g}-${PORTVERSION}
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
 
 USE_PERL5=	yes
+DATADIR=	${PREFIX}/share/makepp
 
 do-build:
 	@${PERL} -pi -e "s|\@htmldir\@|${PREFIX}/share/makepp/html|g ; \
@@ -24,21 +26,15 @@ do-build:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/makepp ${PREFIX}/bin
-
-	@${MKDIR} ${PREFIX}/share/makepp
-	@${MKDIR} ${PREFIX}/share/makepp/Signature
-
-	${INSTALL_SCRIPT} ${WRKSRC}/recursive_makepp ${PREFIX}/share/makepp
-
-.for module in FileInfo FileInfo_makepp MakeEvent Glob Makefile Makesubs Rule Signature TextSubs Signature/exact_match Signature/target_newer Signature/c_compilation_md5 Signature/md5
-	${INSTALL_SCRIPT} ${WRKSRC}/${module}.pm ${PREFIX}/share/makepp/${module}.pm
-.endfor
-
-.for include in c_compilation_md5 infer_objects makepp_builtin_rules makepp_default_makefile
-	${INSTALL_DATA} ${WRKSRC}/${include}.mk ${PREFIX}/share/makepp
-.endfor
-
-	@${MKDIR} ${PREFIX}/share/makepp/html
-	${CP} ${WRKSRC}/doc/*.html ${PREFIX}/share/makepp/html
+	@${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} \;)
+	@${MKDIR} ${DATADIR}/html
+	${CP} ${WRKSRC}/doc/* ${DATADIR}/html
 
 .include <bsd.port.mk>
diff --git a/devel/make++/distinfo b/devel/make++/distinfo
index 90f99750a2d9..e5fb732d8735 100644
--- a/devel/make++/distinfo
+++ b/devel/make++/distinfo
@@ -1 +1 @@
-MD5 (makepp-1.10.tar.gz) = 486069bb2a5a82835f522af531388a48
+MD5 (makepp-1.18.tar.gz) = 0ab4fee5c74482d21bcbf8da3a292b1f
diff --git a/devel/make++/pkg-descr b/devel/make++/pkg-descr
index f6322d38d286..e2b3df2c0577 100644
--- a/devel/make++/pkg-descr
+++ b/devel/make++/pkg-descr
@@ -10,4 +10,4 @@ called makepp (or make++) because
 For backward compatibility, it will work with input files designed
 for make, but there are much better ways to do things.
 
-WWW: http://lnc.usc.edu/~holt/makepp/
+WWW: http://makepp.sourceforge.net/
diff --git a/devel/make++/pkg-plist b/devel/make++/pkg-plist
index b9d2e14f3b9e..8daf8d8d5fe6 100644
--- a/devel/make++/pkg-plist
+++ b/devel/make++/pkg-plist
@@ -1,4 +1,5 @@
 bin/makepp
+share/makepp/AutoloadComponent.pm
 share/makepp/FileInfo.pm
 share/makepp/FileInfo_makepp.pm
 share/makepp/Glob.pm
@@ -28,7 +29,7 @@ share/makepp/html/incompat.html
 share/makepp/html/index.html
 share/makepp/html/inferring.html
 share/makepp/html/legacy_makefiles.html
-share/makepp/html/release_notes_100.html
+share/makepp/html/release_notes_118.html
 share/makepp/html/repositories.html
 share/makepp/html/scanning.html
 share/makepp/html/signature_checking.html