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"