2 files changed, 79 insertions, 71 deletions

diff --git a/biology/adun/Makefile b/biology/adun/Makefile
index 7491feeaedac..64a2c35d9d78 100644
--- a/biology/adun/Makefile
+++ b/biology/adun/Makefile
@@ -25,6 +25,10 @@ USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/Adun
+MAKE_ENV+=	AdunKernel_CURRENT_VERSION_NAME=0
+DEFAULT_LIBVERSION2=	0.0
+PLIST_SUB+=	LIBVERSION2=${DEFAULT_LIBVERSION2}
+PLIST_SUB+=	MAJORLIBVERSION2=${DEFAULT_LIBVERSION2:C/([0-9]).*/\1/1}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|include Defs/|-include Defs/|' \
@@ -41,7 +45,7 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 600000
-IGNORE=		not enough math funtions
+IGNORE=		not enough math functions
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/biology/adun/pkg-plist b/biology/adun/pkg-plist
index 948a98f70978..802fdf626b2e 100644
--- a/biology/adun/pkg-plist
+++ b/biology/adun/pkg-plist
@@ -33,75 +33,76 @@ Local/Applications/UL.app/Resources/reload.png
 Local/Applications/UL.app/Resources/resultsOptions.plist
 Local/Applications/UL.app/Resources/splash.tiff
 Local/Applications/UL.app/UL
-Local/Applications/UL.app/library_paths.openapp
 Local/Applications/UL.app/stamp.make
+Local/Library/Frameworks/AdunKernel.framework/AdunKernel
 Local/Library/Frameworks/AdunKernel.framework/Headers
 Local/Library/Frameworks/AdunKernel.framework/Resources
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/AdunKernel
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdCommandInterface.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdController.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdCoreCommand.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdCreation.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdDataSources.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdDelegation.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdEndSimulationCommand.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdFlushEnergiesCommand.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdFrameworkFunctions.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdGridDelegate.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdKeyValueObserving.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdListMemoryManagement.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdReloadCommand.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdServerInterface.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdStatusCommand.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdUpdating.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunBondedTopology.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunBoundaryImplementor.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunController.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunCore.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunDataMatrix.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunDataSet.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunDataSource.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunDefinitions.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunDynamics.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunEnvironment.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunForceField.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunForceFieldManager.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunForceFieldTerm.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunGrid.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunIOManager.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunInteractionSystem.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunKernel.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunLinkedList.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunMemoryManager.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunModelObject.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunNonBondedListHandler.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunNonBondedTopology.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunNonbondedCalculator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunObject.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunRelationship.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunSimulator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunState.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunSystem.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunSystemComponent.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunSystemNode.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/AdunTimer.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/CellListHandler.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/EnzymixForceField.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/GRFNonbondedCalculator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/NewtonianSimulator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/PureNonBondedCalculator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/RemoteProcessAccess.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/SCAAS.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/ShiftedNonBondedCalculator.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/SimpleListHandler.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/SphericalBox.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers/ULIndexSetConversions.h
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Resources/Info-gnustep.plist
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/Resources/ScriptingInfo.plist
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/libAdunKernel.so
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/libAdunKernel.so.%%MAJORLIBVERSION%%
-Local/Library/Frameworks/AdunKernel.framework/Versions/A/libAdunKernel.so.%%LIBVERSION%%
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/AdunKernel
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdCommandInterface.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdController.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdCoreCommand.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdCreation.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdDataSources.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdDelegation.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdEndSimulationCommand.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdFlushEnergiesCommand.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdFrameworkFunctions.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdGridDelegate.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdKeyValueObserving.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdListMemoryManagement.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdReloadCommand.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdServerInterface.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdStatusCommand.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdUpdating.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunBondedTopology.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunBoundaryImplementor.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunController.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunCore.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunDataMatrix.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunDataSet.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunDataSource.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunDefinitions.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunDynamics.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunEnvironment.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunForceField.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunForceFieldManager.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunForceFieldTerm.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunGrid.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunIOManager.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunInteractionSystem.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunKernel.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunLinkedList.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunMemoryManager.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunModelObject.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunNonBondedListHandler.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunNonBondedTopology.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunNonbondedCalculator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunObject.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunRelationship.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunSimulator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunState.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunSystem.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunSystemComponent.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunSystemNode.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/AdunTimer.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/CellListHandler.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/EnzymixForceField.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/GRFNonbondedCalculator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/NewtonianSimulator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/PureNonBondedCalculator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/RemoteProcessAccess.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/SCAAS.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ShiftedNonBondedCalculator.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/SimpleListHandler.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/SphericalBox.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers/ULIndexSetConversions.h
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Resources/Info-gnustep.plist
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Resources/ScriptingInfo.plist
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/libAdunKernel.so
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/libAdunKernel.so.%%MAJORLIBVERSION%%
+Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/libAdunKernel.so.%%LIBVERSION%%
 Local/Library/Frameworks/AdunKernel.framework/Versions/Current
+Local/Library/Frameworks/AdunKernel.framework/libAdunKernel.so
 Local/Library/Headers/AdunKernel
 Local/Library/Headers/Base/AdForceFieldFunctions.h
 Local/Library/Headers/Base/AdLinkedList.h
@@ -186,19 +187,22 @@ Local/Library/Libraries/libadun_base.so.%%LIBVERSION%%
 Local/Library/Libraries/libmoltalk.so
 Local/Library/Libraries/libmoltalk.so.%%MAJORLIBVERSION%%
 Local/Library/Libraries/libmoltalk.so.%%LIBVERSION%%
+Local/Library/Tools/Resources/AdunCore/reloadOptions.plist
 Local/Tools/AdunCore
 Local/Tools/AdunServer
-Local/Tools/Resources/AdunCore/reloadOptions.plist
-@dirrm Local/Tools/Resources/AdunCore
+Local/Tools/UL
+@dirrm Local/Library/Tools/Resources/AdunCore
+@dirrmtry Local/Library/Tools/Resources
+@dirrmtry Local/Library/Tools
 @dirrm Local/Library/Headers/XMLLib
 @dirrm Local/Library/Headers/ULFramework
 @dirrm Local/Library/Headers/MolTalk
 @dirrm Local/Library/Headers/Framework/Protocols
 @dirrm Local/Library/Headers/Framework
 @dirrm Local/Library/Headers/Base
-@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/A/Resources
-@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/A/Headers
-@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/A
+@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Resources
+@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%/Headers
+@dirrm Local/Library/Frameworks/AdunKernel.framework/Versions/%%MAJORLIBVERSION2%%
 @dirrm Local/Library/Frameworks/AdunKernel.framework/Versions
 @dirrm Local/Library/Frameworks/AdunKernel.framework
 @dirrm Local/Applications/UL.app/Resources/UL.gorm