From db@db.net  Wed Nov 29 20:38:27 2006
Return-Path: <db@db.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6DE7216A531
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 29 Nov 2006 20:38:27 +0000 (UTC)
	(envelope-from db@db.net)
Received: from diana.db.net (diana.db.net [204.228.225.212])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3C68843DF7
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 29 Nov 2006 20:35:34 +0000 (GMT)
	(envelope-from db@db.net)
Received: from db by diana.db.net with local (Exim 4.63 (FreeBSD))
	(envelope-from <db@db.net>)
	id 1GpW8V-000JZK-Dl
	for FreeBSD-gnats-submit@freebsd.org; Wed, 29 Nov 2006 13:34:31 -0700
Message-Id: <E1GpW8V-000JZK-Dl@diana.db.net>
Date: Wed, 29 Nov 2006 13:34:31 -0700
From: Diane Bruce <db@db.net>
Sender: Diane Bruce <db@diana.db.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] comms/tlf: Add hamlib support via options
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         106031
>Category:       ports
>Synopsis:       [MAINTAINER] comms/tlf: Add hamlib support via options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    laszlof
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 29 20:40:22 GMT 2006
>Closed-Date:    Mon Dec 04 16:49:01 GMT 2006
>Last-Modified:  Mon Dec  4 17:00:28 GMT 2006
>Originator:     Diane Bruce
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
none
>Environment:
System: FreeBSD diana.db.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Sat Oct 14 14:44:56 MDT 2006
>Description:
[DESCRIBE CHANGES]

Added file(s):
- files/patch-configure.in

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- tlf-0.9.30_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/comms/tlf/Makefile /usr/home/db/ports/tlf/Makefile
--- /usr/ports/comms/tlf/Makefile	Fri Oct 13 20:53:25 2006
+++ /usr/home/db/ports/tlf/Makefile	Wed Nov 29 05:46:33 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	tlf
 PORTVERSION=	0.9.30
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.wwns.com/tlf/ \
 		http://sharon.esrac.ele.tue.nl/pub/linux/ham/tlf/
@@ -15,9 +16,20 @@
 MAINTAINER=	db@db.net
 COMMENT=	Amateur Radio curses based logging program
 
+USE_AUTOTOOLS=	autoconf:259 libtool:15 aclocal:19 automake:19
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
+		--libdir="${LOCALBASE}/lib"
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+OPTIONS=	HAMLIB "Use hamlib" ON
 
 MAN1=		tlf.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_HAMLIB)
+LIB_DEPENDS+=	hamlib:${PORTSDIR}/comms/hamlib
+CONFIGURE_ARGS+=	--enable-hamlib
+.endif
+
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/comms/tlf/files/patch-configure.in /usr/home/db/ports/tlf/files/patch-configure.in
--- /usr/ports/comms/tlf/files/patch-configure.in	Wed Dec 31 17:00:00 1969
+++ /usr/home/db/ports/tlf/files/patch-configure.in	Tue Nov 21 12:23:52 2006
@@ -0,0 +1,30 @@
+--- configure.in.orig	Wed Apr  5 03:22:01 2006
++++ configure.in	Tue Nov 21 14:23:37 2006
+@@ -8,6 +8,10 @@
+ AC_PROG_INSTALL
+ AC_PROG_AWK
+ 
++CPPFLAGS="-I${includedir}"
++LDFLAGS="-L${libdir}"
++LIBS="-L${libdir} ${LIBS}"
++
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/ioctl.h unistd.h])
+@@ -22,6 +26,7 @@
+ #AC_CHECK_LIB(hamlib,main,,AC_MSG_ERROR([Hamradio control libraries (hamlib) not found! ABORTED!]))
+ #AC_CHECK_HEADERS(hamlib/rig.h hamlib/riglist.h,,AC_MSG_ERROR([hamlib header(s) not found! ABORTED]))
+ 
++
+ dnl Check if we want to link the Hamradio control libraries (hamlib)
+ AC_ARG_ENABLE([hamlib],
+ [ --enable-hamlib  Add support for hamradio control libraries],
+@@ -33,7 +38,7 @@
+ [wanthamlib=false])
+ 
+ if test "x${wanthamlib}" != "xfalse"; then
+-	AC_CHECK_LIB(hamlib,main,,AC_MSG_ERROR([Hamradio control libraries not found...]))
++	AC_CHECK_LIB(hamlib,rig_init,,AC_MSG_ERROR([Hamradio control libraries not found...]))
+ 	AC_CHECK_HEADERS(hamlib/rig.h,,AC_MSG_ERROR([Hamlib headers not found...]))
+ 	AC_DEFINE([WANT_HAMLIB], 1, [Want Hamlib])
+ 	echo "enabling hamlib support"
--- tlf-0.9.30_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->xride 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Nov 29 20:40:35 UTC 2006 
Responsible-Changed-Why:  
xride@ wants his PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106031 
Responsible-Changed-From-To: xride->laszlof 
Responsible-Changed-By: laszlof 
Responsible-Changed-When: Sun Dec 3 17:02:29 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106031 
State-Changed-From-To: open->closed 
State-Changed-By: laszlof 
State-Changed-When: Mon Dec 4 16:49:00 UTC 2006 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/106031: commit references a PR
Date: Mon,  4 Dec 2006 16:51:32 +0000 (UTC)

 laszlof     2006-12-04 16:48:49 UTC
 
   FreeBSD ports repository
 
   Modified files:
     comms/tlf            Makefile 
   Added files:
     comms/tlf/files      patch-configure.in 
   Log:
   Support OPTIONS framework and add a patch to fix configure script (patch submitted upstream)
   
   PR:             ports/106031
   Submitted by:   Diane Bruce <db@db.net> (maintainer)
   
   Revision  Changes    Path
   1.5       +15 -1     ports/comms/tlf/Makefile
   1.1       +30 -0     ports/comms/tlf/files/patch-configure.in (new)
 _______________________________________________
 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:
