2 files changed, 24 insertions, 86 deletions

diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile
index 8d32e30200e2..613398e9e235 100644
--- a/x11-toolkits/xclasses/Makefile
+++ b/x11-toolkits/xclasses/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	Xclasses-public-${PORTVERSION}.src
 MAINTAINER=	trevor@FreeBSD.org
 
 INSTALLS_SHLIB=	yes
+PLIST=		${WRKDIR}/pkg-plist
 PLIST_SUB=	VERSION="${PORTVERSION}"
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
@@ -31,6 +32,29 @@ post-patch:
 do-build:
 	@cd ${WRKSRC} && ${SH} build all
 
+pre-install:
+	${ECHO_CMD} bin/setenvxc > ${PLIST}
+.for ii in \
+Ddraw XCprogram Xclasses Xclasses_class Xcolors Xdisplay Xshadow Xwindows anim \
+appwindow autotextbox bordergroup button callable card checkbox choice \
+colornamegroup config creater dirview dlist easy_dialog fbutton file_dialog \
+fileinput fontgroup gadget gfx_arrow gfx_autotext gfx_checkbox gfx_command \
+gfx_dir gfx_file gfx_knob gfx_locked gfx_object gfx_text gfx_xpm go_button \
+go_selbutton gpopup graphic group html_gadget htmltextbox image indicator \
+input keyclass lefttext listgroup listview menu message message_tools \
+multilistview mxbutton mxgadget mxknob output popbutton popup rubbergroup \
+ruler scroller selbutton selgadget selknob slider spacegroup text textbox \
+tools treeview types visible xclock
+	${ECHO_CMD} include/Xclasses/${ii}.h >> ${PLIST}
+.endfor
+.for ii in .a .so .so.1 .so.%%VERSION%%
+	${ECHO_CMD} lib/libXclasses${ii} >> ${PLIST}
+.endfor
+	${ECHO_CMD} share/Xclasses/Xclasses >> ${PLIST}
+.for ii in share include
+	${ECHO_CMD} @dirrm ${ii}/Xclasses >> ${PLIST}
+.endfor
+
 do-install:
 	@cd ${WRKSRC} && ${SH} build install
 	@${INSTALL_SCRIPT} ${WRKSRC}/setenvxc ${PREFIX}/bin
diff --git a/x11-toolkits/xclasses/pkg-plist b/x11-toolkits/xclasses/pkg-plist
deleted file mode 100644
index dcd89d7b8a88..000000000000
--- a/x11-toolkits/xclasses/pkg-plist
+++ /dev/null
@@ -1,86 +0,0 @@
-bin/setenvxc
-include/Xclasses/Ddraw.h
-include/Xclasses/XCprogram.h
-include/Xclasses/Xclasses.h
-include/Xclasses/Xclasses_class.h
-include/Xclasses/Xcolors.h
-include/Xclasses/Xdisplay.h
-include/Xclasses/Xshadow.h
-include/Xclasses/Xwindows.h
-include/Xclasses/anim.h
-include/Xclasses/appwindow.h
-include/Xclasses/autotextbox.h
-include/Xclasses/bordergroup.h
-include/Xclasses/button.h
-include/Xclasses/callable.h
-include/Xclasses/card.h
-include/Xclasses/checkbox.h
-include/Xclasses/choice.h
-include/Xclasses/colornamegroup.h
-include/Xclasses/config.h
-include/Xclasses/creater.h
-include/Xclasses/dirview.h
-include/Xclasses/dlist.h
-include/Xclasses/easy_dialog.h
-include/Xclasses/fbutton.h
-include/Xclasses/file_dialog.h
-include/Xclasses/fileinput.h
-include/Xclasses/fontgroup.h
-include/Xclasses/gadget.h
-include/Xclasses/gfx_arrow.h
-include/Xclasses/gfx_autotext.h
-include/Xclasses/gfx_checkbox.h
-include/Xclasses/gfx_command.h
-include/Xclasses/gfx_dir.h
-include/Xclasses/gfx_file.h
-include/Xclasses/gfx_knob.h
-include/Xclasses/gfx_locked.h
-include/Xclasses/gfx_object.h
-include/Xclasses/gfx_text.h
-include/Xclasses/gfx_xpm.h
-include/Xclasses/go_button.h
-include/Xclasses/go_selbutton.h
-include/Xclasses/gpopup.h
-include/Xclasses/graphic.h
-include/Xclasses/group.h
-include/Xclasses/html_gadget.h
-include/Xclasses/htmltextbox.h
-include/Xclasses/image.h
-include/Xclasses/indicator.h
-include/Xclasses/input.h
-include/Xclasses/keyclass.h
-include/Xclasses/lefttext.h
-include/Xclasses/listgroup.h
-include/Xclasses/listview.h
-include/Xclasses/menu.h
-include/Xclasses/message.h
-include/Xclasses/message_tools.h
-include/Xclasses/multilistview.h
-include/Xclasses/mxbutton.h
-include/Xclasses/mxgadget.h
-include/Xclasses/mxknob.h
-include/Xclasses/output.h
-include/Xclasses/popbutton.h
-include/Xclasses/popup.h
-include/Xclasses/rubbergroup.h
-include/Xclasses/ruler.h
-include/Xclasses/scroller.h
-include/Xclasses/selbutton.h
-include/Xclasses/selgadget.h
-include/Xclasses/selknob.h
-include/Xclasses/slider.h
-include/Xclasses/spacegroup.h
-include/Xclasses/text.h
-include/Xclasses/textbox.h
-include/Xclasses/tools.h
-include/Xclasses/treeview.h
-include/Xclasses/types.h
-include/Xclasses/visible.h
-include/Xclasses/xclock.h
-lib/libXclasses.a
-lib/libXclasses.so
-lib/libXclasses.so.1
-lib/libXclasses.so.%%VERSION%%
-share/Xclasses/Xclasses
-@dirrm share/Xclasses
-@dirrm include/Xclasses