Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Oct 2019 17:26:39 +0000 (UTC)
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r513974 - head/devel/gperf31
Message-ID:  <201910071726.x97HQdZ4078852@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lwhsu
Date: Mon Oct  7 17:26:38 2019
New Revision: 513974
URL: https://svnweb.freebsd.org/changeset/ports/513974

Log:
  Install as bin/gperf31 to prevent conflict with devel/gperf
  
  PR:		241025
  Submitted by:	dinoex
  Reported by:	Martin Birgmeier <d8zNeCFG@aon.at>

Modified:
  head/devel/gperf31/Makefile
  head/devel/gperf31/pkg-plist

Modified: head/devel/gperf31/Makefile
==============================================================================
--- head/devel/gperf31/Makefile	Mon Oct  7 17:19:45 2019	(r513973)
+++ head/devel/gperf31/Makefile	Mon Oct  7 17:26:38 2019	(r513974)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gperf
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	31
@@ -12,12 +13,20 @@ COMMENT=	Generates perfect hash functions for sets of 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	ace+tao-[0-9]* gperf-*
+CONFLICTS=	ace+tao-[0-9]*
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
 INFO=		gperf
 TEST_TARGET=	check
+
+post-install:
+	${MV} ${STAGEDIR}/${PREFIX}/bin/gperf \
+		${STAGEDIR}/${PREFIX}/bin/gperf31
+	${MV} ${STAGEDIR}/${PREFIX}/man/man1/gperf.1 \
+		${STAGEDIR}/${PREFIX}/man/man1/gperf31.1
+	${MV} ${STAGEDIR}/${DOCSDIR}/gperf.html \
+		${STAGEDIR}/${DOCSDIR}/gperf31.html
 
 .include <bsd.port.mk>

Modified: head/devel/gperf31/pkg-plist
==============================================================================
--- head/devel/gperf31/pkg-plist	Mon Oct  7 17:19:45 2019	(r513973)
+++ head/devel/gperf31/pkg-plist	Mon Oct  7 17:26:38 2019	(r513974)
@@ -1,3 +1,3 @@
-bin/gperf
-man/man1/gperf.1.gz
-%%DOCSDIR%%/gperf.html
+bin/gperf31
+man/man1/gperf31.1.gz
+%%DOCSDIR%%/gperf31.html



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910071726.x97HQdZ4078852>