3 files changed, 230 insertions, 225 deletions

diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index 1671b4b11530..8472196f04e7 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Ice
-PORTVERSION=	3.1.0
+PORTVERSION=	3.1.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.zeroc.com/download/Ice/3.1/
 
@@ -40,6 +40,10 @@ BROKEN=		does not compile on ia64
 MAKE_ENV=	LP64=yes
 .endif
 
+.if defined(NOPORTDOCS)
+	${RM} -rf ${WRKSRC}/doc
+.endif
+
 post-patch:
 	${SED} 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g; \
 		s|%%PREFIX%%|${PREFIX}|g; \
diff --git a/devel/ice/distinfo b/devel/ice/distinfo
index 8580a5c8ff8a..144ad22d7c87 100644
--- a/devel/ice/distinfo
+++ b/devel/ice/distinfo
@@ -1,3 +1,3 @@
-MD5 (Ice-3.1.0.tar.gz) = f37f7c6c1de570a5782f61430557ef4e
-SHA256 (Ice-3.1.0.tar.gz) = c2de63f99d881ce0229f5cc10e0936f2bb4e7257a74220f5eec74712425f7ac4
-SIZE (Ice-3.1.0.tar.gz) = 2110940
+MD5 (Ice-3.1.1.tar.gz) = 44299126976302fc12e531846a663d59
+SHA256 (Ice-3.1.1.tar.gz) = 5140bf5c2b6185408a7a5bec07ca108f14f0b6c81efac4e4af6adbc9db71eda9
+SIZE (Ice-3.1.1.tar.gz) = 2162434
diff --git a/devel/ice/pkg-plist b/devel/ice/pkg-plist
index 093373472557..51c8bba7c519 100644
--- a/devel/ice/pkg-plist
+++ b/devel/ice/pkg-plist
@@ -68,6 +68,7 @@ include/Ice/FactoryTable.h
 include/Ice/FactoryTableDef.h
 include/Ice/Functional.h
 include/Ice/GC.h
+include/Ice/GCCountMap.h
 include/Ice/GCRecMutex.h
 include/Ice/GCShared.h
 include/Ice/Handle.h
@@ -189,40 +190,40 @@ include/Slice/Preprocessor.h
 include/Slice/PythonUtil.h
 include/Slice/VbUtil.h
 lib/libFreeze.so
-lib/libFreeze.so.3.1.0
+lib/libFreeze.so.3.1.1
 lib/libFreeze.so.31
 lib/libGlacier2.so
-lib/libGlacier2.so.3.1.0
+lib/libGlacier2.so.3.1.1
 lib/libGlacier2.so.31
 lib/libIce.so
-lib/libIce.so.3.1.0
+lib/libIce.so.3.1.1
 lib/libIce.so.31
 lib/libIceBox.so
-lib/libIceBox.so.3.1.0
+lib/libIceBox.so.3.1.1
 lib/libIceBox.so.31
 lib/libIceGrid.so
-lib/libIceGrid.so.3.1.0
+lib/libIceGrid.so.3.1.1
 lib/libIceGrid.so.31
 lib/libIcePatch2.so
-lib/libIcePatch2.so.3.1.0
+lib/libIcePatch2.so.3.1.1
 lib/libIcePatch2.so.31
 lib/libIceSSL.so
-lib/libIceSSL.so.3.1.0
+lib/libIceSSL.so.3.1.1
 lib/libIceSSL.so.31
 lib/libIceStorm.so
-lib/libIceStorm.so.3.1.0
+lib/libIceStorm.so.3.1.1
 lib/libIceStorm.so.31
 lib/libIceStormService.so
-lib/libIceStormService.so.3.1.0
+lib/libIceStormService.so.3.1.1
 lib/libIceStormService.so.31
 lib/libIceUtil.so
-lib/libIceUtil.so.3.1.0
+lib/libIceUtil.so.3.1.1
 lib/libIceUtil.so.31
 lib/libIceXML.so
-lib/libIceXML.so.3.1.0
+lib/libIceXML.so.3.1.1
 lib/libIceXML.so.31
 lib/libSlice.so
-lib/libSlice.so.3.1.0
+lib/libSlice.so.3.1.1
 lib/libSlice.so.31
 %%DATADIR%%/Freeze/CatalogData.ice
 %%DATADIR%%/Freeze/Connection.ice
@@ -294,14 +295,15 @@ lib/libSlice.so.31
 %%DATADIR%%/config/ca/req.py
 %%DATADIR%%/config/ca/sign.py
 %%DATADIR%%/config/convertssl.py
+%%DATADIR%%/config/icegrid-slice.3.0.ice.gz
 %%DATADIR%%/config/templates.xml
 %%DATADIR%%/config/upgradeicegrid.py
 %%PORTDOCS%%%%DOCSDIR%%/ICE_LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/c13.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/c17145.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/c20982.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/c17556.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/c21415.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/index.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/stylesheet-images/caution.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/stylesheet-images/home.gif
@@ -315,218 +317,219 @@ lib/libSlice.so.31
 %%PORTDOCS%%%%DOCSDIR%%/reference/stylesheet-images/toc-plus.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/stylesheet-images/up.gif
 %%PORTDOCS%%%%DOCSDIR%%/reference/stylesheet-images/warning.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/x10228.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x10252.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x10377.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x10424.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x10488.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x10512.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x10538.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x1097.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x1105.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x1113.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x1150.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x1179.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x1189.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x1201.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x1213.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12144.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x1221.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12324.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12355.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12365.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12525.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12549.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12779.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12803.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12835.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12872.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x12955.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13027.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13051.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13103.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13164.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13192.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13236.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x10283.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x10332.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x1036.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x10457.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x10504.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x1054.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x10568.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x10602.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x10628.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x1075.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x1112.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x1141.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x1151.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x1163.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x1175.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x1183.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x12234.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x12414.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x12458.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x12468.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x12628.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x12674.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x12904.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x12935.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x12967.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13004.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13087.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13159.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13241.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/x13293.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13347.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13447.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13523.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13636.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13660.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13804.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13841.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x13998.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14044.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14069.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14122.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14147.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14171.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14196.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14226.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14270.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14325.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14447.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14457.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14702.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x14973.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15045.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15055.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15245.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15319.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15378.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15440.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15464.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15501.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15594.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15631.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15683.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15756.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x15992.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16052.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16106.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16114.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16255.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16279.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16337.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16361.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16385.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16635.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16659.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16789.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16886.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16913.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x16938.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x17009.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x17135.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x17187.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x17295.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x17365.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x17557.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x17630.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x17688.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x17806.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x18107.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x18685.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x18865.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x19776.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x1994.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x20075.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2011.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2023.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2042.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2054.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x20599.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x20853.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x21093.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2248.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2260.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2272.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2284.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2296.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2433.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2474.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2486.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2498.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2532.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2556.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2599.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2609.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2633.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2661.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2680.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2876.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2900.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2925.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2937.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2949.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2973.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x2981.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x3089.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x3258.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x3382.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x3422.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x3434.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x3446.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x3470.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x3511.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x3548.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x4631.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x4667.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x4697.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x4781.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x4791.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13354.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13382.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13426.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13483.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13537.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13637.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13713.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13826.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x13869.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14013.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14093.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14250.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14296.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14331.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14384.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14428.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14459.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14494.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14540.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14584.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14639.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14761.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x14771.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15016.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15287.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15359.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15369.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15559.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15633.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15692.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15754.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15812.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15856.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15949.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x15993.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16045.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16118.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16354.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16414.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16468.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16483.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16624.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16655.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16713.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16744.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x16775.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17025.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17056.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17186.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17283.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17310.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17342.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17413.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17539.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17598.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17728.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17798.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x17990.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x18063.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x18121.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x18239.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x18540.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x19118.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x19298.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x1998.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2015.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x20209.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2027.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2046.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x20508.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2058.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x21032.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x21286.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x21526.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2252.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2264.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2276.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2288.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2300.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2437.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2478.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2490.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2502.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2536.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2560.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2603.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2613.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2637.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2665.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2684.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2877.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2901.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2926.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2938.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2950.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2974.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x2989.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x3097.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x3266.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x3390.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x3430.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x3442.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x3454.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x3478.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x3519.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x3556.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x4639.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x4675.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x4705.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x4789.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/x4799.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x4872.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x4882.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x4931.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x4955.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x5087.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x5150.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x5520.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x5587.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x5611.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x5623.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x5691.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x5802.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x5826.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6019.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6027.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x4814.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x4887.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x4897.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x4946.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x4970.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x5102.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x5165.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x5535.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x5602.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x5626.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x5638.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x5706.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x5817.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x5841.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6034.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/x6049.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6130.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6142.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6181.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6202.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6230.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6266.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6283.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6295.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6307.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6319.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6334.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6346.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6413.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6480.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6490.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6633.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6683.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6776.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6822.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x6832.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x70.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x7681.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x7689.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x7771.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x7779.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x7787.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x7797.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x7839.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x7911.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x7972.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8019.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8027.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8066.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8090.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8172.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8224.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8346.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8373.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8406.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8494.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8525.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8584.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8780.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8887.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x8947.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x9017.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6071.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6152.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6164.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6203.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6224.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6252.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6288.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6305.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6317.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6329.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6341.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6356.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6368.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6435.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6502.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6512.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6655.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6705.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6798.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6844.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x6854.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x7703.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x7711.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x7793.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x7801.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x7809.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x7819.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x7861.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x7933.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x7994.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8041.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8049.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8088.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8112.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8194.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8246.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8368.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8395.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8444.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8532.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8573.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8632.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8828.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8935.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x8995.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/x9065.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x9146.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x9215.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x9230.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/x9318.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x9113.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x9194.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x9263.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x9285.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/x9373.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/reference/stylesheet-images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/reference
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/config/ca
+@dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/IceStorm
 @dirrm %%DATADIR%%/IcePatch2
 @dirrm %%DATADIR%%/IceGrid
@@ -534,8 +537,6 @@ lib/libSlice.so.31
 @dirrm %%DATADIR%%/Ice
 @dirrm %%DATADIR%%/Glacier2
 @dirrm %%DATADIR%%/Freeze
-@dirrm %%DATADIR%%/config/ca
-@dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
 @dirrm include/Slice
 @dirrm include/IceXML