Index: head/net-mgmt/bgpq/Makefile
===================================================================
--- head/net-mgmt/bgpq/Makefile	(revision 421834)
+++ head/net-mgmt/bgpq/Makefile	(revision 421835)
@@ -1,17 +1,21 @@
 # Created by: Alexandre Snarskii <snar@paranoia.ru>
 # $FreeBSD$
 
 PORTNAME=	bgpq
 PORTVERSION=	1.0.9.9
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://snar.spb.ru/prog/bgpq/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bgpq - lightweight access-list generator for Cisco routers
 
-PLIST_FILES=	bin/bgpq man/man8/bgpq.8.gz
+LICENSE=	BSD2CLAUSE BSD4CLAUSE # latter for utils.c
+LICENSE_COMB=	multi
+LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/COPYRIGHT
 
+USES=		tar:tgz
 GNU_CONFIGURE=	yes
+
+PLIST_FILES=	bin/bgpq man/man8/bgpq.8.gz
 
 .include <bsd.port.mk>
Index: head/net-mgmt/bgpq/files/patch-Makefile.in
===================================================================
--- head/net-mgmt/bgpq/files/patch-Makefile.in	(revision 421834)
+++ head/net-mgmt/bgpq/files/patch-Makefile.in	(revision 421835)
@@ -1,13 +1,13 @@
 --- Makefile.in.orig	2005-04-05 20:44:00.000000000 +0800
 +++ Makefile.in	2014-06-20 16:47:42.798934507 +0800
 @@ -25,8 +25,8 @@ clean:
  	@rm -f config.cache 
  
  install: bgpq
 -	$(INSTALL) -s -m 755 bgpq @prefix@@bindir@
 -	$(INSTALL) -m 644 bgpq.8 @prefix@@mandir@/man8
-+	$(INSTALL) -s -m 755 bgpq $(DESTDIR)@prefix@@bindir@
-+	$(INSTALL) -m 644 bgpq.8 $(DESTDIR)@mandir@/man8
++	$(BSD_INSTALL_PROGRAM) bgpq $(DESTDIR)@prefix@@bindir@
++	$(BSD_INSTALL_MAN) bgpq.8 $(DESTDIR)@mandir@/man8
  
  test: bgpq
  	@rm -f test.out ]
Index: head/net-mgmt/bgpq/pkg-descr
===================================================================
--- head/net-mgmt/bgpq/pkg-descr	(revision 421834)
+++ head/net-mgmt/bgpq/pkg-descr	(revision 421835)
@@ -1,9 +1,8 @@
-
 This program is a lightweight access- and prefix-list generator
 for Cisco routers and GateD/Zebra. Access lists are generated
 based on RADB/RIPE data.
 
 This tool is not so powerful as RAToolSet, but has some
 features missing in RAToolSet, such as optional filtering
 of more specific routes in the same AS or acl string aggregation;
 also, it does not requires Tcl/Tk to be installed.