diff --git a/graphics/hdf/pkg-plist b/graphics/hdf/pkg-plist
index 9749ea967395..dba5179efd20 100644
--- a/graphics/hdf/pkg-plist
+++ b/graphics/hdf/pkg-plist
@@ -19,25 +19,6 @@ bin/ristosds
 bin/vcompat
 bin/vmake
 bin/vshow
-lib/libmfhdf.a
-lib/libmfhdf.so.2
-lib/libmfhdf.so
-lib/libmfhdf_p.a
-lib/libdf.a
-lib/libdf.so
-lib/libdf.so.1
-lib/libdf_p.a
-include/dfconvrt.h
-include/dfivms.h
-include/dir_mac.h
-include/glist.h
-include/hqueue.h
-include/maldebug.h
-include/mcache.h
-include/patchlevel.h
-include/sys_dir_mac.h
-include/trace.h
-include/vgint.h
 include/atom.h
 include/bitvect.h
 include/cdeflate.h
@@ -47,14 +28,18 @@ include/crle.h
 include/cskphuff.h
 include/df.h
 include/dfan.h
+include/dfconvrt.h
 include/dffunc.inc
 include/dfgr.h
 include/dfi.h
+include/dfivms.h
 include/dfrig.h
 include/dfsd.h
 include/dfstubs.h
 include/dfufp2i.h
+include/dir_mac.h
 include/dynarray.h
+include/glist.h
 include/hbitio.h
 include/hchunks.h
 include/hcomp.h
@@ -70,15 +55,30 @@ include/hkit.h
 include/hlimits.h
 include/hntdefs.h
 include/hproto.h
+include/hqueue.h
 include/htags.h
 include/linklist.h
 include/local_nc.h
+include/maldebug.h
+include/mcache.h
 include/mfan.h
 include/mfgr.h
 include/mfhdf.h
 include/mstdio.h
 include/netcdf.h
 include/netcdf.inc
+include/patchlevel.h
+include/sys_dir_mac.h
 include/tbbt.h
+include/trace.h
 include/vattr.h
 include/vg.h
+include/vgint.h
+lib/libdf.a
+lib/libdf.so
+lib/libdf.so.1
+lib/libdf_p.a
+lib/libmfhdf.a
+lib/libmfhdf.so
+lib/libmfhdf.so.2
+lib/libmfhdf_p.a
diff --git a/graphics/hdf5/pkg-plist b/graphics/hdf5/pkg-plist
index 9749ea967395..dba5179efd20 100644
--- a/graphics/hdf5/pkg-plist
+++ b/graphics/hdf5/pkg-plist
@@ -19,25 +19,6 @@ bin/ristosds
 bin/vcompat
 bin/vmake
 bin/vshow
-lib/libmfhdf.a
-lib/libmfhdf.so.2
-lib/libmfhdf.so
-lib/libmfhdf_p.a
-lib/libdf.a
-lib/libdf.so
-lib/libdf.so.1
-lib/libdf_p.a
-include/dfconvrt.h
-include/dfivms.h
-include/dir_mac.h
-include/glist.h
-include/hqueue.h
-include/maldebug.h
-include/mcache.h
-include/patchlevel.h
-include/sys_dir_mac.h
-include/trace.h
-include/vgint.h
 include/atom.h
 include/bitvect.h
 include/cdeflate.h
@@ -47,14 +28,18 @@ include/crle.h
 include/cskphuff.h
 include/df.h
 include/dfan.h
+include/dfconvrt.h
 include/dffunc.inc
 include/dfgr.h
 include/dfi.h
+include/dfivms.h
 include/dfrig.h
 include/dfsd.h
 include/dfstubs.h
 include/dfufp2i.h
+include/dir_mac.h
 include/dynarray.h
+include/glist.h
 include/hbitio.h
 include/hchunks.h
 include/hcomp.h
@@ -70,15 +55,30 @@ include/hkit.h
 include/hlimits.h
 include/hntdefs.h
 include/hproto.h
+include/hqueue.h
 include/htags.h
 include/linklist.h
 include/local_nc.h
+include/maldebug.h
+include/mcache.h
 include/mfan.h
 include/mfgr.h
 include/mfhdf.h
 include/mstdio.h
 include/netcdf.h
 include/netcdf.inc
+include/patchlevel.h
+include/sys_dir_mac.h
 include/tbbt.h
+include/trace.h
 include/vattr.h
 include/vg.h
+include/vgint.h
+lib/libdf.a
+lib/libdf.so
+lib/libdf.so.1
+lib/libdf_p.a
+lib/libmfhdf.a
+lib/libmfhdf.so
+lib/libmfhdf.so.2
+lib/libmfhdf_p.a
diff --git a/science/hdf/pkg-plist b/science/hdf/pkg-plist
index 9749ea967395..dba5179efd20 100644
--- a/science/hdf/pkg-plist
+++ b/science/hdf/pkg-plist
@@ -19,25 +19,6 @@ bin/ristosds
 bin/vcompat
 bin/vmake
 bin/vshow
-lib/libmfhdf.a
-lib/libmfhdf.so.2
-lib/libmfhdf.so
-lib/libmfhdf_p.a
-lib/libdf.a
-lib/libdf.so
-lib/libdf.so.1
-lib/libdf_p.a
-include/dfconvrt.h
-include/dfivms.h
-include/dir_mac.h
-include/glist.h
-include/hqueue.h
-include/maldebug.h
-include/mcache.h
-include/patchlevel.h
-include/sys_dir_mac.h
-include/trace.h
-include/vgint.h
 include/atom.h
 include/bitvect.h
 include/cdeflate.h
@@ -47,14 +28,18 @@ include/crle.h
 include/cskphuff.h
 include/df.h
 include/dfan.h
+include/dfconvrt.h
 include/dffunc.inc
 include/dfgr.h
 include/dfi.h
+include/dfivms.h
 include/dfrig.h
 include/dfsd.h
 include/dfstubs.h
 include/dfufp2i.h
+include/dir_mac.h
 include/dynarray.h
+include/glist.h
 include/hbitio.h
 include/hchunks.h
 include/hcomp.h
@@ -70,15 +55,30 @@ include/hkit.h
 include/hlimits.h
 include/hntdefs.h
 include/hproto.h
+include/hqueue.h
 include/htags.h
 include/linklist.h
 include/local_nc.h
+include/maldebug.h
+include/mcache.h
 include/mfan.h
 include/mfgr.h
 include/mfhdf.h
 include/mstdio.h
 include/netcdf.h
 include/netcdf.inc
+include/patchlevel.h
+include/sys_dir_mac.h
 include/tbbt.h
+include/trace.h
 include/vattr.h
 include/vg.h
+include/vgint.h
+lib/libdf.a
+lib/libdf.so
+lib/libdf.so.1
+lib/libdf_p.a
+lib/libmfhdf.a
+lib/libmfhdf.so
+lib/libmfhdf.so.2
+lib/libmfhdf_p.a
diff --git a/science/hdf5-18/pkg-plist b/science/hdf5-18/pkg-plist
index 9749ea967395..dba5179efd20 100644
--- a/science/hdf5-18/pkg-plist
+++ b/science/hdf5-18/pkg-plist
@@ -19,25 +19,6 @@ bin/ristosds
 bin/vcompat
 bin/vmake
 bin/vshow
-lib/libmfhdf.a
-lib/libmfhdf.so.2
-lib/libmfhdf.so
-lib/libmfhdf_p.a
-lib/libdf.a
-lib/libdf.so
-lib/libdf.so.1
-lib/libdf_p.a
-include/dfconvrt.h
-include/dfivms.h
-include/dir_mac.h
-include/glist.h
-include/hqueue.h
-include/maldebug.h
-include/mcache.h
-include/patchlevel.h
-include/sys_dir_mac.h
-include/trace.h
-include/vgint.h
 include/atom.h
 include/bitvect.h
 include/cdeflate.h
@@ -47,14 +28,18 @@ include/crle.h
 include/cskphuff.h
 include/df.h
 include/dfan.h
+include/dfconvrt.h
 include/dffunc.inc
 include/dfgr.h
 include/dfi.h
+include/dfivms.h
 include/dfrig.h
 include/dfsd.h
 include/dfstubs.h
 include/dfufp2i.h
+include/dir_mac.h
 include/dynarray.h
+include/glist.h
 include/hbitio.h
 include/hchunks.h
 include/hcomp.h
@@ -70,15 +55,30 @@ include/hkit.h
 include/hlimits.h
 include/hntdefs.h
 include/hproto.h
+include/hqueue.h
 include/htags.h
 include/linklist.h
 include/local_nc.h
+include/maldebug.h
+include/mcache.h
 include/mfan.h
 include/mfgr.h
 include/mfhdf.h
 include/mstdio.h
 include/netcdf.h
 include/netcdf.inc
+include/patchlevel.h
+include/sys_dir_mac.h
 include/tbbt.h
+include/trace.h
 include/vattr.h
 include/vg.h
+include/vgint.h
+lib/libdf.a
+lib/libdf.so
+lib/libdf.so.1
+lib/libdf_p.a
+lib/libmfhdf.a
+lib/libmfhdf.so
+lib/libmfhdf.so.2
+lib/libmfhdf_p.a
diff --git a/science/hdf5/pkg-plist b/science/hdf5/pkg-plist
index 9749ea967395..dba5179efd20 100644
--- a/science/hdf5/pkg-plist
+++ b/science/hdf5/pkg-plist
@@ -19,25 +19,6 @@ bin/ristosds
 bin/vcompat
 bin/vmake
 bin/vshow
-lib/libmfhdf.a
-lib/libmfhdf.so.2
-lib/libmfhdf.so
-lib/libmfhdf_p.a
-lib/libdf.a
-lib/libdf.so
-lib/libdf.so.1
-lib/libdf_p.a
-include/dfconvrt.h
-include/dfivms.h
-include/dir_mac.h
-include/glist.h
-include/hqueue.h
-include/maldebug.h
-include/mcache.h
-include/patchlevel.h
-include/sys_dir_mac.h
-include/trace.h
-include/vgint.h
 include/atom.h
 include/bitvect.h
 include/cdeflate.h
@@ -47,14 +28,18 @@ include/crle.h
 include/cskphuff.h
 include/df.h
 include/dfan.h
+include/dfconvrt.h
 include/dffunc.inc
 include/dfgr.h
 include/dfi.h
+include/dfivms.h
 include/dfrig.h
 include/dfsd.h
 include/dfstubs.h
 include/dfufp2i.h
+include/dir_mac.h
 include/dynarray.h
+include/glist.h
 include/hbitio.h
 include/hchunks.h
 include/hcomp.h
@@ -70,15 +55,30 @@ include/hkit.h
 include/hlimits.h
 include/hntdefs.h
 include/hproto.h
+include/hqueue.h
 include/htags.h
 include/linklist.h
 include/local_nc.h
+include/maldebug.h
+include/mcache.h
 include/mfan.h
 include/mfgr.h
 include/mfhdf.h
 include/mstdio.h
 include/netcdf.h
 include/netcdf.inc
+include/patchlevel.h
+include/sys_dir_mac.h
 include/tbbt.h
+include/trace.h
 include/vattr.h
 include/vg.h
+include/vgint.h
+lib/libdf.a
+lib/libdf.so
+lib/libdf.so.1
+lib/libdf_p.a
+lib/libmfhdf.a
+lib/libmfhdf.so
+lib/libmfhdf.so.2
+lib/libmfhdf_p.a