svn commit: r421862 - in head/net/portfwd: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Sun Sep 11 18:15:25 UTC 2016
Author: amdmi3
Date: Sun Sep 11 18:15:23 2016
New Revision: 421862
URL: https://svnweb.freebsd.org/changeset/ports/421862
Log:
- Fix build on 11.x+ by switching to USES=autoreconf
===> Building for portfwd-0.29_1
gmake[1]: Entering directory '/wrkdirs/usr/ports/net/portfwd/work/portfwd-0.29'
cd . && /wrkdirs/usr/ports/net/portfwd/work/portfwd-0.29/config/missing aclocal-1.4
WARNING: `aclocal-1.4' is needed, and you do not seem to have it handy on your
system. You might have modified some files without having the
proper tools for further handling them. Check the `README' file,
it often tells you about the needed prerequirements for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing `aclocal-1.4' program.
gmake[1]: *** [Makefile:104: aclocal.m4] Error 1
gmake[1]: Leaving directory '/wrkdirs/usr/ports/net/portfwd/work/portfwd-0.29'
- Fix LICENSE, add license file
- Switch to options helpers
- Fix plist to properly optionize EXAMPLES
Approved by: portmgr blanket
Added:
head/net/portfwd/files/patch-Makefile.am (contents, props changed)
head/net/portfwd/files/patch-doc_Makefile.am (contents, props changed)
Deleted:
head/net/portfwd/files/patch-Makefile.in
head/net/portfwd/files/patch-doc__Makefile.in
Modified:
head/net/portfwd/Makefile
head/net/portfwd/pkg-plist
Modified: head/net/portfwd/Makefile
==============================================================================
--- head/net/portfwd/Makefile Sun Sep 11 18:10:56 2016 (r421861)
+++ head/net/portfwd/Makefile Sun Sep 11 18:15:23 2016 (r421862)
@@ -10,26 +10,29 @@ MASTER_SITES= SF
MAINTAINER= ale at FreeBSD.org
COMMENT= Port Forwarding Daemon
-LICENSE= GPLv2
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_powerpc64= Does not build
OPTIONS_DEFINE= DOCS EXAMPLES
GNU_CONFIGURE= yes
-USES= gmake
+USES= autoreconf gmake
USE_RC_SUBR= ${PORTNAME}
post-patch:
@${REINPLACE_CMD} -e "s|-Wall -ggdb -O3|${CFLAGS}|g" \
- ${WRKSRC}/src/Makefile.in
+ ${WRKSRC}/src/Makefile.am
@${REINPLACE_CMD} -e "s|-Wall -g -O3|${CFLAGS}|g" \
- ${WRKSRC}/tools/Makefile.in
+ ${WRKSRC}/tools/Makefile.am
@${TOUCH} ${WRKSRC}/* ${WRKSRC}/*/*
post-install:
+ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/rc.d
+
+post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/cfg/*.cfg ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/rc.d
.include <bsd.port.mk>
Added: head/net/portfwd/files/patch-Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/portfwd/files/patch-Makefile.am Sun Sep 11 18:15:23 2016 (r421862)
@@ -0,0 +1,8 @@
+--- Makefile.am.orig 2016-08-27 09:36:16 UTC
++++ Makefile.am
+@@ -1,4 +1,4 @@
+ SUBDIRS = getopt src tools doc
+
+-docdir = $(prefix)/doc/portfwd
++docdir = $(prefix)/share/doc/portfwd
+ doc_DATA = COPYING README CREDITS TODO
Added: head/net/portfwd/files/patch-doc_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/portfwd/files/patch-doc_Makefile.am Sun Sep 11 18:15:23 2016 (r421862)
@@ -0,0 +1,9 @@
+--- doc/Makefile.am.orig 2016-08-27 09:36:16 UTC
++++ doc/Makefile.am
+@@ -3,5 +3,5 @@
+ man_MANS = portfwd.8 portfwd.cfg.5
+ noinst_DATA = INSTALL.configure
+
+-docdir = $(prefix)/doc/portfwd
++docdir = $(prefix)/share/doc/portfwd
+ doc_DATA = FAQ conf.txt
Modified: head/net/portfwd/pkg-plist
==============================================================================
--- head/net/portfwd/pkg-plist Sun Sep 11 18:10:56 2016 (r421861)
+++ head/net/portfwd/pkg-plist Sun Sep 11 18:15:23 2016 (r421862)
@@ -7,21 +7,21 @@ man/man8/portfwd.8.gz
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/conf.txt
-%%EXAMPLESDIR%%/alias.cfg
-%%EXAMPLESDIR%%/bind-new.cfg
-%%EXAMPLESDIR%%/bind.cfg
-%%EXAMPLESDIR%%/chain.cfg
-%%EXAMPLESDIR%%/debug_ftp.cfg
-%%EXAMPLESDIR%%/dns.cfg
-%%EXAMPLESDIR%%/empty.cfg
-%%EXAMPLESDIR%%/external-director.cfg
-%%EXAMPLESDIR%%/fragile.cfg
-%%EXAMPLESDIR%%/ftp.cfg
-%%EXAMPLESDIR%%/load-balance.cfg
-%%EXAMPLESDIR%%/mail.cfg
-%%EXAMPLESDIR%%/portfwd1.cfg
-%%EXAMPLESDIR%%/portfwd2.cfg
-%%EXAMPLESDIR%%/single.cfg
-%%EXAMPLESDIR%%/test.cfg
-%%EXAMPLESDIR%%/udp.cfg
-%%EXAMPLESDIR%%/x.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alias.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind-new.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chain.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug_ftp.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dns.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/empty.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external-director.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fragile.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftp.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/load-balance.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mail.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/portfwd1.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/portfwd2.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/single.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/udp.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/x.cfg
More information about the svn-ports-head
mailing list