--- a/components/desktop/libpng/libpng.p5m	Thu Mar 31 11:13:45 2016 +0100
+++ b/components/desktop/libpng/libpng.p5m	Wed Mar 30 18:48:54 2016 -0700
@@ -38,59 +38,27 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2013/313
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 link path=usr/bin/$(MACH64)/libpng-config target=libpng14-config
-file path=usr/bin/$(MACH64)/libpng10-config
-file path=usr/bin/$(MACH64)/libpng12-config
 file path=usr/bin/$(MACH64)/libpng14-config
 link path=usr/bin/libpng-config target=libpng14-config
-file path=usr/bin/libpng10-config
-file path=usr/bin/libpng12-config
 file path=usr/bin/libpng14-config
 link path=usr/include/libpng target=libpng14
-file path=usr/include/libpng10/png.h
-file path=usr/include/libpng10/pngconf.h
-file path=usr/include/libpng12/png.h
-file path=usr/include/libpng12/pngconf.h
 file path=usr/include/libpng14/png.h
 file path=usr/include/libpng14/pngconf.h
 link path=usr/include/png.h target=libpng14/png.h
 link path=usr/include/pngconf.h target=libpng14/pngconf.h
 link path=usr/lib/$(MACH64)/libpng.so target=libpng14.so
-link path=usr/lib/$(MACH64)/libpng.so.2 target=libpng.so.2.59.0
-file path=usr/lib/$(MACH64)/libpng.so.2.59.0
-link path=usr/lib/$(MACH64)/libpng.so.3 target=libpng.so.3.49.0
-file path=usr/lib/$(MACH64)/libpng.so.3.49.0
-link path=usr/lib/$(MACH64)/libpng10.so target=libpng10.so.0.59.0
-link path=usr/lib/$(MACH64)/libpng10.so.0 target=libpng10.so.0.59.0
-file path=usr/lib/$(MACH64)/libpng10.so.0.59.0
-link path=usr/lib/$(MACH64)/libpng12.so target=libpng12.so.0.49.0
-link path=usr/lib/$(MACH64)/libpng12.so.0 target=libpng12.so.0.49.0
-file path=usr/lib/$(MACH64)/libpng12.so.0.49.0
 link path=usr/lib/$(MACH64)/libpng14.so target=libpng14.so.14.19.0
 link path=usr/lib/$(MACH64)/libpng14.so.14 target=libpng14.so.14.19.0
 file path=usr/lib/$(MACH64)/libpng14.so.14.19.0
 link path=usr/lib/$(MACH64)/pkgconfig/libpng.pc target=libpng14.pc
-file path=usr/lib/$(MACH64)/pkgconfig/libpng10.pc
-file path=usr/lib/$(MACH64)/pkgconfig/libpng12.pc
 file path=usr/lib/$(MACH64)/pkgconfig/libpng14.pc
 link path=usr/lib/libpng.so target=libpng14.so
-link path=usr/lib/libpng.so.2 target=libpng.so.2.59.0
-file path=usr/lib/libpng.so.2.59.0
-link path=usr/lib/libpng.so.3 target=libpng.so.3.49.0
-file path=usr/lib/libpng.so.3.49.0
-link path=usr/lib/libpng10.so target=libpng10.so.0.59.0
-link path=usr/lib/libpng10.so.0 target=libpng10.so.0.59.0
-file path=usr/lib/libpng10.so.0.59.0
-link path=usr/lib/libpng12.so target=libpng12.so.0.49.0
-link path=usr/lib/libpng12.so.0 target=libpng12.so.0.49.0
-file path=usr/lib/libpng12.so.0.49.0
 link path=usr/lib/libpng14.so target=libpng14.so.14.19.0
 link path=usr/lib/libpng14.so.14 target=libpng14.so.14.19.0
 file path=usr/lib/libpng14.so.14.19.0
 link path=usr/lib/pkgconfig/libpng.pc target=libpng14.pc
-file path=usr/lib/pkgconfig/libpng10.pc
-file path=usr/lib/pkgconfig/libpng12.pc
 file path=usr/lib/pkgconfig/libpng14.pc
 file path=usr/share/man/man3/libpng.3
 file path=usr/share/man/man3/libpngpf.3
-file files/png.4 path=usr/share/man/man4/png.4
+file path=usr/share/man/man5/png.5
 license libpng.license license=libpng