diff -urN /usr/ports/comms/lirc/Makefile comms/lirc/Makefile
--- /usr/ports/comms/lirc/Makefile	Mon Oct 13 08:38:51 2003
+++ comms/lirc/Makefile	Sun Nov 30 23:24:47 2003
@@ -7,6 +7,7 @@
 
 PORTNAME=	lirc
 PORTVERSION=	0.6.6
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lirc
@@ -14,12 +15,12 @@
 MAINTAINER=	mikeh@FreeBSD.org
 COMMENT=	Linux Infared Remote Control
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
 USE_XLIB=	yes
+USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-driver=any --disable-manage-devices
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--with-driver=any --disable-manage-devices
 
 MAN1=		irexec.1 ircat.1 irpty.1 irrecord.1 irw.1 irxevent.1 \
 		mode2.1 smode2.1 xmode2.1 rc.1
diff -urN /usr/ports/comms/lirc/files/patch-ab comms/lirc/files/patch-ab
--- /usr/ports/comms/lirc/files/patch-ab	Mon Oct  6 10:31:49 2003
+++ comms/lirc/files/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,40 +0,0 @@
---- daemons/Makefile.in.orig	Sun Oct  6 05:24:53 2002
-+++ daemons/Makefile.in	Sat Jan  4 21:28:01 2003
-@@ -231,7 +231,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -L$(LOCALBASE)/lib -lgnugetopt
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/config_file.Po \
- @AMDEP_TRUE@	$(DEPDIR)/dump_config.Po $(DEPDIR)/hw-types.Po \
-@@ -265,7 +265,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -I$(LOCALBASE)/include
- DIST_SOURCES = $(irrecord_SOURCES) $(EXTRA_irrecord_SOURCES) \
- 	$(lircd_SOURCES) $(EXTRA_lircd_SOURCES) $(lircd_simrec_SOURCES) \
- 	$(lircd_simsend_SOURCES) $(lircmd_SOURCES) $(slinke_SOURCES)
---- tools/Makefile.in.orig	Sat Jan  4 22:02:21 2003
-+++ tools/Makefile.in	Sat Jan  4 22:03:09 2003
-@@ -192,7 +192,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -L$(LOCALBASE)/lib -lgnugetopt
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ircat.Po $(DEPDIR)/irexec.Po \
- @AMDEP_TRUE@	$(DEPDIR)/irpty.Po $(DEPDIR)/irw.Po \
-@@ -206,7 +206,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -I$(LOCALBASE)/include
- DIST_SOURCES = $(liblirc_client_la_SOURCES) $(ircat_SOURCES) \
- 	$(irexec_SOURCES) $(irpty_SOURCES) $(irw_SOURCES) \
- 	$(irxevent_SOURCES) $(mode2_SOURCES) $(rc_SOURCES) \
diff -urN /usr/ports/comms/lirc/files/patch-configure comms/lirc/files/patch-configure
--- /usr/ports/comms/lirc/files/patch-configure	Thu Jan  1 09:00:00 1970
+++ comms/lirc/files/patch-configure	Sun Nov 30 23:27:16 2003
@@ -0,0 +1,19 @@
+--- configure.orig	Sun Oct  6 18:22:41 2002
++++ configure	Sun Nov 30 23:26:58 2003
+@@ -1495,8 +1495,6 @@
+ 
+ 		    		    		    ac_config_headers="$ac_config_headers config.h"
+ 
+-CFLAGS="-O2 -g -Wall"
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -6753,6 +6751,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff -urN /usr/ports/comms/lirc/pkg-plist comms/lirc/pkg-plist
--- /usr/ports/comms/lirc/pkg-plist	Mon Oct  6 10:31:49 2003
+++ comms/lirc/pkg-plist	Sun Nov 30 23:28:20 2003
@@ -10,7 +10,6 @@
 include/lirc/lirc_client.h
 @dirrm include/lirc
 lib/liblirc_client.a
-lib/liblirc_client.la
 lib/liblirc_client.so
 lib/liblirc_client.so.0
 sbin/lircd