Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Feb 2005 18:53:08 +0100
From:      "Miguel Mendez" <flynn@energyhq.es.eu.org>
To:        "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject:   ports/78155: OPTIONS'ify mail/sylpheed2
Message-ID:  <1109526788.0@scienide.energyhq.es.eu.org>
Resent-Message-ID: <200502271800.j1RI0O6o035649@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         78155
>Category:       ports
>Synopsis:       OPTIONS'ify mail/sylpheed2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 27 18:00:24 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Miguel Mendez
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:


System: FreeBSD 5.3-STABLE #0: Tue Feb  8 13:02:32 CET 2005
    root@scienide.energyhq.es.eu.org:/usr/src/sys/i386/compile/SCIENIDE.SMP



>Description:


This port can be trivially OPTIONS'ified. I've set the defaults to off like
sylpheed-gtk2, but maintainer is of course free to leave any of them
enabled.


>How-To-Repeat:





>Fix:


--- sylpheed2.diff begins here ---
diff -ruN sylpheed2.old/Makefile sylpheed2/Makefile
--- sylpheed2.old/Makefile	Mon Feb 21 12:49:57 2005
+++ sylpheed2/Makefile	Sun Feb 27 18:43:07 2005
@@ -40,12 +40,20 @@
 
 CONFLICTS=	sylpheed-1.[0-8]* sylpheed-gtk2-[0-9]*
 
-.if !defined(WITHOUT_SSL)
-USE_OPENSSL=	yes
-.endif
+OPTIONS=	GPGME		"Enable GnuPG support using GPGME." off \
+		COMPFACE	"Enable X-Face support." off \
+		JPILOT		"Enable JPilot support." off \
+		LDAP		"Enable LDAP support." off \
+		SSL		"Enable OpenSSL support." off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_SSL)
+# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+CONFIGURE_ARGS+=--enable-ssl
+.endif
+
 .if defined(WITH_GPGME)
 LIB_DEPENDS+=	gpgme.14:${PORTSDIR}/security/gpgme
 RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
@@ -82,18 +90,6 @@
 		faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \
 		faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \
 		manual/ja/Makefile.in src/Makefile.in
-
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "      WITH_GPGME=yes    Enable GnuPG support using GPGME."
-	@${ECHO} "      WITH_COMPFACE=yes Enable X-Face support."
-	@${ECHO} "      WITH_JPILOT=yes   Enable JPilot support."
-	@${ECHO} "      WITH_LDAP=yes     Enable LDAP support."
-	@${ECHO} ""
-	@${ECHO} "      WITHOUT_SSL=yes   Disable OpenSSL support."
-	@${ECHO} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
--- sylpheed2.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



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