diff --git a/Makefile b/Makefile
index 536b6863ea3..efea3b37093 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 1999/07/27 21:56:35 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2000/02/21 22:09:57 turan Exp $
 # $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
 #
 
@@ -53,6 +53,10 @@ ${.CURDIR}/INDEX:
 print-index:	${.CURDIR}/INDEX
 	@awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9); }' < ${.CURDIR}/INDEX
 
+print-licenses: ${.CURDIR}/INDEX
+	@printf "Port                                    P-CD\tP-FTP\tD-CD\tD-FTP\tL-Type\n"
+	@awk -F\| '{printf("%-35.35s\t%s\t%s\t%s\t%s\t%s\n",$$2,$$11,$$12,$$13,$$14,$$15);}' < ${.CURDIR}/INDEX
+
 search:	${.CURDIR}/INDEX
 .if !defined(key)
 	@echo "The search target requires a keyword parameter,"
diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index f3fbae2aea0..43b1ee359d4 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.204 2000/02/20 17:05:40 espie Exp $$
+FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.205 2000/02/21 22:09:58 turan Exp $$
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@@ -1966,10 +1966,54 @@ describe:
 .endif
 	@echo -n "|"
 	@if [ "${ONLY_FOR_ARCHS}" = "" ]; then \
-		echo "any"; \
+		echo -n "any|"; \
 	else \
-		echo "${ONLY_FOR_ARCHS}"; \
+		echo -n "${ONLY_FOR_ARCHS}|"; \
 	fi
+
+.	if defined(PERMIT_PACKAGE_CDROM)
+		@if [ ${PERMIT_PACKAGE_CDROM:L} == "yes" ]; then \
+			echo -n "y|"; \
+		else \
+			echo -n "n|"; \
+		fi
+.	else
+		@echo -n "|"
+.	endif	
+
+.	if defined(PERMIT_PACKAGE_FTP)
+		@if [ ${PERMIT_PACKAGE_FTP:L} == "yes" ]; then \
+			echo -n "y|"; \
+		else \
+			echo -n "n|"; \
+		fi
+.	else
+		@echo -n "|"
+.	endif	
+
+
+.	if defined(PERMIT_DISTFILES_CDROM)
+		@if [ ${PERMIT_DISTFILES_CDROM:L} == "yes" ]; then \
+			echo -n "y|"; \
+		else \
+			echo -n "n|"; \
+		fi
+.	else
+		@echo -n "|"
+.	endif	
+
+
+.	if defined(PERMIT_DISTFILES_CDROM)
+		@if [ ${PERMIT_DISTFILES_FTP:L} == "yes" ]; then \
+			echo -n "y|"; \
+		else \
+			echo -n "n|"; \
+		fi
+.	else
+		@echo -n "|"
+.	endif	
+	@echo "${LICENSE_TYPE}"
+
 .endif
 
 README.html: