svn commit: r364085 - in head/devel/make++: . files

[Jason E. Hale]

Author: jhale
Date: Tue Aug  5 09:29:39 2014
New Revision: 364085
URL: http://svnweb.freebsd.org/changeset/ports/364085
QAT: https://qat.redports.org/buildarchive/r364085/

Log:
  - Stagify
  - Add DOCS option
  - Fix LICENSE (documentation states it is GPL2+ or Artistic)
  
  Approved by:	portmgr blanket

Added:
  head/devel/make++/files/
  head/devel/make++/files/patch-config.pl   (contents, props changed)
Modified:
  head/devel/make++/Makefile
  head/devel/make++/pkg-plist

Modified: head/devel/make++/Makefile
==============================================================================
--- head/devel/make++/Makefile	Tue Aug  5 09:09:26 2014	(r364084)
+++ head/devel/make++/Makefile	Tue Aug  5 09:29:39 2014	(r364085)
@@ -11,43 +11,21 @@ EXTRACT_SUFX=	.txz
 MAINTAINER=	gavin at 16degrees.com.au
 COMMENT=	Drop-in replacement for GNU make
 
-LICENSE=	ART10 GPLv1 GPLv2 GPLv3
+LICENSE=	ART10 GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		perl5 tar:xz
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--mandir=${MANPREFIX}/man \
+		--htmldir=${DOCSDIR}/html
 
 DATADIR=	${PREFIX}/share/${PORTNAME:S/+/p/g}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/+/p/g}
 
-MAN1=		makepp.1 makepp_build_algorithm.1 \
-		makepp_build_cache.1 makepp_build_check.1 \
-		makepp_builtin.1 makepp_builtins.1 \
-		makepp_command.1 makepp_compatibility.1 \
-		makepp_cookbook.1 makepp_extending.1 \
-		makepp_faq.1 makepp_functions.1 \
-		makepp_incompatibilities.1 makepp_release_notes.1 \
-		makepp_repositories.1 makepp_rules.1 \
-		makepp_sandboxes.1 makepp_scanning.1 \
-		makepp_signatures.1 makepp_speedup.1 \
-		makepp_statements.1 makepp_tutorial.1 \
-		makepp_tutorial_compilation.1 makepp_variables.1 \
-		makeppbuiltin.1 makeppclean.1 \
-		makeppgraph.1 makeppinfo.1 \
-		makepplog.1 makeppreplay.1 \
-		perl_performance.1
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if defined(NOPORTDOCS)
-CONFIGURE_ARGS+=--htmldir=none
-.else
-CONFIGURE_ARGS+=--htmldir=${DOCSDIR}/html
-.endif
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/.test_done
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/devel/make++/files/patch-config.pl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/make++/files/patch-config.pl	Tue Aug  5 09:29:39 2014	(r364085)
@@ -0,0 +1,11 @@
+--- ./config.pl.orig	2014-08-05 05:06:18.000000000 -0400
++++ ./config.pl	2014-08-05 05:07:12.000000000 -0400
+@@ -127,7 +127,7 @@
+ 	rm -rf $(VERSION)
+ 
+ install: all
+-	$(PERL) install.pl $(BINDIR) $(DATADIR) $(MANDIR) $(HTMLDIR) $(FINDBIN) $(DESTDIR)
++	$(PERL) install.pl $(BINDIR) $(DATADIR) $(MANDIR) $(HTMLDIR) $(FINDBIN) $(DESTDIR)$(PREFIX)
+ 
+ .PHONY: all distribution install test testall
+ ];

Modified: head/devel/make++/pkg-plist
==============================================================================
--- head/devel/make++/pkg-plist	Tue Aug  5 09:09:26 2014	(r364084)
+++ head/devel/make++/pkg-plist	Tue Aug  5 09:29:39 2014	(r364085)
@@ -14,6 +14,37 @@ bin/mppg
 bin/mppi
 bin/mppl
 bin/mppr
+man/man1/makepp.1.gz
+man/man1/makepp_build_algorithm.1.gz
+man/man1/makepp_build_cache.1.gz
+man/man1/makepp_build_check.1.gz
+man/man1/makepp_builtin.1.gz
+man/man1/makepp_builtins.1.gz
+man/man1/makepp_command.1.gz
+man/man1/makepp_compatibility.1.gz
+man/man1/makepp_cookbook.1.gz
+man/man1/makepp_extending.1.gz
+man/man1/makepp_faq.1.gz
+man/man1/makepp_functions.1.gz
+man/man1/makepp_incompatibilities.1.gz
+man/man1/makepp_release_notes.1.gz
+man/man1/makepp_repositories.1.gz
+man/man1/makepp_rules.1.gz
+man/man1/makepp_sandboxes.1.gz
+man/man1/makepp_scanning.1.gz
+man/man1/makepp_signatures.1.gz
+man/man1/makepp_speedup.1.gz
+man/man1/makepp_statements.1.gz
+man/man1/makepp_tutorial.1.gz
+man/man1/makepp_tutorial_compilation.1.gz
+man/man1/makepp_variables.1.gz
+man/man1/makeppbuiltin.1.gz
+man/man1/makeppclean.1.gz
+man/man1/makeppgraph.1.gz
+man/man1/makeppinfo.1.gz
+man/man1/makepplog.1.gz
+man/man1/makeppreplay.1.gz
+man/man1/perl_performance.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/bg.png
 %%PORTDOCS%%%%DOCSDIR%%/html/google.png
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html