2 files changed, 55 insertions, 25 deletions

diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 0a1d71ccbd05..7294b1927f05 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -14,7 +14,7 @@ COMMENT=	An extension to the Tk toolkit
 WRKSRC=		${WRKDIR}/Tix${DISTVERSION}
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_TK=		84+
+USES=		tk
 CONFIGURE_ARGS=	--enable-shared --enable-sam \
 		--with-tclconfig="${TCL_LIBDIR}" \
 		--with-tkconfig="${TK_LIBDIR}" \
@@ -24,23 +24,9 @@ CONFIGURE_ARGS=	--enable-shared --enable-sam \
 		--exec-prefix=${PREFIX}
 # this should probably be added to bsd.port.mk
 CONFIGURE_ENV=	PREFIX=${PREFIX}
-MANN=		TixIntro.n compound.n pixmap.n tix.n tixBalloon.n \
-		tixButtonBox.n tixCheckList.n tixComboBox.n tixControl.n \
-		tixDestroy.n tixDirList.n tixDirSelectDialog.n tixDirTree.n \
-		tixDisplayStyle.n tixExFileSelectBox.n tixExFileSelectDialog.n \
-		tixFileEntry.n tixFileSelectBox.n tixFileSelectDialog.n \
-		tixForm.n tixGetBoolean.n tixGetInt.n tixGrid.n tixHList.n \
-		tixInputOnly.n tixLabelEntry.n tixLabelFrame.n \
-		tixListNoteBook.n tixMeter.n tixMwm.n tixNBFrame.n \
-		tixNoteBook.n tixOptionMenu.n tixPanedWindow.n tixPopupMenu.n \
-		tixScrolledHList.n tixScrolledListBox.n tixScrolledText.n \
-		tixScrolledWindow.n tixSelect.n tixStdButtonBox.n tixTList.n \
-		tixTree.n tixUtils.n
 
 TIX_LIB=	libTix${PORTVERSION}.so
 TIX_LIB_FILE=	${TIX_LIB}.0
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 
 pre-extract:
 	@${MAKE} clean
@@ -61,17 +47,17 @@ post-configure:
 	${WRKSRC}/Makefile
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/man/*.n ${PREFIX}/man/mann/
-	${RM} ${PREFIX}/lib/Tix${PORTVERSION}/${TIX_LIB}
+	${INSTALL_MAN} ${WRKSRC}/man/*.n ${STAGEDIR}${PREFIX}/man/mann/
+	${RM} ${STAGEDIR}${PREFIX}/lib/Tix${PORTVERSION}/${TIX_LIB}
 	${CP} -p ${WRKSRC}/${TIX_LIB} ${WRKSRC}/${TIX_LIB_FILE}
-	${INSTALL_LIB} ${WRKSRC}/${TIX_LIB_FILE} ${PREFIX}/lib
-	${LN} -fs ${PREFIX}/lib/${TIX_LIB_FILE} ${PREFIX}/lib/${TIX_LIB}
-	${LN} -fs ${PREFIX}/lib/${TIX_LIB_FILE} ${PREFIX}/lib/Tix${PORTVERSION}/${TIX_LIB}
+	${INSTALL_LIB} ${WRKSRC}/${TIX_LIB_FILE} ${STAGEDIR}${PREFIX}/lib
+	${LN} -fs ${PREFIX}/lib/${TIX_LIB_FILE} ${STAGEDIR}${PREFIX}/lib/${TIX_LIB}
+	${LN} -fs ${PREFIX}/lib/${TIX_LIB_FILE} ${STAGEDIR}${PREFIX}/lib/Tix${PORTVERSION}/${TIX_LIB}
 .for dir in generic unix
-	${MKDIR} ${PREFIX}/include/tix/${dir}
-	${INSTALL_DATA} ${WRKSRC}/${dir}/*.h ${PREFIX}/include/tix/${dir}
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/tix/${dir}
+	${INSTALL_DATA} ${WRKSRC}/${dir}/*.h ${STAGEDIR}${PREFIX}/include/tix/${dir}
 .endfor
-	${LN} -sf ${PREFIX}/include/tix/generic/tix.h ${PREFIX}/include/tix.h
-	${RMDIR} ${PREFIX}/lib/Tix${PORTVERSION}/html
+	${LN} -sf ${PREFIX}/include/tix/generic/tix.h ${STAGEDIR}${PREFIX}/include/tix.h
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/Tix${PORTVERSION}/html
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/tix/pkg-plist b/x11-toolkits/tix/pkg-plist
index 6d55ff82e285..7f9144692379 100644
--- a/x11-toolkits/tix/pkg-plist
+++ b/x11-toolkits/tix/pkg-plist
@@ -12,6 +12,50 @@ include/tix/generic/tixTList.h
 include/tix/unix/tixUnixDefault.h
 include/tix/unix/tixUnixInt.h
 include/tix/unix/tixUnixPort.h
+man/mann/TixIntro.n.gz
+man/mann/compound.n.gz
+man/mann/pixmap.n.gz
+man/mann/tix.n.gz
+man/mann/tixBalloon.n.gz
+man/mann/tixButtonBox.n.gz
+man/mann/tixCheckList.n.gz
+man/mann/tixComboBox.n.gz
+man/mann/tixControl.n.gz
+man/mann/tixDestroy.n.gz
+man/mann/tixDirList.n.gz
+man/mann/tixDirSelectDialog.n.gz
+man/mann/tixDirTree.n.gz
+man/mann/tixDisplayStyle.n.gz
+man/mann/tixExFileSelectBox.n.gz
+man/mann/tixExFileSelectDialog.n.gz
+man/mann/tixFileEntry.n.gz
+man/mann/tixFileSelectBox.n.gz
+man/mann/tixFileSelectDialog.n.gz
+man/mann/tixForm.n.gz
+man/mann/tixGetBoolean.n.gz
+man/mann/tixGetInt.n.gz
+man/mann/tixGrid.n.gz
+man/mann/tixHList.n.gz
+man/mann/tixInputOnly.n.gz
+man/mann/tixLabelEntry.n.gz
+man/mann/tixLabelFrame.n.gz
+man/mann/tixListNoteBook.n.gz
+man/mann/tixMeter.n.gz
+man/mann/tixMwm.n.gz
+man/mann/tixNBFrame.n.gz
+man/mann/tixNoteBook.n.gz
+man/mann/tixOptionMenu.n.gz
+man/mann/tixPanedWindow.n.gz
+man/mann/tixPopupMenu.n.gz
+man/mann/tixScrolledHList.n.gz
+man/mann/tixScrolledListBox.n.gz
+man/mann/tixScrolledText.n.gz
+man/mann/tixScrolledWindow.n.gz
+man/mann/tixSelect.n.gz
+man/mann/tixStdButtonBox.n.gz
+man/mann/tixTList.n.gz
+man/mann/tixTree.n.gz
+man/mann/tixUtils.n.gz
 lib/Tix8.4.3/Balloon.tcl
 lib/Tix8.4.3/BtnBox.tcl
 lib/Tix8.4.3/CObjView.tcl