2 files changed, 128 insertions, 96 deletions

diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 14151291e1ef..df8ac7e3cefe 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	tix
 PORTVERSION=	8.4.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits tk
 MASTER_SITES=	SF
+DISTNAME=	Tix${DISTVERSION}-src${DISTVERSIONSUFFIX}
 
 MAINTAINER=	doconnor@gsoft.com.au
 COMMENT=	An extension to the Tk toolkit
 
-DISTNAME=	Tix${DISTVERSION}-src${DISTVERSIONSUFFIX}
 WRKSRC=		${WRKDIR}/Tix${DISTVERSION}
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -38,6 +39,8 @@ MANN=		TixIntro.n compound.n pixmap.n tix.n tixBalloon.n \
 		tixScrolledWindow.n tixSelect.n tixStdButtonBox.n tixTList.n \
 		tixTree.n tixUtils.n
 
+TIX_LIB=	libTix${PORTVERSION}.so
+TIX_LIB_FILE=	${TIX_LIB}.0
 .include <bsd.port.pre.mk>
 
 pre-extract:
@@ -60,5 +63,16 @@ post-configure:
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/*.n ${PREFIX}/man/mann/
+	${RM} ${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}
+.for dir in generic unix
+	${MKDIR} ${PREFIX}/include/tix/${dir}
+	${INSTALL_DATA} ${WRKSRC}/${dir}/*.h ${PREFIX}/include/tix/${dir}
+.endfor
+	${LN} -sf ${PREFIX}/include/tix/generic/tix.h ${PREFIX}/include/tix.h
+	${RMDIR} ${PREFIX}/lib/Tix${PORTVERSION}/html
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/tix/pkg-plist b/x11-toolkits/tix/pkg-plist
index d69ebdabe0a7..6d55ff82e285 100644
--- a/x11-toolkits/tix/pkg-plist
+++ b/x11-toolkits/tix/pkg-plist
@@ -1,5 +1,17 @@
-lib/Tix8.4.3/libTix8.4.3.so
-lib/Tix8.4.3/Init.tcl
+include/tix.h
+include/tix/generic/tix.h
+include/tix/generic/tixDef.h
+include/tix/generic/tixForm.h
+include/tix/generic/tixGrData.h
+include/tix/generic/tixGrid.h
+include/tix/generic/tixHList.h
+include/tix/generic/tixImgXpm.h
+include/tix/generic/tixInt.h
+include/tix/generic/tixPort.h
+include/tix/generic/tixTList.h
+include/tix/unix/tixUnixDefault.h
+include/tix/unix/tixUnixInt.h
+include/tix/unix/tixUnixPort.h
 lib/Tix8.4.3/Balloon.tcl
 lib/Tix8.4.3/BtnBox.tcl
 lib/Tix8.4.3/CObjView.tcl
@@ -28,6 +40,7 @@ lib/Tix8.4.3/Grid.tcl
 lib/Tix8.4.3/HList.tcl
 lib/Tix8.4.3/HListDD.tcl
 lib/Tix8.4.3/IconView.tcl
+lib/Tix8.4.3/Init.tcl
 lib/Tix8.4.3/LabEntry.tcl
 lib/Tix8.4.3/LabFrame.tcl
 lib/Tix8.4.3/LabWidg.tcl
@@ -40,11 +53,11 @@ lib/Tix8.4.3/OptMenu.tcl
 lib/Tix8.4.3/PanedWin.tcl
 lib/Tix8.4.3/PopMenu.tcl
 lib/Tix8.4.3/Primitiv.tcl
+lib/Tix8.4.3/README.txt
 lib/Tix8.4.3/ResizeH.tcl
 lib/Tix8.4.3/SGrid.tcl
 lib/Tix8.4.3/SHList.tcl
 lib/Tix8.4.3/SListBox.tcl
-lib/Tix8.4.3/Tix.tcl
 lib/Tix8.4.3/STList.tcl
 lib/Tix8.4.3/SText.tcl
 lib/Tix8.4.3/SWidget.tcl
@@ -57,6 +70,7 @@ lib/Tix8.4.3/StatBar.tcl
 lib/Tix8.4.3/StdBBox.tcl
 lib/Tix8.4.3/StdShell.tcl
 lib/Tix8.4.3/TList.tcl
+lib/Tix8.4.3/Tix.tcl
 lib/Tix8.4.3/Tree.tcl
 lib/Tix8.4.3/Utils.tcl
 lib/Tix8.4.3/VResize.tcl
@@ -64,103 +78,107 @@ lib/Tix8.4.3/VStack.tcl
 lib/Tix8.4.3/VTree.tcl
 lib/Tix8.4.3/Variable.tcl
 lib/Tix8.4.3/WInfo.tcl
-lib/Tix8.4.3/fs.tcl
-lib/Tix8.4.3/pref/10Point.fs
-lib/Tix8.4.3/pref/WmDefault.txt
-lib/Tix8.4.3/pref/WmDefault.tcl
-lib/Tix8.4.3/pref/WmDefault.py
-lib/Tix8.4.3/pref/WmDefault.fsc
-lib/Tix8.4.3/pref/WmDefault.fs
-lib/Tix8.4.3/pref/WmDefault.csc
-lib/Tix8.4.3/pref/WmDefault.cs
-lib/Tix8.4.3/pref/TkWin.fsc
-lib/Tix8.4.3/pref/TkWin.fs
-lib/Tix8.4.3/pref/TkWin.csc
-lib/Tix8.4.3/pref/TkWin.cs
-lib/Tix8.4.3/pref/TixGray.csc
-lib/Tix8.4.3/pref/TixGray.cs
-lib/Tix8.4.3/pref/TK.fsc
-lib/Tix8.4.3/pref/TK.fs
-lib/Tix8.4.3/pref/TK.csc
-lib/Tix8.4.3/pref/TK.cs
-lib/Tix8.4.3/pref/SGIGray.csc
-lib/Tix8.4.3/pref/SGIGray.cs
-lib/Tix8.4.3/pref/Old14Pt.fs
-lib/Tix8.4.3/pref/Old12Pt.fs
-lib/Tix8.4.3/pref/Gray.csc
-lib/Tix8.4.3/pref/Gray.cs
-lib/Tix8.4.3/pref/Blue.csc
-lib/Tix8.4.3/pref/Blue.cs
-lib/Tix8.4.3/pref/Bisque.csc
-lib/Tix8.4.3/pref/Bisque.cs
-lib/Tix8.4.3/pref/14Point.fsc
-lib/Tix8.4.3/pref/14Point.fs
-lib/Tix8.4.3/pref/12Point.fsc
-lib/Tix8.4.3/pref/12Point.fs
-lib/Tix8.4.3/pref/10Point.fsc
-lib/Tix8.4.3/pref/pkgIndex.tcl
 lib/Tix8.4.3/bitmaps/act_fold.gif
-lib/Tix8.4.3/bitmaps/warning.gif
-lib/Tix8.4.3/bitmaps/tick.xbm
-lib/Tix8.4.3/bitmaps/textfile.xpm
-lib/Tix8.4.3/bitmaps/textfile.xbm
-lib/Tix8.4.3/bitmaps/textfile.gif
-lib/Tix8.4.3/bitmaps/system.xbm
-lib/Tix8.4.3/bitmaps/srcfile.xpm
-lib/Tix8.4.3/bitmaps/srcfile.xbm
-lib/Tix8.4.3/bitmaps/srcfile.gif
-lib/Tix8.4.3/bitmaps/restore.xbm
-lib/Tix8.4.3/bitmaps/resize2.xbm
-lib/Tix8.4.3/bitmaps/resize1.xbm
-lib/Tix8.4.3/bitmaps/plusarm.xpm
-lib/Tix8.4.3/bitmaps/plusarm.xbm
-lib/Tix8.4.3/bitmaps/plusarm.gif
-lib/Tix8.4.3/bitmaps/plus.xpm
-lib/Tix8.4.3/bitmaps/plus.xbm
-lib/Tix8.4.3/bitmaps/plus.gif
-lib/Tix8.4.3/bitmaps/openfold.xpm
-lib/Tix8.4.3/bitmaps/openfold.xbm
-lib/Tix8.4.3/bitmaps/openfold.gif
+lib/Tix8.4.3/bitmaps/act_fold.xbm
+lib/Tix8.4.3/bitmaps/act_fold.xpm
+lib/Tix8.4.3/bitmaps/balarrow.xbm
+lib/Tix8.4.3/bitmaps/cbxarrow.xbm
+lib/Tix8.4.3/bitmaps/ck_def.xbm
+lib/Tix8.4.3/bitmaps/ck_off.xbm
+lib/Tix8.4.3/bitmaps/ck_on.xbm
+lib/Tix8.4.3/bitmaps/cross.xbm
+lib/Tix8.4.3/bitmaps/decr.xbm
+lib/Tix8.4.3/bitmaps/drop.xbm
+lib/Tix8.4.3/bitmaps/file.gif
+lib/Tix8.4.3/bitmaps/file.xbm
+lib/Tix8.4.3/bitmaps/file.xpm
+lib/Tix8.4.3/bitmaps/folder.gif
+lib/Tix8.4.3/bitmaps/folder.xbm
+lib/Tix8.4.3/bitmaps/folder.xpm
+lib/Tix8.4.3/bitmaps/harddisk.xbm
+lib/Tix8.4.3/bitmaps/hourglas.mask
+lib/Tix8.4.3/bitmaps/hourglas.xbm
+lib/Tix8.4.3/bitmaps/incr.xbm
+lib/Tix8.4.3/bitmaps/info.gif
+lib/Tix8.4.3/bitmaps/info.xpm
+lib/Tix8.4.3/bitmaps/maximize.xbm
+lib/Tix8.4.3/bitmaps/minimize.xbm
+lib/Tix8.4.3/bitmaps/minus.gif
+lib/Tix8.4.3/bitmaps/minus.xbm
+lib/Tix8.4.3/bitmaps/minus.xpm
+lib/Tix8.4.3/bitmaps/minusarm.gif
+lib/Tix8.4.3/bitmaps/minusarm.xbm
+lib/Tix8.4.3/bitmaps/minusarm.xpm
+lib/Tix8.4.3/bitmaps/mktransgif.tcl
 lib/Tix8.4.3/bitmaps/network.xbm
-lib/Tix8.4.3/bitmaps/openfile.xbm
-lib/Tix8.4.3/bitmaps/no_entry.xpm
 lib/Tix8.4.3/bitmaps/no_entry.gif
-lib/Tix8.4.3/bitmaps/mktransgif.tcl
-lib/Tix8.4.3/bitmaps/minusarm.xpm
-lib/Tix8.4.3/bitmaps/minusarm.xbm
-lib/Tix8.4.3/bitmaps/minusarm.gif
-lib/Tix8.4.3/bitmaps/minus.xpm
-lib/Tix8.4.3/bitmaps/minus.xbm
-lib/Tix8.4.3/bitmaps/minus.gif
-lib/Tix8.4.3/bitmaps/minimize.xbm
-lib/Tix8.4.3/bitmaps/maximize.xbm
-lib/Tix8.4.3/bitmaps/info.xpm
-lib/Tix8.4.3/bitmaps/info.gif
-lib/Tix8.4.3/bitmaps/incr.xbm
-lib/Tix8.4.3/bitmaps/hourglas.xbm
-lib/Tix8.4.3/bitmaps/hourglas.mask
-lib/Tix8.4.3/bitmaps/harddisk.xbm
-lib/Tix8.4.3/bitmaps/folder.xpm
-lib/Tix8.4.3/bitmaps/folder.xbm
-lib/Tix8.4.3/bitmaps/folder.gif
-lib/Tix8.4.3/bitmaps/file.xpm
-lib/Tix8.4.3/bitmaps/file.xbm
-lib/Tix8.4.3/bitmaps/file.gif
-lib/Tix8.4.3/bitmaps/drop.xbm
-lib/Tix8.4.3/bitmaps/decr.xbm
-lib/Tix8.4.3/bitmaps/cross.xbm
-lib/Tix8.4.3/bitmaps/ck_on.xbm
-lib/Tix8.4.3/bitmaps/ck_off.xbm
-lib/Tix8.4.3/bitmaps/ck_def.xbm
-lib/Tix8.4.3/bitmaps/cbxarrow.xbm
-lib/Tix8.4.3/bitmaps/balarrow.xbm
-lib/Tix8.4.3/bitmaps/act_fold.xpm
-lib/Tix8.4.3/bitmaps/act_fold.xbm
+lib/Tix8.4.3/bitmaps/no_entry.xpm
+lib/Tix8.4.3/bitmaps/openfile.xbm
+lib/Tix8.4.3/bitmaps/openfold.gif
+lib/Tix8.4.3/bitmaps/openfold.xbm
+lib/Tix8.4.3/bitmaps/openfold.xpm
+lib/Tix8.4.3/bitmaps/plus.gif
+lib/Tix8.4.3/bitmaps/plus.xbm
+lib/Tix8.4.3/bitmaps/plus.xpm
+lib/Tix8.4.3/bitmaps/plusarm.gif
+lib/Tix8.4.3/bitmaps/plusarm.xbm
+lib/Tix8.4.3/bitmaps/plusarm.xpm
+lib/Tix8.4.3/bitmaps/resize1.xbm
+lib/Tix8.4.3/bitmaps/resize2.xbm
+lib/Tix8.4.3/bitmaps/restore.xbm
+lib/Tix8.4.3/bitmaps/srcfile.gif
+lib/Tix8.4.3/bitmaps/srcfile.xbm
+lib/Tix8.4.3/bitmaps/srcfile.xpm
+lib/Tix8.4.3/bitmaps/system.xbm
+lib/Tix8.4.3/bitmaps/textfile.gif
+lib/Tix8.4.3/bitmaps/textfile.xbm
+lib/Tix8.4.3/bitmaps/textfile.xpm
+lib/Tix8.4.3/bitmaps/tick.xbm
+lib/Tix8.4.3/bitmaps/warning.gif
 lib/Tix8.4.3/bitmaps/warning.xpm
-lib/Tix8.4.3/pkgIndex.tcl
+lib/Tix8.4.3/fs.tcl
+lib/Tix8.4.3/libTix8.4.3.so
 lib/Tix8.4.3/license.terms
-lib/Tix8.4.3/README.txt
+lib/Tix8.4.3/pkgIndex.tcl
+lib/Tix8.4.3/pref/10Point.fs
+lib/Tix8.4.3/pref/10Point.fsc
+lib/Tix8.4.3/pref/12Point.fs
+lib/Tix8.4.3/pref/12Point.fsc
+lib/Tix8.4.3/pref/14Point.fs
+lib/Tix8.4.3/pref/14Point.fsc
+lib/Tix8.4.3/pref/Bisque.cs
+lib/Tix8.4.3/pref/Bisque.csc
+lib/Tix8.4.3/pref/Blue.cs
+lib/Tix8.4.3/pref/Blue.csc
+lib/Tix8.4.3/pref/Gray.cs
+lib/Tix8.4.3/pref/Gray.csc
+lib/Tix8.4.3/pref/Old12Pt.fs
+lib/Tix8.4.3/pref/Old14Pt.fs
+lib/Tix8.4.3/pref/SGIGray.cs
+lib/Tix8.4.3/pref/SGIGray.csc
+lib/Tix8.4.3/pref/TK.cs
+lib/Tix8.4.3/pref/TK.csc
+lib/Tix8.4.3/pref/TK.fs
+lib/Tix8.4.3/pref/TK.fsc
+lib/Tix8.4.3/pref/TixGray.cs
+lib/Tix8.4.3/pref/TixGray.csc
+lib/Tix8.4.3/pref/TkWin.cs
+lib/Tix8.4.3/pref/TkWin.csc
+lib/Tix8.4.3/pref/TkWin.fs
+lib/Tix8.4.3/pref/TkWin.fsc
+lib/Tix8.4.3/pref/WmDefault.cs
+lib/Tix8.4.3/pref/WmDefault.csc
+lib/Tix8.4.3/pref/WmDefault.fs
+lib/Tix8.4.3/pref/WmDefault.fsc
+lib/Tix8.4.3/pref/WmDefault.py
+lib/Tix8.4.3/pref/WmDefault.tcl
+lib/Tix8.4.3/pref/WmDefault.txt
+lib/Tix8.4.3/pref/pkgIndex.tcl
+lib/libTix8.4.3.so
+lib/libTix8.4.3.so.0
 @dirrm lib/Tix8.4.3/bitmaps
 @dirrm lib/Tix8.4.3/pref
-@dirrm lib/Tix8.4.3/html
 @dirrm lib/Tix8.4.3
+@dirrm include/tix/unix
+@dirrm include/tix/generic
+@dirrm include/tix