svn commit: r501749 - in head/devel: . arcanist arcanist-lib arcanist/files phabricator
Chris Rees
crees at FreeBSD.org
Wed May 15 20:53:18 UTC 2019
Author: crees
Date: Wed May 15 20:53:15 2019
New Revision: 501749
URL: https://svnweb.freebsd.org/changeset/ports/501749
Log:
devel/arcanist: Split into arcanist-lib and arcanist.
The arcanist port has always conflicted with archivers/arc, but
if the port is installed without the symlink in PREFIX/bin, there
is no issue.
A user expecting to be able to use arcanist in this way can alias
arcanist in their .cshrc or similar and only install the -lib port.
Approved by: grembo (maintainer)
Differential Revision: https://reviews.freebsd.org/D19920
Added:
head/devel/arcanist-lib/
- copied from r499081, head/devel/arcanist/
Deleted:
head/devel/arcanist/distinfo
head/devel/arcanist/files/
head/devel/arcanist/pkg-descr
head/devel/arcanist/pkg-plist
Modified:
head/devel/Makefile
head/devel/arcanist-lib/Makefile
head/devel/arcanist-lib/pkg-plist
head/devel/arcanist/Makefile
head/devel/phabricator/Makefile
Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile Wed May 15 20:46:59 2019 (r501748)
+++ head/devel/Makefile Wed May 15 20:53:15 2019 (r501749)
@@ -126,6 +126,7 @@
SUBDIR += apr2
SUBDIR += arachne-pnr
SUBDIR += arcanist
+ SUBDIR += arcanist-lib
SUBDIR += arduino
SUBDIR += arduino-avrdude
SUBDIR += arduino-bsd-mk
Modified: head/devel/arcanist-lib/Makefile
==============================================================================
--- head/devel/arcanist/Makefile Tue Apr 16 08:05:21 2019 (r499081)
+++ head/devel/arcanist-lib/Makefile Wed May 15 20:53:15 2019 (r501749)
@@ -1,21 +1,21 @@
# $FreeBSD$
-PORTNAME= arcanist
-PORTVERSION= 20181231
-PORTREVISION= 1
-CATEGORIES= devel
-PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
+PORTNAME?= arcanist
+PORTVERSION?= 20181231
+PORTREVISION?= 2
+CATEGORIES?= devel
+PKGNAMESUFFIX= ${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX}
MAINTAINER= grembo at FreeBSD.org
-COMMENT= Command line interface for Phabricator
+COMMENT?= Libraries for the command line interface for Phabricator
+SLAVEPORT?= lib
+
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PHP_PKGNAMEPREFIX}libphutil>0:devel/libphutil@${PHP_FLAVOR}
-CONFLICTS= arc-*
-
PHP_DESTDIR= lib/php/arcanist
USES= php:flavors python:2.7,env shebangfix
SHEBANG_FILES= scripts/breakout.py
@@ -25,17 +25,36 @@ NO_BUILD= yes
NO_ARCH= yes
GH_ACCOUNT= phacility
GH_TAGNAME= 25c2381
+PLIST= ${.CURDIR}/pkg-plist
+.if ${SLAVEPORT} == lib
+SLAVE_PKGNAMESUFFIX= -${SLAVEPORT}
+
OPTIONS_DEFINE= ENCODINGS
OPTIONS_DEFAULT=ENCODINGS
ENCODINGS_DESC= Support for encodings other than utf-8
ENCODINGS_USE= PHP=mbstring
+.else # link only
+
+RUN_DEPENDS= arcanist-lib${PHP_PKGNAMESUFFIX}>0:devel/arcanist-lib@${PHP_FLAVOR}
+
+NO_BUILD= yes
+
+CONFLICTS= arc
+
+PLIST_FILES= bin/arc
+
+.endif
+
do-install:
+.if ${SLAVEPORT} == bin
+ ${RLN} ../${PHP_DESTDIR}/scripts/arcanist.php ${STAGEDIR}${PREFIX}/bin/arc
+.else
@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
- ${LN} -sf ../${PHP_DESTDIR}/scripts/arcanist.php ${STAGEDIR}${PREFIX}/bin/arc
@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
${RLN} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/resources/shell/bash-completion ${STAGEDIR}${PREFIX}/share/bash-completion/completions/arc
+.endif
.include <bsd.port.mk>
Modified: head/devel/arcanist-lib/pkg-plist
==============================================================================
--- head/devel/arcanist/pkg-plist Tue Apr 16 08:05:21 2019 (r499081)
+++ head/devel/arcanist-lib/pkg-plist Wed May 15 20:53:15 2019 (r501749)
@@ -1,4 +1,3 @@
-bin/arc
lib/php/arcanist/LICENSE
lib/php/arcanist/NOTICE
lib/php/arcanist/README.md
Modified: head/devel/arcanist/Makefile
==============================================================================
--- head/devel/arcanist/Makefile Wed May 15 20:46:59 2019 (r501748)
+++ head/devel/arcanist/Makefile Wed May 15 20:53:15 2019 (r501749)
@@ -1,41 +1,12 @@
# $FreeBSD$
PORTNAME= arcanist
-PORTVERSION= 20181231
-PORTREVISION= 1
-CATEGORIES= devel
-PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
MAINTAINER= grembo at FreeBSD.org
COMMENT= Command line interface for Phabricator
-LICENSE= APACHE20
-LICENSE_FILE= ${WRKSRC}/LICENSE
+SLAVEPORT= bin
-RUN_DEPENDS= ${PHP_PKGNAMEPREFIX}libphutil>0:devel/libphutil@${PHP_FLAVOR}
+MASTERDIR= ${.CURDIR}/../arcanist-lib
-CONFLICTS= arc-*
-
-PHP_DESTDIR= lib/php/arcanist
-USES= php:flavors python:2.7,env shebangfix
-SHEBANG_FILES= scripts/breakout.py
-USE_PHP= curl dom hash json simplexml zlib
-USE_GITHUB= yes
-NO_BUILD= yes
-NO_ARCH= yes
-GH_ACCOUNT= phacility
-GH_TAGNAME= 25c2381
-
-OPTIONS_DEFINE= ENCODINGS
-OPTIONS_DEFAULT=ENCODINGS
-ENCODINGS_DESC= Support for encodings other than utf-8
-ENCODINGS_USE= PHP=mbstring
-
-do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
- cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
- ${LN} -sf ../${PHP_DESTDIR}/scripts/arcanist.php ${STAGEDIR}${PREFIX}/bin/arc
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
- ${RLN} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/resources/shell/bash-completion ${STAGEDIR}${PREFIX}/share/bash-completion/completions/arc
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Modified: head/devel/phabricator/Makefile
==============================================================================
--- head/devel/phabricator/Makefile Wed May 15 20:46:59 2019 (r501748)
+++ head/devel/phabricator/Makefile Wed May 15 20:53:15 2019 (r501749)
@@ -12,7 +12,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PHP_PKGNAMEPREFIX}libphutil>0:devel/libphutil@${PHP_FLAVOR} \
- arcanist${PHP_PKGNAMESUFFIX}>0:devel/arcanist@${PHP_FLAVOR} \
+ arcanist-lib${PHP_PKGNAMESUFFIX}>0:devel/arcanist-lib@${PHP_FLAVOR} \
git:devel/git
OPTIONS_DEFINE= GD OPCACHE
More information about the svn-ports-head
mailing list