aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devel/autoconf/Makefile12
-rw-r--r--devel/autoconf/files/patch-doc-Makefile.in16
-rw-r--r--devel/autoconf/files/patch-doc_autoconf.texi (renamed from devel/autoconf/files/patch-autoconf.texi)6
3 files changed, 24 insertions, 10 deletions
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 391a788c823b..56e38601d9b1 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -6,11 +6,19 @@ PORTVERSION= 2.69
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= GNU
-DISTNAME= autoconf-${PORTVERSION}
MAINTAINER= tijl@FreeBSD.org
COMMENT= Automatically configure source code on many Un*x platforms
+LICENSE= GPLv2+ GPLv3+ GFDL AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION
+LICENSE_COMB= multi
+LICENSE_NAME_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= AUTOCONF CONFIGURE SCRIPT EXCEPTION
+LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
+LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYINGv3
+LICENSE_FILE_GFDL= ${WRKSRC}/doc/fdl.texi
+LICENSE_FILE_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= ${WRKSRC}/COPYING.EXCEPTION
+LICENSE_PERMS_AUTOCONF_CONFIGURE_SCRIPT_EXCEPTION= ${_LICENSE_PERMS_DEFAULT}
+
BUILD_DEPENDS= gm4:devel/m4 \
help2man:misc/help2man
RUN_DEPENDS= gm4:devel/m4 \
@@ -42,7 +50,7 @@ post-patch:
post-install:
.for FILE in ${GENERIC_TOOLS}
- @${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${STAGEDIR}${PREFIX}/share/autoconf-${BUILD_VERSION}
+ ${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${STAGEDIR}${PREFIX}/share/autoconf-${BUILD_VERSION}
.endfor
.include <bsd.port.mk>
diff --git a/devel/autoconf/files/patch-doc-Makefile.in b/devel/autoconf/files/patch-doc-Makefile.in
index 1cba4ecf6f6f..e0dad60b094c 100644
--- a/devel/autoconf/files/patch-doc-Makefile.in
+++ b/devel/autoconf/files/patch-doc-Makefile.in
@@ -1,12 +1,18 @@
---- doc/Makefile.in.orig Mon Oct 16 13:58:44 2006
-+++ doc/Makefile.in Thu Apr 5 01:51:13 2007
-@@ -44,3 +44,3 @@
+--- doc/Makefile.in.orig 2012-04-25 02:40:26 UTC
++++ doc/Makefile.in
+@@ -65,13 +65,13 @@ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
DIST_SOURCES =
-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info
+INFO_DEPS = $(srcdir)/autoconf.info
- TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
-@@ -51,3 +51,3 @@
+ am__TEXINFO_TEX_DIR = $(srcdir)/../build-aux
+ DVIS = autoconf.dvi standards.dvi
+ PDFS = autoconf.pdf standards.pdf
+ PSS = autoconf.ps standards.ps
HTMLS = autoconf.html standards.html
-TEXINFOS = autoconf.texi standards.texi
+TEXINFOS = autoconf.texi
+ TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
+ MAKEINFOHTML = $(MAKEINFO) --html
diff --git a/devel/autoconf/files/patch-autoconf.texi b/devel/autoconf/files/patch-doc_autoconf.texi
index c9c0da44ce70..fc6059d97712 100644
--- a/devel/autoconf/files/patch-autoconf.texi
+++ b/devel/autoconf/files/patch-doc_autoconf.texi
@@ -1,5 +1,5 @@
---- doc/autoconf.texi.orig 2012-04-25 04:14:19.000000000 +0200
-+++ doc/autoconf.texi 2014-06-25 14:47:17.208468153 +0200
+--- doc/autoconf.texi.orig 2012-04-25 02:14:19 UTC
++++ doc/autoconf.texi
@@ -15,7 +15,7 @@
@c The ARG is an optional argument. To be used for macro arguments in
@c their documentation (@defmac).
@@ -18,7 +18,7 @@
@end macro
@c Handling the indexes with Texinfo yields several different problems.
-@@ -217,31 +217,11 @@
+@@ -217,31 +217,11 @@ entitled ``GNU Free Documentation Licens