From fb1782653240a3eac709e8315e7f7789038897ec Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@FreeBSD.org>
Date: Thu, 20 Oct 2005 13:10:28 +0000
Subject: [PATCH] Add the DISPLAY_PROGRAM_PREFIX knob to install display(1)
 under a different name, avoiding conflicts with ImageMagick and other ports.
 Bump PORTREVISION.

---
 misc/display/Makefile | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/misc/display/Makefile b/misc/display/Makefile
index 8c33e0352364..5d9637711156 100644
--- a/misc/display/Makefile
+++ b/misc/display/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	display
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.ipsmart.com/src/
 EXTRACT_SUFX=	.tgz
@@ -15,15 +15,26 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Runs command repeatedly; shows output
 
-CONFLICTS=	ImageMagick-[0-9]* goblin-*
-
 GNU_CONFIGURE=	yes
 
-MAN1=		display.1
-PLIST_FILES=	bin/display
+DISPLAY_PROGRAM_PREFIX?=
+
+.if empty(DISPLAY_PROGRAM_PREFIX)
+pre-everything::
+		@${ECHO_MSG} "NOTE: You may set DISPLAY_PROGRAM_PREFIX to change the name of the 'display'"
+		@${ECHO_MSG} "utility so that it does not conflict with similarly named files from"
+		@${ECHO_MSG} "the ImageMagick and goblin ports."
+
+CONFLICTS=	ImageMagick-[0-9]* goblin-*
+.endif
+
+CONFIGURE_ARGS+=	--program-prefix=${DISPLAY_PROGRAM_PREFIX}
+
+MAN1=		${DISPLAY_PROGRAM_PREFIX}display.1
+PLIST_FILES=	bin/${DISPLAY_PROGRAM_PREFIX}display
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/display ${PREFIX}/bin/display
-	${INSTALL_MAN} ${WRKSRC}/display.man ${MANPREFIX}/man/man1/display.1
+	${INSTALL_PROGRAM} ${WRKSRC}/display ${PREFIX}/bin/${DISPLAY_PROGRAM_PREFIX}display
+	${INSTALL_MAN} ${WRKSRC}/display.man ${MANPREFIX}/man/man1/${DISPLAY_PROGRAM_PREFIX}display.1
 
 .include <bsd.port.mk>