From 73d9d49a1084350098f4e8d0659879fd6c6cc3e5 Mon Sep 17 00:00:00 2001
From: Michael Reifenberger <mr@FreeBSD.org>
Date: Tue, 27 Oct 2009 09:41:51 +0000
Subject: Try to catch some left over files and dirs.

---
 cad/kicad-devel/Makefile  | 12 +++++++++++-
 cad/kicad-devel/pkg-plist |  6 ++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 12691d599e38..a58c2535c5a4 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -88,6 +88,9 @@ ki:
 	svn export \
 		http://svn.openmoko.org/trunk/gta02-core/kicad-patches ${WRKDIR}/kicad-patches
 
+tmp:
+	echo "${DATADIR} ${DATADIR:H}"
+
 post-configure:
 	${REINPLACE_CMD} -e 's|#define HAVE_ISO646_H|//#define HAVE_ISO646_H|'     \
 		${WRKSRC}/config.h
@@ -134,7 +137,11 @@ PLIST_FILE_LIST=	bin/freeroute.jnlp \
 			share/applications/kicad.desktop \
 			share/applications/eeschema.desktop
 			
-PLIST_DIR_LIST=	
+PLIST_DIR_LIST=		lib/kicad	
+
+PLIST_SHAREDDIR_LIST=	share/applications \
+			share/mimelnk/application \
+			share/mimelnk
 
 build-plist:
 	${RM} -f ${PLIST}
@@ -147,6 +154,9 @@ build-plist:
 	cd ${PREFIX} && \
 		${FIND} ${PLIST_DIR_LIST} -type d | \
 		${SORT} -r | ${SED} -e 's|^|@dirrm |' >> ${PLIST}
+.for subdir in ${PLIST_SHAREDDIR_LIST}
+	@${ECHO_CMD} '@unexec ${RMDIR} %D/${subdir} 2> /dev/null || true' >> ${PLIST}
+.endfor
 	${FIND} ${DATADIR} ${DOCSDIR} -type d | ${SORT} -r | \
 		${SED} -e 's|${DATADIR}|%%DATADIR%%|' \
 			-e 's|${DOCSDIR}|%%DOCSDIR%%|' \
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 7fb0574444c2..77910580fec8 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -5,6 +5,7 @@ bin/gerbview
 bin/kicad
 bin/minizip
 bin/pcbnew
+lib/kicad/plugins/netlist_form_pads-pcb
 share/applications/eeschema.desktop
 share/applications/kicad.desktop
 share/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png
@@ -1358,6 +1359,11 @@ share/mimelnk/application/x-kicad-schematic.desktop
 %%DOCSDIR%%/scripts/pcb-dr-adjust/pcb-dr-adjust.cfg
 %%DOCSDIR%%/scripts/pcb-dr-adjust/pcb-dr-adjust.pl
 %%DOCSDIR%%/scripts/setfont.sh
+@dirrm lib/kicad/plugins
+@dirrm lib/kicad
+@unexec /bin/rmdir %D/share/applications 2> /dev/null || true
+@unexec /bin/rmdir %D/share/mimelnk/application 2> /dev/null || true
+@unexec /bin/rmdir %D/share/mimelnk 2> /dev/null || true
 @dirrm %%DATADIR%%/template
 @dirrm %%DATADIR%%/modules/packages3d/valves
 @dirrm %%DATADIR%%/modules/packages3d/support
-- 
cgit