8 files changed, 16 insertions, 88 deletions

diff --git a/devel/makeplus/Makefile b/devel/makeplus/Makefile
index d43e1f5b87ba..671da9683d46 100644
--- a/devel/makeplus/Makefile
+++ b/devel/makeplus/Makefile
@@ -8,18 +8,20 @@
 #
 
 PORTNAME=	makeplus
-PORTVERSION=	0.0.15
+PORTVERSION=	0.1.2
 PORTREVISION=	0
 PORTEPOCH=	0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.annexia.org/freeware/${PORTNAME}/
 
+MAINTAINER=	alane@FreeBSD.org
+
 USE_GMAKE=	yes
 PREFIX?=	${LOCALBASE}
 MAKE_ENV+=	MAKEPLUS_HOME=${WRKSRC}
 NO_MTREE=	yes
 
-MAINTAINER=	alane@FreeBSD.org
+MAN1=		make+.1
 
 .include <bsd.port.pre.mk>
 
@@ -27,7 +29,8 @@ do-build:
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./make+
 
 do-install:
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./make+ install prefix=${PREFIX}
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
+		./make+ install prefix=${PREFIX} manprefix=${PREFIX}
 
 .include <bsd.port.post.mk>
 
diff --git a/devel/makeplus/distinfo b/devel/makeplus/distinfo
index be0d374e2daa..1b4b5af51ab1 100644
--- a/devel/makeplus/distinfo
+++ b/devel/makeplus/distinfo
@@ -1 +1 @@
-MD5 (makeplus-0.0.15.tar.gz) = bf8c8645627a1ea4c44ebf0ceca06c3e
+MD5 (makeplus-0.1.2.tar.gz) = a8778da81bcd712d9e6fe3fa5cf63c44
diff --git a/devel/makeplus/files/patch-c.mk b/devel/makeplus/files/patch-c.mk
deleted file mode 100644
index 905e2075ee54..000000000000
--- a/devel/makeplus/files/patch-c.mk
+++ /dev/null
@@ -1,17 +0,0 @@
---- c.mk.orig	Mon Dec  9 14:32:33 2002
-+++ c.mk	Fri Dec 27 05:10:26 2002
-@@ -13,9 +13,11 @@
- # install make+ separately.
- 
- # General C compilation variables.
--CC		= gcc
--CFLAGS		= -I. -I..
--LIBS		=
-+CC		?= gcc
-+CFLAGS		+= -I. -I..
-+LIBS		+=
-+SETENV		?= /usr/bin/env
-+CONF_ENV	= CC="$(CC)" CFLAGS="$(CFLAGS)"
- 
- # Link scripts.
- MP_LINK_STATIC	= $(MAKEPLUS_HOME)/link_static.sh
diff --git a/devel/makeplus/files/patch-configure.mk b/devel/makeplus/files/patch-configure.mk
deleted file mode 100644
index 3a4b66713d7c..000000000000
--- a/devel/makeplus/files/patch-configure.mk
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.mk.orig	Mon Dec  9 14:41:01 2002
-+++ configure.mk	Fri Dec 27 05:09:39 2002
-@@ -13,8 +13,13 @@
- # install make+ separately.
- 
- # Configuration scripts.
--MP_CONFIGURE_START = $(MAKEPLUS_HOME)/configure_start.sh > config.h
--MP_CONFIGURE_END = $(MAKEPLUS_HOME)/configure_end.sh >> config.h
--MP_CHECK_HEADERS = $(MAKEPLUS_HOME)/check_headers.sh >> config.h
--MP_CHECK_FUNCS	= $(MAKEPLUS_HOME)/check_funcs.sh >> config.h
--MP_CHECK_LIB	= $(MAKEPLUS_HOME)/check_lib.sh >> config.h
-\ No newline at end of file
-+MP_CONFIGURE_START = $(SETENV) $(CONF_ENV) \
-+	$(MAKEPLUS_HOME)/configure_start.sh > config.h
-+MP_CONFIGURE_END = $(SETENV) $(CONF_ENV) \
-+	$(MAKEPLUS_HOME)/configure_end.sh >> config.h
-+MP_CHECK_HEADERS = $(SETENV) $(CONF_ENV) \
-+	$(MAKEPLUS_HOME)/check_headers.sh >> config.h
-+MP_CHECK_FUNCS	=  $(SETENV) $(CONF_ENV) \
-+	$(MAKEPLUS_HOME)/check_funcs.sh >> config.h
-+MP_CHECK_LIB	=  $(SETENV) $(CONF_ENV) \
-+	$(MAKEPLUS_HOME)/check_lib.sh >> config.h
diff --git a/devel/makeplus/files/patch-main.mk b/devel/makeplus/files/patch-main.mk
deleted file mode 100644
index 7106b2ff2776..000000000000
--- a/devel/makeplus/files/patch-main.mk
+++ /dev/null
@@ -1,42 +0,0 @@
---- main.mk.orig	Mon Dec 16 15:26:30 2002
-+++ main.mk	Fri Dec 27 01:21:12 2002
-@@ -33,19 +33,21 @@
- infodir		= $(prefix)/info
- includedir	= $(prefix)/include
- pkgdatadir	= $(datadir)/$(PACKAGE)
-+pkgetcdir	= $(sysconfdir)/$(PACKAGE)
- pkglibdir	= $(libdir)/$(PACKAGE)
- pkgincludedir	= $(includedir)/$(PACKAGE)
--mandir		= $(datadir)/man
--man1dir		= $(datadir)/man/man1
--man2dir		= $(datadir)/man/man2
--man3dir		= $(datadir)/man/man3
--man4dir		= $(datadir)/man/man4
--man5dir		= $(datadir)/man/man5
--man6dir		= $(datadir)/man/man6
--man7dir		= $(datadir)/man/man7
--man8dir		= $(datadir)/man/man8
--manndir		= $(datadir)/man/mann
--manldir		= $(datadir)/man/manl
-+manprefix	?=$(datadir)
-+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
- 
- # Include the other parts of this makefile.
- include $(MAKEPLUS_HOME)/configure.mk
-@@ -72,4 +74,4 @@
- .EXPORT_ALL_VARIABLES:
- 
- # Phony targets.
--.PHONY: clean distclean
-\ No newline at end of file
-+.PHONY: clean distclean
diff --git a/devel/makeplus/pkg-comment b/devel/makeplus/pkg-comment
index db8b2125a09d..87ccfed66d31 100644
--- a/devel/makeplus/pkg-comment
+++ b/devel/makeplus/pkg-comment
@@ -1 +1 @@
-A set of GNU Make rules for building the other packages from this author
+A set of GNU Make rules for building packages with gmake
diff --git a/devel/makeplus/pkg-descr b/devel/makeplus/pkg-descr
index c3bc5a32d499..7a30bfa77c3a 100644
--- a/devel/makeplus/pkg-descr
+++ b/devel/makeplus/pkg-descr
@@ -3,5 +3,4 @@ author.
 
 WWW: http://www.annexia.org/freeware/
 
--- AlanE
-
+-- AlanE@FreeBSD.org
diff --git a/devel/makeplus/pkg-plist b/devel/makeplus/pkg-plist
index bd5ab4a6279e..09433ab7b08c 100644
--- a/devel/makeplus/pkg-plist
+++ b/devel/makeplus/pkg-plist
@@ -1,6 +1,12 @@
 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
@@ -23,3 +29,4 @@ share/makeplus/run_tests.sh
 share/makeplus/test.mk
 share/makeplus/website.mk
 @dirrm share/makeplus
+@dirrm share/doc/makeplus-0.1.2