- STAGE-clean

- Respect PREFIX

PR:		186302
Submitted by:	gahr
Approved by:	maintainer (timeout)

1 files changed, 27 insertions, 47 deletions

diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index ac5901c58a2f..910483ba6c49 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -11,47 +11,26 @@ DISTNAME=	tclx${PORTVERSION}
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Extended TCL
 
+LICENSE=	TclTk
+LICENSE_NAME=	Tcl/Tk License
+LICENSE_FILE=	${WRKSRC}/license.terms
+LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
+
 USE_BZIP2=	yes
-USE_TCL=	84+
 
+USES=		tcl
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${TCL_INCLUDEDIR}/unix\
 		-I${TCL_INCLUDEDIR}/generic
-CONFIGURE_ARGS=	--enable-shared \
+CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
+		--enable-shared \
 		--with-help=Help \
 		--with-tcl="${TCL_LIBDIR}"
 PLIST_SUB=	TCLX_VER=${PORTVERSION}
 ALL_TARGET=	binaries libraries
 INSTALL_TARGET=	install-binaries install-libraries
 
-NO_STAGE=	yes
-#check test regression-check:
-#	#
-#	# Define TCLX_NO_SELF_TESTS to disable automatic
-#	# running of TclX' checks after building
-#	#
-#	${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} test
-
-#.ifndef TCLX_NO_SELF_TESTS
-#post-build:	test
-#.endif
-
-MAN3=	CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3
-MANN=	TclX.n
-
-MLINKS=	CmdWrite.3	TclCommandWriting.3	\
-	Keylist.3	TclX_NewKeyedListObj.3
-.for l in Delete Get GetKeys Set TclX_Main TclX_NewKeyedListObj
-MLINKS+=	Keylist.3	TclX_KeyedList$l.3
-.endfor
-.for l in Alloc Free TblInit TblRelease TblUseCount Walk Xlate
-MLINKS+=	Handles.3	TclX_Handle$l.3
-.endfor
-.for l in Tclxcmd_Init TclX_Main Tkx_Init TkX_Main
-MLINKS+=	TclXInit.3	$l.3
-.endfor
-
 .include <bsd.port.pre.mk>
 
 .if ${TCL_VER} > 8.4
@@ -61,14 +40,6 @@ PLIST_SUB+=	BELOW_85='@comment '
 PLIST_SUB+=	BELOW_85=''
 .endif
 
-pre-configure:
-.if exists(${TCL_LIBDIR}/tclConfig-threads.sh)
-	${REINPLACE_CMD} -e 's|tclConfig.sh|tclConfig-threads.sh|'	\
-		${WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
-	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'	\
-		${WRKSRC}/${CONFIGURE_SCRIPT}
-
 post-configure:
 	${REINPLACE_CMD} -e	\
 	    's,^TCLSH_PROG.*,TCLSH_PROG=${TCLSH},' \
@@ -76,15 +47,24 @@ post-configure:
 	# Disabling the failing help.test
 	${MV} ${WRKSRC}/tests/help.test ${WRKSRC}/tests/help.test.dis
 
-pre-su-install:
-	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN3} ${PREFIX}/man/man3
-	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANN} ${PREFIX}/man/mann
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/doc/TclX.n ${STAGEDIR}${PREFIX}/man/mann
+.for l in CmdWrite Handles Keylist ObjCmdWrite TclXInit
+	${INSTALL_DATA} ${WRKSRC}/doc/${l}.3 ${STAGEDIR}${PREFIX}/man/man3
+.endfor
+	${LN} -s CmdWrite.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclCommandWriting.3.gz
+	${LN} -s KeyList.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclX_NewKeyedListObj.3.gz
+.for l in Delete Get GetKeys Set TclX_Main TclX_NewKeyedListObj
+	${LN} -s KeyList.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclX_KeyedList${l}.3.gz
+.endfor
+.for l in Alloc Free TblInit TblRelease TblUseCount Walk Xlate
+	${LN} -s Handles.3.gz ${STAGEDIR}${PREFIX}/man/man3/TclX_Handle${l}.3.gz
+.endfor
+.for l in Tclxcmd_Init TclX_Main Tkx_Init TkX_Main
+	${LN} -s TclXInit.3.gz ${STAGEDIR}${PREFIX}/man/man3/${l}.3.gz
+.endfor
+
+regression-test: build
+	${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} test
 
 .include <bsd.port.post.mk>
-
-.ifndef(NOPORTDOCS) && exists(${MANPREFIX}/man/mann/Tcl.n.gz)
-ALL_TARGET+=	doc
-INSTALL_TARGET+=install-help
-.else
-PLIST_SUB:=	${PLIST_SUB:NPORTDOCS=*} PORTDOCS='@comment '
-.endif