ports/54323: Update port: editors/hte

[KATO Tsuguru]

>Number:         54323
>Category:       ports
>Synopsis:       Update port: editors/hte
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 10 07:20:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Add WITHOUT_X11 knob

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/editors/hte/Makefile editors/hte/Makefile
--- /usr/ports/editors/hte/Makefile	Sun Jul  6 20:39:43 2003
+++ editors/hte/Makefile	Mon Jul  7 20:21:44 2003
@@ -17,13 +17,11 @@
 COMMENT=	A file editor/viewer/analyzer for executables
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-release
-CONFIGURE_ENV=	CPPFLAGS+="-I${X11BASE}/include" \
-		LIBS+="-L${X11BASE}/lib"
 
 .include <bsd.port.pre.mk>
 
@@ -31,9 +29,18 @@
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
 .endif
 
+.if defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-nox11
+CONFIGURE_ARGS+=	--disable-x11-textmode
+.else
+USE_XLIB=	yes
+CPPFLAGS=	-I${X11BASE}/include
+LDFLAGS=	-L${X11BASE}/lib
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|$$FLAGS_PIPE $$FLAGS_ALL|$$CFLAGS|g' \
+	@${REINPLACE_CMD} -e 's|$$FLAGS_PIPE $$FLAGS_ALL|$$CFLAGS|g ; \
+		 s|-L/usr/X11/lib -L/usr/X11R6/lib|$$LDFLAGS|g' \
 			${WRKSRC}/configure
 
 post-install:
>Release-Note:
>Audit-Trail:
>Unformatted: