From nobody@FreeBSD.org  Sat Jan 21 14:16:50 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ADD44106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 21 Jan 2012 14:16:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D0B78FC15
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 21 Jan 2012 14:16:50 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q0LEGoiB074833
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 21 Jan 2012 14:16:50 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q0LEGo5n074832;
	Sat, 21 Jan 2012 14:16:50 GMT
	(envelope-from nobody)
Message-Id: <201201211416.q0LEGo5n074832@red.freebsd.org>
Date: Sat, 21 Jan 2012 14:16:50 GMT
From: Geoff Garside <freebsd@geoffgarside.co.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] irc/inspircd Makefile fixes
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         164352
>Category:       ports
>Synopsis:       [patch] irc/inspircd Makefile fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 21 14:20:09 UTC 2012
>Closed-Date:    Wed Jan 25 20:34:31 UTC 2012
>Last-Modified:  Wed Jan 25 20:40:00 UTC 2012
>Originator:     Geoff Garside
>Release:        8.2
>Organization:
>Environment:
>Description:
The irc/inspircd Makefile is currently missing the INSPIRCD_LOG and INSPIRCD_RUN  variables in the SUB_PLIST which results in a malformed etc/rc.d/inspircd file.

Additionally when built with the GNUTLS option enabled the port fails to build due to a missing libgcrypt dependency for the m_ssl_gnutls.cpp file.

I've left the option of bumping the port revision to the committer as no actual source changes have been made.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/irc/inspircd/Makefile inspircd/Makefile
--- /usr/ports/irc/inspircd/Makefile	2011-07-24 19:24:47.000000000 +0100
+++ inspircd/Makefile	2012-01-21 01:29:06.000000000 +0000
@@ -31,6 +31,8 @@
 SUB_LIST+=	PORTNAME=${PORTNAME}         \
 		INSPIRCD_USR=${INSPIRCD_USR} \
 		INSPIRCD_GRP=${INSPIRCD_GRP} \
+		INSPIRCD_LOG=${INSPIRCD_LOG} \
+		INSPIRCD_RUN=${INSPIRCD_RUN}
 PLIST_SUB+=	INSPIRCD_GRP=${INSPIRCD_GRP}
 SUB_FILES+=	pkg-deinstall
 
@@ -90,7 +92,8 @@
 .endif
 
 .if defined(WITH_GNUTLS) && !defined(WITHOUT_GNUTLS)
-LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls \
+		gcrypt.18:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=	--enable-gnutls
 PLIST_SUB+=	GNUTLS=""
 .else


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Mon Jan 23 20:58:01 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164352 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Wed Jan 25 20:34:28 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164352 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/164352: commit references a PR
Date: Wed, 25 Jan 2012 20:34:26 +0000 (UTC)

 pawel       2012-01-25 20:34:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     irc/inspircd         Makefile 
   Log:
   - Add INSPIRCD_LOG and INSPIRCD_RUN substitution patterns for
     etc/rc.d/inspircd file to fix service starting
   - WITH_GNUTLS option needs security/libgcrypt to work
   
   PR:             ports/164352
   Submitted by:   Geoff Garside <freebsd@geoffgarside.co.uk>
   
   Revision  Changes    Path
   1.19      +4 -1      ports/irc/inspircd/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
