2 files changed, 21 insertions, 20 deletions

diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 5f9f31e58dd0..fcbcffc4c732 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -27,40 +27,29 @@ MAN3=	cdk_alphalist.3 cdk_binding.3 cdk_buttonbox.3 cdk_calendar.3 cdk_cdk.3 \
 	cdk_template.3 cdk_viewer.3
 
 do-install:
+	@ ${INSTALL_DATA} ${WRKSRC}/libcdk.a ${PREFIX}/lib
 	@ ${INSTALL_DATA} ${WRKSRC}/libcdk.so.1 ${PREFIX}/lib
 	@ ${LN} -fs ${PREFIX}/lib/libcdk.so.1 ${PREFIX}/lib/libcdk.so
-	@ ${INSTALL_DATA} ${WRKSRC}/cdk.h ${PREFIX}/include
 	@ ${MKDIR} ${PREFIX}/include/cdk
-	@ ${INSTALL_DATA} ${WRKSRC}/cdk/* ${PREFIX}/include/cdk
+	@ ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/cdk
 .for file in ${MAN3}
 	@ ${INSTALL_MAN} ${WRKSRC}/man/${file} ${PREFIX}/man/man3
 .endfor
 	@ ${MKDIR} ${PREFIX}/share/examples/cdk
-	@ ${INSTALL_DATA} ${WRKSRC}/exam/*.c ${PREFIX}/share/examples/cdk
-	@ ${INSTALL_DATA} ${WRKSRC}/exam/examples.make ${PREFIX}/share/examples/cdk/Makefile
-	@ ${MKDIR} ${PREFIX}/share/examples/cdk/demo
-	@ ${INSTALL_DATA} ${WRKSRC}/demo/rolodex.h ${PREFIX}/share/examples/cdk/demo
-	@ ${INSTALL_DATA} ${WRKSRC}/demo/*.c ${PREFIX}/share/examples/cdk/demo
-	@ ${INSTALL_DATA} ${WRKSRC}/demo/demos.make ${PREFIX}/share/examples/cdk/demo/Makefile
-	@ ${MKDIR} ${PREFIX}/share/examples/cdk/cli
-	@ ${INSTALL_DATA} ${WRKSRC}/cli/*.c ${PREFIX}/share/examples/cdk/cli
-	@ ${INSTALL_DATA} ${WRKSRC}/cli/cli.make ${PREFIX}/share/examples/cdk/cli/Makefile
-	@ ${MKDIR} ${PREFIX}/share/examples/cdk/cli/samples
-	@ ${INSTALL_DATA} ${WRKSRC}/cli/samples/* ${PREFIX}/share/examples/cdk/cli/samples
-	@ ${MKDIR} ${PREFIX}/share/examples/cdk/cli/utils
-	@ ${INSTALL_DATA} ${WRKSRC}/cli/utils/* ${PREFIX}/share/examples/cdk/cli/utils
-	@ ${LDCONFIG} -m ${PREFIX}/lib
+	@ ${INSTALL_DATA} ${WRKSRC}/examples/*.c ${PREFIX}/share/examples/cdk
+	@ ${INSTALL_DATA} ${WRKSRC}/examples/Makefile ${PREFIX}/share/examples/cdk
+	@ ${MKDIR} ${PREFIX}/share/examples/cdk/demos
+	@ ${INSTALL_DATA} ${WRKSRC}/demos/rolodex.h ${PREFIX}/share/examples/cdk/demos
+	@ ${INSTALL_DATA} ${WRKSRC}/demos/*.c ${PREFIX}/share/examples/cdk/demos
+	@ ${INSTALL_DATA} ${WRKSRC}/demos/Makefile ${PREFIX}/share/examples/cdk/demos
 
  post-install:
-	@${MKDIR} ${PREFIX}/share/examples/cdk
-	${INSTALL_DATA} ${WRKSRC}/examples/Makefile ${PREFIX}/share/examples/cdk
-	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${PREFIX}/share/examples/cdk
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/cdk
 .for file in BUGS EXPANDING INSTALL NOTES README TODO
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/cdk
 .endfor
-	${LDCONFIG} -m ${PREFIX}/lib
 .endif
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/cdk/pkg-plist b/devel/cdk/pkg-plist
index a1410e6411ae..654a407acfb2 100644
--- a/devel/cdk/pkg-plist
+++ b/devel/cdk/pkg-plist
@@ -44,6 +44,17 @@ share/examples/cdk/buttonbox_ex.c
 share/examples/cdk/calendar_ex.c
 share/examples/cdk/cdkscreen_ex.c
 share/examples/cdk/dialog_ex.c
+share/examples/cdk/demos/Makefile
+share/examples/cdk/demos/appointment.c
+share/examples/cdk/demos/clock.c
+share/examples/cdk/demos/command.c
+share/examples/cdk/demos/fileview.c
+share/examples/cdk/demos/rolodex.c
+share/examples/cdk/demos/rolodex.h
+share/examples/cdk/demos/serial.c
+share/examples/cdk/demos/stopSign.c
+share/examples/cdk/demos/syb.c
+share/examples/cdk/demos/vinstall.c
 share/examples/cdk/entry_ex.c
 share/examples/cdk/fselect_ex.c
 share/examples/cdk/graph_ex.c
@@ -68,6 +79,7 @@ share/examples/cdk/template_ex.c
 share/examples/cdk/tst.c
 share/examples/cdk/viewer_ex.c
 share/examples/cdk/vinstall.c
+@dirrm share/examples/cdk/demos
 @dirrm share/examples/cdk
 @dirrm share/doc/cdk
 @dirrm include/cdk