diff --git a/mail/addresses/Makefile b/mail/addresses/Makefile
index dba5feca0c1d..ae43a40f5d40 100644
--- a/mail/addresses/Makefile
+++ b/mail/addresses/Makefile
@@ -1,18 +1,23 @@
 PORTNAME=	addresses
-PORTVERSION=	0.4.8
-PORTREVISION=	10
+DISTVERSION=	0.5.0
 CATEGORIES=	mail gnustep
 MASTER_SITES=	SAVANNAH/gap
-DISTNAME=	Addresses-${PORTVERSION}
+DISTNAME=	Addresses-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mce@FreeBSD.org
 COMMENT=	Versatile addressbook for GNUstep
 WWW=		https://gap.nongnu.org/addresses/index.html
 
 LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 USES=		gnustep
-USE_GNUSTEP=	back build
+USE_GNUSTEP=	back base build gui
 USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
+post-install:
+		@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/AddressManager.app/AddressManager \
+			${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/AddressView.framework/Versions/${DISTVERSION}/libAddressView.so.${DISTVERSION} \
+			${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/Addresses.framework/Versions/${DISTVERSION}/libAddresses.so.${DISTVERSION}
+
 .include <bsd.port.mk>
diff --git a/mail/addresses/distinfo b/mail/addresses/distinfo
index 4d843de8a6d0..d9ece06b8307 100644
--- a/mail/addresses/distinfo
+++ b/mail/addresses/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Addresses-0.4.8.tar.gz) = 329531bfd31db1845f3af385c1c2448f308b1bf28af5ee7d4f50f403dbb6ac0a
-SIZE (Addresses-0.4.8.tar.gz) = 287207
+TIMESTAMP = 1763593425
+SHA256 (Addresses-0.5.0.tar.gz) = fb074e80c85f48aa57e1c01bcdcd1a5754bade84d61ccf7db7549ef20b1ba4e1
+SIZE (Addresses-0.5.0.tar.gz) = 263396
diff --git a/mail/addresses/pkg-descr b/mail/addresses/pkg-descr
index 37dc94b20fd2..72c85f9749f2 100644
--- a/mail/addresses/pkg-descr
+++ b/mail/addresses/pkg-descr
@@ -1,5 +1,8 @@
- Addresses for GNUstep is a versatile address book application for
+Addresses for GNUstep is a versatile address book application for
 managing contact information. It stores addresses, phone numbers,
 pictures, instant messaging information, email, homepages and whatever.
 
-LICENSE: LGPL2 or later
+Addresses is also a framework that allows access to the addresses
+database in a way that is sourcecode-compatible with Apple's
+AddressBook.framework. It also contains a view framework to facilitate
+the construction of applications that use the contact database.
diff --git a/mail/addresses/pkg-plist b/mail/addresses/pkg-plist
index e187b0a5ec7c..1ee9c4e0f020 100644
--- a/mail/addresses/pkg-plist
+++ b/mail/addresses/pkg-plist
@@ -1,112 +1,109 @@
 GNUstep/System/Applications/AddressManager.app/AddressManager
 GNUstep/System/Applications/AddressManager.app/Resources/AddressManager.desktop
 GNUstep/System/Applications/AddressManager.app/Resources/AddressManager.tiff
 GNUstep/System/Applications/AddressManager.app/Resources/AddressManagerInfo.plist
 GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/Add.tiff
 GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/data.classes
 GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/objects.gorm
 GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/ISOCountryCodes.dict
 GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/Localizable.strings
 GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/Add.tiff
 GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/data.classes
 GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/objects.gorm
 GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/ISOCountryCodes.dict
 GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/Localizable.strings
 GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/Add.tiff
 GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/data.classes
 GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/objects.gorm
 GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/ISOCountryCodes.dict
 GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/Localizable.strings
 GNUstep/System/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/Add.tiff
 GNUstep/System/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/data.classes
 GNUstep/System/Applications/AddressManager.app/Resources/German.lproj/AddressManager.gorm/objects.gorm
 GNUstep/System/Applications/AddressManager.app/Resources/German.lproj/ISOCountryCodes.dict
 GNUstep/System/Applications/AddressManager.app/Resources/German.lproj/Localizable.strings
 GNUstep/System/Applications/AddressManager.app/Resources/Info-gnustep.plist
 GNUstep/System/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/Add.tiff
 GNUstep/System/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/data.classes
 GNUstep/System/Applications/AddressManager.app/Resources/Spanish.lproj/AddressManager.gorm/objects.gorm
 GNUstep/System/Applications/AddressManager.app/Resources/Spanish.lproj/ISOCountryCodes.dict
 GNUstep/System/Applications/AddressManager.app/Resources/Spanish.lproj/Localizable.strings
 GNUstep/System/Applications/AddressManager.app/Resources/VCFFile.tiff
 GNUstep/System/Applications/AddressManager.app/Resources/VCFImage.tiff
 GNUstep/System/Applications/AddressManager.app/Resources/VCFImageMulti.tiff
 GNUstep/System/Applications/AddressManager.app/stamp.make
 GNUstep/System/Library/Frameworks/AddressView.framework/AddressView
 GNUstep/System/Library/Frameworks/AddressView.framework/Headers
 GNUstep/System/Library/Frameworks/AddressView.framework/Resources
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/AddressView
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADImageView.h
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADPersonPropertyView.h
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADPersonView.h
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/ADSinglePropertyView.h
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Headers/AddressView.h
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Add.tiff
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/AddressLayouts.dict
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Change.tiff
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj/Localizable.strings
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/Localizable.strings
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj/Localizable.strings
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj/Localizable.strings
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/ISOCodeMapping.dict
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Labels.dict
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Lock.tiff
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Remove.tiff
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/ScriptingInfo.plist
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Share.tiff
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj/Localizable.strings
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/UnknownImage.tiff
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/Resources/VCFImage.tiff
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so.%%MAJORLIBVERSION%%
-GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%MAJORVERSION%%/libAddressView.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/AddressView
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Headers/ADImageView.h
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Headers/ADPersonPropertyView.h
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Headers/ADPersonView.h
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Headers/ADSinglePropertyView.h
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Headers/AddressView.h
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/Add.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/AddressLayouts.dict
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/Change.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/Dutch.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/English.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/French.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/German.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/ISOCodeMapping.dict
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/Labels.dict
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/Lock.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/Remove.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/ScriptingInfo.plist
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/Share.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/Spanish.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/UnknownImage.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/Resources/VCFImage.tiff
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/libAddressView.so
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/libAddressView.so.0
+GNUstep/System/Library/Frameworks/AddressView.framework/Versions/%%VERSION%%/libAddressView.so.%%VERSION%%
 GNUstep/System/Library/Frameworks/AddressView.framework/Versions/Current
 GNUstep/System/Library/Frameworks/AddressView.framework/libAddressView.so
 GNUstep/System/Library/Frameworks/Addresses.framework/Addresses
 GNUstep/System/Library/Frameworks/Addresses.framework/Headers
 GNUstep/System/Library/Frameworks/Addresses.framework/Resources
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Addresses
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADAddressBook.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADConverter.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADEnvelopeAddressBook.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADGlobals.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADGroup.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADImageLoading.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADLocalAddressBook.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADMultiValue.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPListConverter.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPerson.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPlugin.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADPublicAddressBook.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADRecord.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADSearchElement.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADTypedefs.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/ADVCFConverter.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/AddressBook.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Headers/Addresses.h
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Dutch.lproj/PropertiesAndLabels.strings
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/English.lproj/PropertiesAndLabels.strings
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/French.lproj/PropertiesAndLabels.strings
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/German.lproj/PropertiesAndLabels.strings
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/ScriptingInfo.plist
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/Resources/Spanish.lproj/PropertiesAndLabels.strings
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%MAJORLIBVERSION%%
-GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%MAJORVERSION%%/libAddresses.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Addresses
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADAddressBook.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADConverter.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADEnvelopeAddressBook.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADGlobals.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADGroup.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADImageLoading.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADLocalAddressBook.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADMultiValue.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADPListConverter.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADPerson.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADPlugin.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADPublicAddressBook.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADRecord.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADSearchElement.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADTypedefs.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/ADVCFConverter.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/AddressBook.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Headers/Addresses.h
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Resources/Dutch.lproj/PropertiesAndLabels.strings
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Resources/English.lproj/PropertiesAndLabels.strings
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Resources/French.lproj/PropertiesAndLabels.strings
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Resources/German.lproj/PropertiesAndLabels.strings
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Resources/ScriptingInfo.plist
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/Resources/Spanish.lproj/PropertiesAndLabels.strings
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/libAddresses.so
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/libAddresses.so.0
+GNUstep/System/Library/Frameworks/Addresses.framework/Versions/%%VERSION%%/libAddresses.so.%%VERSION%%
 GNUstep/System/Library/Frameworks/Addresses.framework/Versions/Current
 GNUstep/System/Library/Frameworks/Addresses.framework/libAddresses.so
+GNUstep/System/Library/Headers/AddressBook/AddressBook.h
 GNUstep/System/Library/Headers/AddressView
 GNUstep/System/Library/Headers/Addresses
 GNUstep/System/Library/Libraries/libAddressView.so
-GNUstep/System/Library/Libraries/libAddressView.so.%%MAJORLIBVERSION%%
-GNUstep/System/Library/Libraries/libAddressView.so.%%LIBVERSION%%
+GNUstep/System/Library/Libraries/libAddressView.so.0
+GNUstep/System/Library/Libraries/libAddressView.so.%%VERSION%%
 GNUstep/System/Library/Libraries/libAddresses.so
-GNUstep/System/Library/Libraries/libAddresses.so.%%MAJORLIBVERSION%%
-GNUstep/System/Library/Libraries/libAddresses.so.%%LIBVERSION%%
+GNUstep/System/Library/Libraries/libAddresses.so.0
+GNUstep/System/Library/Libraries/libAddresses.so.%%VERSION%%
 GNUstep/System/Tools/AddressManager
-GNUstep/System/Applications/AddressManager.app/Resources/Dutch.lproj/AddressManager.gorm/data.info
-GNUstep/System/Applications/AddressManager.app/Resources/English.lproj/AddressManager.gorm/data.info
-GNUstep/System/Applications/AddressManager.app/Resources/French.lproj/AddressManager.gorm/data.info
-GNUstep/System/Library/Headers/AddressBook/AddressBook.h