In memory of AlanE:

- Update to 0.2.3
- Add dependency on textproc/xmlto to create documentation
- Add run-time dependency on gmake
- Reword/clarify COMMENT and pkg-descr
- Cleanup Makefile
- Use DATADIR/DOCSDIR macros in pkg-plist
- Adopt this orphan

PR:		53180
Submitted by:	Sergei Kolobov <sergei@kolobov.com>

7 files changed, 114 insertions, 126 deletions

diff --git a/devel/makeplus/Makefile b/devel/makeplus/Makefile
index 26d832476afe..2df1a54d76a0 100644
--- a/devel/makeplus/Makefile
+++ b/devel/makeplus/Makefile
@@ -1,5 +1,3 @@
-# ex:ts=8	-*-mode: makefile-*-
-#
 # New ports collection makefile for:	makeplus
 # Date created:		2002-12-22
 # Whom:			Alan Eldridge <alane@geeksrus.net>
@@ -8,34 +6,29 @@
 #
 
 PORTNAME=	makeplus
-PORTVERSION=	0.1.2
-PORTREVISION=	1
-PORTEPOCH=	0
+PORTVERSION=	0.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.annexia.org/freeware/${PORTNAME}/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A set of GNU Make rules for building packages with gmake
+MAINTAINER=	sergei@kolobov.com
+COMMENT=	Advanced build system for GNU Make
 
+BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
 RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
 
 USE_GMAKE=	yes
-PREFIX?=	${LOCALBASE}
-MAKE_ENV+=	MAKEPLUS_HOME=${WRKSRC}
-NO_MTREE=	yes
+HAS_CONFIGURE=	yes
+MAKEPLUS_HOME=	${WRKSRC}
+CONFIGURE_ENV=	PATH=${MAKEPLUS_HOME}:${PATH} MAKEPLUS_HOME=${MAKEPLUS_HOME}
+CONFIGURE_ARGS=	--prefix=${PREFIX}
+MAKE_ENV=	MAKEPLUS_HOME=${MAKEPLUS_HOME}
 
 MAN1=		make+.1
 
-.include <bsd.port.pre.mk>
-
 do-build:
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./make+ \
-		prefix=${PREFIX} manprefix=${PREFIX}
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./make+
 
 do-install:
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		./make+ install prefix=${PREFIX} manprefix=${PREFIX}
-
-.include <bsd.port.post.mk>
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./make+ install
 
-#EOF
+.include <bsd.port.mk>
diff --git a/devel/makeplus/distinfo b/devel/makeplus/distinfo
index 1b4b5af51ab1..ceefe636446f 100644
--- a/devel/makeplus/distinfo
+++ b/devel/makeplus/distinfo
@@ -1 +1 @@
-MD5 (makeplus-0.1.2.tar.gz) = a8778da81bcd712d9e6fe3fa5cf63c44
+MD5 (makeplus-0.2.3.tar.gz) = 84255f16e4435190a446406a85304ebd
diff --git a/devel/makeplus/files/patch-Makefile+ b/devel/makeplus/files/patch-Makefile+
new file mode 100644
index 000000000000..e4c7beeb9c53
--- /dev/null
+++ b/devel/makeplus/files/patch-Makefile+
@@ -0,0 +1,36 @@
+
+$FreeBSD$
+
+--- Makefile+.orig	Tue Jul  1 15:43:11 2003
++++ Makefile+	Tue Jul  1 15:43:50 2003
+@@ -36,10 +36,10 @@
+ RPM_REQUIRES	:= make >= 3.76, bash
+ RPM_GROUP	:= Development/Building
+ 
+-CFLAGS		+= -Wall -Werror -g -O2
+-
+ EXTRA_DIST	:= doc/*.html doc/*.1
+ 
++XMLTO		:= xmlto --skip-validation
++
+ all:	build
+ 
+ configure:
+@@ -53,14 +53,14 @@
+ 
+ doc/index.html: doc/make+-book.xml
+ 	rm -f doc/*.html
+-	-xmlto html -o doc $^
++	-$(XMLTO) html -o doc $^
+ 
+ doc/make+.1: doc/make+-man.xml
+-	-rm -f doc/*.1 ; xmlto man -o doc $^
++	-rm -f doc/*.1 ; $(XMLTO) man -o doc $^
+ 
+ doc/makeplus.pdf: doc/make+-book.xml
+ 	rm -f $@
+-	-xmlto pdf -o doc $^
++	-$(XMLTO) pdf -o doc $^
+ 
+ test:
+ 
diff --git a/devel/makeplus/files/patch-configure_start.sh b/devel/makeplus/files/patch-configure_start.sh
deleted file mode 100644
index f39da75c305e..000000000000
--- a/devel/makeplus/files/patch-configure_start.sh
+++ /dev/null
@@ -1,73 +0,0 @@
---- configure_start.sh.orig	Sat Feb  8 05:00:52 2003
-+++ configure_start.sh	Mon Feb 10 18:30:53 2003
-@@ -28,33 +28,41 @@
- #define VERSION "$VERSION"
- EOF
- 
-+case `uname` in 
-+    *BSD) 
-+	manprefix="\$(prefix)";;
-+    *)	
-+	manprefix="\$(datadir)";;
-+esac
-+
- cat > config.mk <<EOF
- prefix		= $prefix
--bindir		= $bindir
--sbindir		= $sbindir
--libexecdir	= $libexecdir
--datadir		= $datadir
--sysconfdir	= $sysconfdir
--sharedstatedir	= $sharedstatedir
--localstatedir	= $localstatedir
--libdir		= $libdir
--infodir		= $infodir
--includedir	= $includedir
--pkgdatadir	= $pkgdatadir
--docdir		= $docdir
--pkgetcdir	= $pkgetcdir
--pkglibdir	= $pkglibdir
--pkgincludedir	= $pkgincludedir
--manprefix	= $datadir
--mandir		= $mandir
--man1dir		= $man1dir
--man2dir		= $man2dir
--man3dir		= $man3dir
--man4dir		= $man4dir
--man5dir		= $man5dir
--man6dir		= $man6dir
--man7dir		= $man7dir
--man8dir		= $man8dir
--manndir		= $manndir
--manldir		= $manldir
--EOF
-\ No newline at end of file
-+bindir		= \$(prefix)/bin
-+sbindir		= \$(prefix)/sbin
-+libexecdir	= \$(prefix)/libexec
-+datadir		= \$(prefix)/share
-+sysconfdir	= \$(prefix)/etc
-+sharedstatedir	= \$(prefix)/com
-+localstatedir	= \$(prefix)/var
-+libdir		= \$(prefix)/lib
-+infodir		= \$(prefix)/info
-+includedir	= \$(prefix)/include
-+pkgdatadir	= \$(datadir)/$PACKAGE
-+docdir		= \$(datadir)/doc/$PACKAGE
-+pkgetcdir	= \$(sysconfdir)/$PACKAGE
-+pkglibdir	= \$(libdir)/$PACKAGE
-+pkgincludedir	= \$(includedir)/$PACKAGE
-+manprefix	= $manprefix
-+mandir		= \$(manprefix)/man
-+man1dir		= \$(mandir)/man1
-+man2dir		= \$(mandir)/man2
-+man3dir		= \$(mandir)/man3
-+man4dir		= \$(mandir)/man4
-+man5dir		= \$(mandir)/man5
-+man6dir		= \$(mandir)/man6
-+man7dir		= \$(mandir)/man7
-+man8dir		= \$(mandir)/man8
-+manndir		= \$(mandir)/mann
-+manldir		= \$(mandir)/manl
-+EOF
-+
diff --git a/devel/makeplus/files/patch-main.mk b/devel/makeplus/files/patch-main.mk
new file mode 100644
index 000000000000..f7d9981b563f
--- /dev/null
+++ b/devel/makeplus/files/patch-main.mk
@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- main.mk.orig	Sat Mar  1 15:42:02 2003
++++ main.mk	Tue Jul  1 15:49:10 2003
+@@ -33,13 +33,14 @@
+ infodir		= $(prefix)/info
+ includedir	= $(prefix)/include
+ pkgdatadir	= $(datadir)/$(PACKAGE)
+-docdir		= $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ pkgetcdir	= $(sysconfdir)/$(PACKAGE)
+ pkglibdir	= $(libdir)/$(PACKAGE)
+ pkgincludedir	= $(includedir)/$(PACKAGE)
+ ifneq ($(shell uname), FreeBSD)
++docdir		= $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ manprefix	= $(datadir)
+ else
++docdir		= $(datadir)/doc/$(PACKAGE)
+ manprefix	= $(prefix)
+ endif
+ mandir		= $(manprefix)/man
diff --git a/devel/makeplus/pkg-descr b/devel/makeplus/pkg-descr
index 7a30bfa77c3a..009d5e4e23ba 100644
--- a/devel/makeplus/pkg-descr
+++ b/devel/makeplus/pkg-descr
@@ -1,6 +1,9 @@
-Make+ is a set of GNU Make rules for building the other packages from this
-author.
+Make+ is a set of scripts which enhance GNU make. 
 
-WWW: http://www.annexia.org/freeware/
+The scripts replace the functionality of autoconf, automake, rpm, 
+dpkg and more, allowing you to build, install, make RPMs, 
+make Debian packages and more, all from a single maintainable 
+'Makefile+' script. 
 
--- AlanE@FreeBSD.org
+Author:	Richard W.M. Jones <rich@annexia.org>
+WWW:	http://www.annexia.org/freeware/makeplus/
diff --git a/devel/makeplus/pkg-plist b/devel/makeplus/pkg-plist
index 09433ab7b08c..443278d0f9f8 100644
--- a/devel/makeplus/pkg-plist
+++ b/devel/makeplus/pkg-plist
@@ -1,32 +1,40 @@
+@comment $FreeBSD$
 bin/make+
 bin/make+-skeleton
 etc/make+.conf
-share/doc/makeplus-0.1.2/README
-share/doc/makeplus-0.1.2/ch01.html
-share/doc/makeplus-0.1.2/ch02.html
-share/doc/makeplus-0.1.2/ch03.html
-share/doc/makeplus-0.1.2/ch04.html
-share/doc/makeplus-0.1.2/index.html
-share/makeplus/c.mk
-share/makeplus/check_funcs.sh
-share/makeplus/check_headers.sh
-share/makeplus/check_lib.sh
-share/makeplus/configure.mk
-share/makeplus/configure_end.sh
-share/makeplus/configure_start.sh
-share/makeplus/default_goal.mk
-share/makeplus/dist.mk
-share/makeplus/install_dynamic_lib.sh
-share/makeplus/install_static_lib.sh
-share/makeplus/link_dynamic.sh
-share/makeplus/link_static.sh
-share/makeplus/main.mk
-share/makeplus/make+
-share/makeplus/make_rpm_spec.sh
-share/makeplus/make_website.sh
-share/makeplus/rpm.mk
-share/makeplus/run_tests.sh
-share/makeplus/test.mk
-share/makeplus/website.mk
-@dirrm share/makeplus
-@dirrm share/doc/makeplus-0.1.2
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%/ch03s02.html
+%%PORTDOCS%%%%DOCSDIR%%/ch03s03.html
+%%PORTDOCS%%%%DOCSDIR%%/ch04.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DATADIR%%/README.make+_for_bundles
+%%DATADIR%%/c.mk
+%%DATADIR%%/check_funcs.sh
+%%DATADIR%%/check_gnu_tar.sh
+%%DATADIR%%/check_headers.sh
+%%DATADIR%%/check_lib.sh
+%%DATADIR%%/check_progs.sh
+%%DATADIR%%/configure
+%%DATADIR%%/configure.mk
+%%DATADIR%%/configure_end.sh
+%%DATADIR%%/configure_start.sh
+%%DATADIR%%/default_goal.mk
+%%DATADIR%%/dist.mk
+%%DATADIR%%/install_dynamic_lib.sh
+%%DATADIR%%/install_static_lib.sh
+%%DATADIR%%/link_dynamic.sh
+%%DATADIR%%/link_static.sh
+%%DATADIR%%/main.mk
+%%DATADIR%%/make_rpm_spec.sh
+%%DATADIR%%/make_website.sh
+%%DATADIR%%/makeplus.tar.gz
+%%DATADIR%%/release.sh
+%%DATADIR%%/rpm.mk
+%%DATADIR%%/run_tests.sh
+%%DATADIR%%/test.mk
+%%DATADIR%%/website.mk
+@dirrm %%DATADIR%%