svn commit: r511421 - in head/sysutils: backuppc backuppc-devel

Matthias Andree mandree at FreeBSD.org
Sat Sep 7 20:42:50 UTC 2019


Author: mandree
Date: Sat Sep  7 20:42:49 2019
New Revision: 511421
URL: https://svnweb.freebsd.org/changeset/ports/511421

Log:
  Allow building backuppc* ports together.
  
  Reduces CONFLICTS to CONFLICTS_INSTALL.
  
  While here, move USES up to reduce portlint warnings.
  
  PR:		232775
  Submitted by:	Alexander Moisseev (maintainer)

Modified:
  head/sysutils/backuppc-devel/Makefile
  head/sysutils/backuppc/Makefile

Modified: head/sysutils/backuppc-devel/Makefile
==============================================================================
--- head/sysutils/backuppc-devel/Makefile	Sat Sep  7 20:36:41 2019	(r511420)
+++ head/sysutils/backuppc-devel/Makefile	Sat Sep  7 20:42:49 2019	(r511421)
@@ -18,13 +18,14 @@ RUN_DEPENDS=	p5-CGI>0:www/p5-CGI \
 		p5-File-Listing>=0:sysutils/p5-File-Listing \
 		p5-BackupPC-XS>=0.57:sysutils/p5-BackupPC-XS
 
+USES=		perl5
+
 .if defined(QEMU_EMULATING) && "${QEMU_EMULATING}" == "1"
 BROKEN=		fails to build under qemu: uncaught target signal 11 (Segmetation fault) - core dumped
 .endif
 
-CONFLICTS=	backuppc backuppc4
+CONFLICTS_INSTALL=	backuppc backuppc4
 
-USES=		perl5
 USE_GITHUB=	yes
 GH_TAGNAME=	3990160
 USE_PERL5=	extract

Modified: head/sysutils/backuppc/Makefile
==============================================================================
--- head/sysutils/backuppc/Makefile	Sat Sep  7 20:36:41 2019	(r511420)
+++ head/sysutils/backuppc/Makefile	Sat Sep  7 20:42:49 2019	(r511421)
@@ -18,11 +18,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	p5-CGI>0:www/p5-CGI \
 		p5-File-Listing>=0:sysutils/p5-File-Listing
 
-CONFLICTS=	backuppc-devel-[0-9]*
+USES=		cpe perl5
 
-USE_RC_SUBR=	backuppc
+CONFLICTS_INSTALL=	backuppc4 backuppc-devel
 
-USES=		cpe perl5
+USE_RC_SUBR=	backuppc
 CPE_VENDOR=	craig_barratt
 NO_ARCH=	yes
 NO_BUILD=	yes


More information about the svn-ports-all mailing list