Index: Makefile
===================================================================
--- Makefile	(revision 383387)
+++ Makefile	(working copy)
@@ -3,14 +3,15 @@
 
 PORTNAME=	avrdude
 PORTVERSION=	6.1
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	avrdude
+MASTER_SITES=	SAVANNAH/avrdude
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Program for programming the on-chip memory of Atmel AVR CPUs
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -17,4 +18,17 @@
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
+OPTIONS_DEFINE=	FTDI
+OPTIONS_DEFAULT=	FTDI
+FTDI_DESC=	libftdi support
+FTDI_LIB_DEPENDS=	libftdi1.so:${PORTSDIR}/devel/libftdi1
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lusb-1.0|-lusb|g' ${WRKSRC}/configure
+.if ! ${PORT_OPTIONS:MFTDI}
+	@${REINPLACE_CMD} -e '/LIBS=/ s|-lftdi1*|&-do-not-detect|' ${WRKSRC}/configure
+.endif
+
 .include <bsd.port.mk>