CVS commit: pkgsrc/mail/claws-mail

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 13 08:44:12 UTC 2021

Modified Files:
        pkgsrc/mail/claws-mail: Makefile
Added Files:
        pkgsrc/mail/claws-mail: options.mk

Log Message:
claws-mail: split options into options.mk, improve COMMENT


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/mail/claws-mail/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/claws-mail/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/claws-mail/Makefile
diff -u pkgsrc/mail/claws-mail/Makefile:1.117 pkgsrc/mail/claws-mail/Makefile:1.118
--- pkgsrc/mail/claws-mail/Makefile:1.117       Mon May 24 19:52:36 2021
+++ pkgsrc/mail/claws-mail/Makefile     Tue Jul 13 08:44:11 2021
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.117 2021/05/24 19:52:36 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2021/07/13 08:44:11 nia Exp $
 
 INSTALLATION_DIRS+=    ${EGDIR}
 INSTALLATION_DIRS+=    share/claws-mail
 
-PKGREVISION= 2
 .include "Makefile.common"
 
 PKGNAME=       claws-mail-${CLAWS_VERSION}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       X based e-mail and netnews client
+COMMENT=       Email client and news reader based on GTK+
 
 CONFLICTS+=    sylpheed-claws-[0-9]*
 
@@ -34,33 +33,6 @@ FACES_IS_INSTALLED!= ${PKG_INFO} -e face
 EGDIR=         ${PREFIX}/share/examples/claws-mail
 CONF_FILES=    ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.claws-mail
-PKG_SUPPORTED_OPTIONS= claws-mail-jpilot ldap inet6
-PKG_SUGGESTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mclaws-mail-jpilot)
-CONFIGURE_ARGS+=       --enable-jpilot
-.  include "../../comms/pilot-link-libs/buildlink3.mk"
-.  include "../../comms/jpilot/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-jpilot
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+=       --enable-ldap
-.  include "../../databases/openldap-client/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-ldap
-.endif
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --enable-ipv6
-.else
-CONFIGURE_ARGS+=       --disable-ipv6
-.endif
-
 INSTALLATION_DIRS+=    share/applications
 
 post-install:
@@ -76,6 +48,7 @@ PLIST_SRC=    PLIST
 PLIST_SRC+=    PLIST.shred
 .endif
 
+.include "options.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Added files:

Index: pkgsrc/mail/claws-mail/options.mk
diff -u /dev/null pkgsrc/mail/claws-mail/options.mk:1.1
--- /dev/null   Tue Jul 13 08:44:12 2021
+++ pkgsrc/mail/claws-mail/options.mk   Tue Jul 13 08:44:11 2021
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2021/07/13 08:44:11 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.claws-mail
+PKG_SUPPORTED_OPTIONS= claws-mail-jpilot ldap inet6
+PKG_SUGGESTED_OPTIONS= inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mclaws-mail-jpilot)
+CONFIGURE_ARGS+=       --enable-jpilot
+.  include "../../comms/pilot-link-libs/buildlink3.mk"
+.  include "../../comms/jpilot/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-jpilot
+.endif
+
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS+=       --enable-ldap
+.  include "../../databases/openldap-client/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-ldap
+.endif
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-ipv6
+.else
+CONFIGURE_ARGS+=       --disable-ipv6
+.endif