svn commit: r431248 - in head/lang/maude: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Thu Jan 12 11:28:50 UTC 2017
Author: amdmi3
Date: Thu Jan 12 11:28:49 2017
New Revision: 431248
URL: https://svnweb.freebsd.org/changeset/ports/431248
Log:
- Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL
- Switch to options helpers
Approved by: portmgr blanket
Added:
head/lang/maude/files/patch-Mixfix-lexerAux
- copied unchanged from r431247, head/lang/maude/files/extra-patch-Mixfix-lexerAux
Deleted:
head/lang/maude/files/extra-patch-Mixfix-lexerAux
Modified:
head/lang/maude/Makefile
Modified: head/lang/maude/Makefile
==============================================================================
--- head/lang/maude/Makefile Thu Jan 12 11:18:29 2017 (r431247)
+++ head/lang/maude/Makefile Thu Jan 12 11:28:49 2017 (r431248)
@@ -39,10 +39,6 @@ BROKEN_aarch64= Fails to link: missing
.include <bsd.port.options.mk>
-.if ${OPSYS} == "DragonFly" || ${OSVERSION} >= 1000000
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Mixfix-lexerAux
-.endif
-
.if ${PORT_OPTIONS:MFULL_MAUDE}
MASTER_SITES+= http://maude.lcc.uma.es/FullMaude/FM${FULL_MAUDE_VER}/:fm
FULL_MAUDE= full-maude${FULL_MAUDE_VER}.maude
@@ -56,10 +52,8 @@ PLIST_SUB+= FULL_MAUDE_VER="${FULL_MAUDE
PLIST_SUB+= FULL_MAUDE="@comment "
.endif
-post-extract:
-.if ${PORT_OPTIONS:MFULL_MAUDE}
+post-extract-FULL_MAUDE-on:
${UNZIP_CMD} ${DISTDIR}/${FULL_MAUDE_DIST} ${FULL_MAUDE} -d ${WRKDIR}
-.endif
post-patch:
@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \
@@ -67,11 +61,11 @@ post-patch:
@${REINPLACE_CMD} -e 's|-lcurses|-lncurses|g' \
${WRKSRC}/configure.ac
-post-install:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MFULL_MAUDE}
+
+post-install-FULL_MAUDE-on:
${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${STAGEDIR}${DATADIR}
-.endif
.include <bsd.port.mk>
Copied: head/lang/maude/files/patch-Mixfix-lexerAux (from r431247, head/lang/maude/files/extra-patch-Mixfix-lexerAux)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/maude/files/patch-Mixfix-lexerAux Thu Jan 12 11:28:49 2017 (r431248, copy of r431247, head/lang/maude/files/extra-patch-Mixfix-lexerAux)
@@ -0,0 +1,22 @@
+--- ./src/Mixfix/lexerAux.cc.orig 2014-09-03 02:54:57.000000000 +0200
++++ ./src/Mixfix/lexerAux.cc 2014-09-03 02:55:40.000000000 +0200
+@@ -35,7 +35,7 @@
+ bool fakeNewlineStack[MAX_IN_DEPTH];
+
+ void
+-getInput(char* buf, int& result, int max_size)
++getInput(char* buf, size_t& result, size_t max_size)
+ {
+ result = YY_NULL;
+ if (UserLevelRewritingContext::interrupted())
+--- ./src/Mixfix/lexerAux.hh.orig 2014-09-03 02:56:33.000000000 +0200
++++ ./src/Mixfix/lexerAux.hh 2014-09-03 02:57:05.000000000 +0200
+@@ -27,7 +27,7 @@
+ //extern int inStackPtr;
+ //extern YY_BUFFER_STATE inStack[];
+
+-void getInput(char* buf, int& result, int max_size);
++void getInput(char* buf, size_t& result, size_t max_size);
+ void lexerIdMode();
+ void lexerTokenTreeMode(int terminatingTokens);
+ void lexerCmdMode();
More information about the svn-ports-head
mailing list