Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Oct 2025 23:34:41 GMT
From:      =?utf-8?Q?=C3=84lven?= <alven@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: a69bab00a474 - main - mail/gnumail: Improve port, take maintainership
Message-ID:  <202510302334.59UNYfYg051418@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by alven:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a69bab00a47447167ce5264825b49a277f320e8b

commit a69bab00a47447167ce5264825b49a277f320e8b
Author:     mew14930xvi <mew14930xvi@inbox.lv>
AuthorDate: 2025-10-11 00:02:13 +0000
Commit:     Älven <alven@FreeBSD.org>
CommitDate: 2025-10-30 23:34:29 +0000

    mail/gnumail: Improve port, take maintainership
    
    * Add LICENSE_FILE.
    * Remove CFLAGS+=.
    * Switch from post-stage to post-install.
    * Use variables for STRIP_CMD and pkg-plist.
    * Pet portclippy(1) and portfmt(1)
    
    PR:             290136
    Approved by:    yuri@ (Mentor)
---
 mail/gnumail/Makefile  | 41 +++++++++++++----------------------------
 mail/gnumail/pkg-descr |  2 --
 mail/gnumail/pkg-plist |  6 +++---
 3 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index 102768e6b9f8..ecf8f8f6ccd0 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -1,45 +1,30 @@
 PORTNAME=	gnumail
 DISTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail gnustep
 MASTER_SITES=	SAVANNAH/gnustep-nonfsf/
-DISTNAME=	GNUMail-${PORTVERSION}
+DISTNAME=	GNUMail-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mew14930xvi@inbox.lv
 COMMENT=	GNUstep mail client
 WWW=		https://www.nongnu.org/gnustep-nonfsf/gnumail/
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/Documentation/COPYING
 
-LIB_DEPENDS=	libPantomime.so:mail/pantomime \
-		libAddresses.so:mail/addresses
+LIB_DEPENDS=	libAddresses.so:mail/addresses \
+		libPantomime.so:mail/pantomime
 
 USES=		cpe gnustep
 CPE_VENDOR=	gnu
-USE_GNUSTEP=	back build gui base
+USE_GNUSTEP=	back base build gui
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD
-CFLAGS+=	-Wno-error=int-conversion
-.endif
-
-post-stage:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/1/libGNUMail.so.1.4.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Colors.prefs/Colors
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Import.bundle/Import
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/PGP.bundle/PGP
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Fonts.prefs/Fonts
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Compose.prefs/Compose
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Filtering.prefs/Filtering
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Viewing.prefs/Viewing
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Sending.prefs/Sending
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Receiving.prefs/Receiving
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Emoticon
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Advanced.prefs/Advanced
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/MIME.prefs/MIME
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/Account.prefs/Account
+post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/GNUMail.app/GNUMail
+.for i in Account Advanced Colors Compose Emoticon Filtering Fonts Import MIME PGP Receiving Sending Viewing
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/ApplicationSupport/GNUMail/${i}.*/${i}
+.endfor
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/${DISTVERSION:R:R}/libGNUMail.so.${DISTVERSION}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/gnumail/pkg-descr b/mail/gnumail/pkg-descr
index 5d6b99584704..828d11ece8fc 100644
--- a/mail/gnumail/pkg-descr
+++ b/mail/gnumail/pkg-descr
@@ -6,5 +6,3 @@ are available.
 
 GNUMail.app was written mostly from scratch though it does use some
 code from elm and mpack/munpack.
-
-LICENSE: GPL2 or later
diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index f6e76074c6a5..b92bb52a3fda 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -1,4 +1,4 @@
-@dir GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/1/Headers
+@dir GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Headers
 GNUstep/System/Applications/GNUMail.app/GNUMail
 GNUstep/System/Applications/GNUMail.app/Resources/AddressBook_32.tiff
 GNUstep/System/Applications/GNUMail.app/Resources/AddressManager_32.tiff
@@ -278,11 +278,11 @@ GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/GN
 GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Resources/Info-gnustep.plist
 GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so
 GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so.%%MAJORVERSION%%
-GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so.1.4.0
+GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/libGNUMail.so.%%VERSION%%
 GNUstep/System/Library/Frameworks/GNUMail.framework/Versions/Current
 GNUstep/System/Library/Frameworks/GNUMail.framework/libGNUMail.so
 GNUstep/System/Library/Headers/GNUMail
 GNUstep/System/Library/Libraries/libGNUMail.so
 GNUstep/System/Library/Libraries/libGNUMail.so.%%MAJORVERSION%%
-GNUstep/System/Library/Libraries/libGNUMail.so.1.4.0
+GNUstep/System/Library/Libraries/libGNUMail.so.%%VERSION%%
 GNUstep/System/Tools/GNUMail


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510302334.59UNYfYg051418>