ports/148223: [PATHC] editors/hte ability to install as hte instead of ht

[Aldis Berjoza]

>Number:         148223
>Category:       ports
>Synopsis:       [PATHC] editors/hte ability to install as hte instead of ht
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 28 22:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Aldis Berjoza
>Release:        
>Organization:
>Environment:
>Description:
the name of executable ht conflicts with ht from texlive
http://code.google.com/p/freebsd-texlive/issues/detail?id=5

as workaround I purpose to add option to be able to install ht editor as hte
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.old	2010-06-29 01:28:50.413177928 +0300
+++ Makefile	2010-06-29 01:35:26.090299652 +0300
@@ -8,6 +8,7 @@
 
 PORTNAME=	hte
 PORTVERSION=	2.0.18
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/ht-source
 DISTNAME=	ht-${PORTVERSION}
@@ -18,9 +19,8 @@
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/ht
-
-OPTIONS=	LZO2	"Enable external lzo2 compresssion support"	off
+OPTIONS=	LZO2	"Enable external lzo2 compresssion support"	off \
+		HTE	"Install as hte instead of ht"	off
 
 .include <bsd.port.pre.mk>
 
@@ -28,6 +28,18 @@
 BROKEN=	Does not build on ia64
 .endif
 
+.if defined(WITH_HTE)
+INSTALL_NAME=   hte
+.else
+INSTALL_NAME=   ht
+# ht conflicts with ht (from Texlive-core) from FreeBSD TeXLive project
+#   which currently isn't in default ports tree [yet]
+#   http://code.google.com/p/freebsd-texlive/issues/detail?id=5
+CONFLICTS+=	print/Textlive-core
+.endif
+
+PLIST_FILES=	bin/${INSTALL_NAME}
+
 .if defined(WITH_LZO2)
 LIB_DEPENDS+=	lzo2.2:${PORTSDIR}/archivers/lzo2
 .else
@@ -53,7 +65,7 @@
 			${WRKSRC}/configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ht ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/ht ${PREFIX}/bin/${INSTALL_NAME}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}


>Release-Note:
>Audit-Trail:
>Unformatted: