Bug 180963 - [Maintainer patch] Upgrade mail/dbmail from 3.1.0 to 3.1.2
Summary: [Maintainer patch] Upgrade mail/dbmail from 3.1.0 to 3.1.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Guido Falsi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-07-31 10:40 UTC by Alan Hicks
Modified: 2013-08-23 23:20 UTC (History)
0 users

See Also:


Attachments
dbmail-310-312.diff (1.38 KB, patch)
2013-07-31 10:40 UTC, Alan Hicks
no flags Details | Diff
dbmail-311-313.diff (1.42 KB, patch)
2013-08-20 09:57 UTC, Alan Hicks
no flags Details | Diff
dbmail.diff (2.10 KB, patch)
2013-08-23 16:49 UTC, Guido Falsi
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alan Hicks 2013-07-31 10:40:00 UTC
    Upgrade dbmail to 3.1.2
    Added build dependency (thanks to Åukasz WÄsikowski)

Fix: Apply patch and add following message to ports/UPDATING

    dbmail has been updated to 3.1.2
    Changes include a minor schema update and config changes see
    share/dbmail/* and share/doc/dbmail/UPGRADING for details
Comment 1 Alan Hicks 2013-08-20 09:57:06 UTC
Bug-fix release 3.1.3 with no new features.
Comment 2 Guido Falsi freebsd_committer freebsd_triage 2013-08-23 16:43:32 UTC
Responsible Changed
From-To: freebsd-ports-bugs->madpilot

I'll take it.
Comment 3 Guido Falsi freebsd_committer freebsd_triage 2013-08-23 16:49:33 UTC
Hi, Before committing this I have two questions.

First of all, is the line "WITH_DEBUG" really required?

Why did you move the BUILD_DEPENDS for the DOCS case outside of the 
conditional? Is this needed to make the port work? could something break 
if it is kept as it is now?

Also, since adding entries to UPDATING is really just for emergencies, 
is the message about reading the UPDATING file strictly needed there 
also for minor updates?

I can add a comment in the commit message or you could add a pkg-message 
file.

While updating your port I'm also going to perform a few technical 
changes (new LIB_DEPENDS format, convert to USES=gmake). I'm attaching a 
patch with what I have done till now.

Thanks in advance.

-- 
Guido Falsi <madpilot@FreeBSD.org>
Comment 4 Guido Falsi freebsd_committer freebsd_triage 2013-08-23 16:50:18 UTC
State Changed
From-To: open->feedback

Ask for submitter fix.
Comment 5 Alan Hicks 2013-08-23 19:38:23 UTC
Hi Guido,

On 23/08/2013 16:49, Guido Falsi wrote:
> Hi, Before committing this I have two questions.
>
> First of all, is the line "WITH_DEBUG" really required?
No, neither is -DDEBUG in CFLAGS, thanks for identifying those redundant 
entries.

>
> Why did you move the BUILD_DEPENDS for the DOCS case outside of the
> conditional? Is this needed to make the port work? could something break
> if it is kept as it is now?
Whilst helping ÃÂukasz WÃÂsikowski with an issue he discovered that 
creating the man pages requires docbook 4.5 schema.
So building the application requires both xmlto and docbook 4.5 as man 
pages are part of the application not just documentation.

>
> Also, since adding entries to UPDATING is really just for emergencies,
> is the message about reading the UPDATING file strictly needed there
> also for minor updates?
On reflection probably not, it's a small update to a schema file.

>
> I can add a comment in the commit message or you could add a pkg-message
> file.
No need.
>
> While updating your port I'm also going to perform a few technical
> changes (new LIB_DEPENDS format, convert to USES=gmake). I'm attaching a
> patch with what I have done till now.
Please go ahead, I hadn't noticed USES=gmake and look forward to using 
the new LIB_DEPENDS.
>
> Thanks in advance.
>
Thanks,
Alan
Comment 6 Guido Falsi freebsd_committer freebsd_triage 2013-08-23 23:07:45 UTC
State Changed
From-To: feedback->open

Maintainer has approved.
Comment 7 Guido Falsi freebsd_committer freebsd_triage 2013-08-23 23:10:15 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 8 dfilter service freebsd_committer freebsd_triage 2013-08-23 23:10:16 UTC
Author: madpilot
Date: Fri Aug 23 22:10:03 2013
New Revision: 325282
URL: http://svnweb.freebsd.org/changeset/ports/325282

Log:
  - Update to 3.1.3
  - Remove uneeded DEBUG flags
  - Convert to new LIB_DEPENDS format
  - Convert to USES=gmake
  
  Check share/doc/dbmail/UPGRADING for updating details.
  
  PR:		ports/180963
  Submitted by:	Alan Hicks <ahicks@p-o.co.uk> (maintainer)

Modified:
  head/mail/dbmail/Makefile
  head/mail/dbmail/distinfo   (contents, props changed)

Modified: head/mail/dbmail/Makefile
==============================================================================
--- head/mail/dbmail/Makefile	Fri Aug 23 21:33:59 2013	(r325281)
+++ head/mail/dbmail/Makefile	Fri Aug 23 22:10:03 2013	(r325282)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dbmail
-PORTVERSION=	3.1.1
+PORTVERSION=	3.1.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/3.1/
 
@@ -11,10 +11,14 @@ COMMENT=	SQL database-based mail system 
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gmime-2.6:${PORTSDIR}/mail/gmime26 \
-		zdb:${PORTSDIR}/databases/libzdb \
-		mhash:${PORTSDIR}/security/mhash \
-		event-2:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
+		libzdb.so:${PORTSDIR}/databases/libzdb \
+		libmhash.so:${PORTSDIR}/security/mhash \
+		libevent-2.0.so:${PORTSDIR}/devel/libevent2
+
+BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc \
+		xmlto:${PORTSDIR}/textproc/xmlto \
+		${LOCALBASE}/share/sgml/docbook/4.5:${PORTSDIR}/textproc/docbook-450
 
 CONFLICTS=	dbmail-2.*
 
@@ -24,21 +28,14 @@ SIEVE_DESC=	Build with support for Sieve
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		xmlto:${PORTSDIR}/textproc/xmlto
-.endif
-
 USE_AUTOTOOLS=	libtool autoheader autoconf
-USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
 USE_OPENSSL=	yes
-USES=	shebangfix
+USES=		gmake shebangfix
 SHEBANG_FILES=	man/fixsp.pl
-WITH_DEBUG=	yes
 
-CFLAGS+=	-fPIC ${PTHREAD_CFLAGS} -DDEBUG
+CFLAGS+=	-fPIC ${PTHREAD_CFLAGS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--with-zdb=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
@@ -69,7 +66,7 @@ PLIST_SUB+=	PORTDOCS=""
 
 .if ${PORT_OPTIONS:MSIEVE}
 CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}
-LIB_DEPENDS+=	sieve:${PORTSDIR}/mail/libsieve
+LIB_DEPENDS+=	libsieve.so:${PORTSDIR}/mail/libsieve
 PLIST_SUB+=	SIEVE=""
 .else
 CONFIGURE_ARGS+=--without-sieve

Modified: head/mail/dbmail/distinfo
==============================================================================
--- head/mail/dbmail/distinfo	Fri Aug 23 21:33:59 2013	(r325281)
+++ head/mail/dbmail/distinfo	Fri Aug 23 22:10:03 2013	(r325282)
@@ -1,2 +1,2 @@
-SHA256 (dbmail-3.1.1.tar.gz) = 4df9f3a8d13af3a5f41dfab480f89a9e338b025e36e42cb76dc4f34b242ac1e0
-SIZE (dbmail-3.1.1.tar.gz) = 2398581
+SHA256 (dbmail-3.1.3.tar.gz) = 508d288f3c5690387eeed94669f96cbd4cc686066bfd4cb9a5f97ec63c7ca304
+SIZE (dbmail-3.1.3.tar.gz) = 2392630
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"