===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.36
retrieving revision 1.85
diff -u -r1.36 -r1.85
--- ports/Makefile	2001/11/22 16:06:27	1.36
+++ ports/Makefile	2018/12/08 10:29:12	1.85
@@ -1,20 +1,29 @@
-# $OpenBSD: Makefile,v 1.36 2001/11/22 16:06:27 naddy Exp $
-# $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
-#
+# $OpenBSD: Makefile,v 1.85 2018/12/08 10:29:12 espie Exp $
 
-PKGPATH=
-.if defined(key) || defined(category) || defined(author)
+.if !defined(BSD_OWN_MK)
+.  include <bsd.own.mk>
+.endif
 
+PKGPATH =
+DISTFILES_DB ?= ${.CURDIR}/infrastructure/db/locate.database
+INDEX = ${LOCALBASE}/share/ports-INDEX
+
+.if defined(SUBDIR)
+# nothing to do
+.elif !make(search) && (defined(key) || defined(name) || defined(category) || defined(author))
 # set up subdirs from the index, assume it's up-to-date
-_CMD=perl ${.CURDIR}/infrastructure/build/index-retrieve index='${.CURDIR}/INDEX'
+_CMD = perl ${.CURDIR}/infrastructure/bin/port-search-helper index='${INDEX}'
 .  if defined(key)
-_CMD+=key='${key}'
+_CMD += key='${key}'
 .  endif
+.  if defined(name)
+_CMD += maintainer='${name}'
+.  endif
 .  if defined(category)
-_CMD+=category='${category}'
+_CMD += category='${category}'
 .  endif
 .  if defined(maintainer)
-_CMD+=maintainer='${maintainer}'
+_CMD += maintainer='${maintainer}'
 .  endif
 SUBDIR != ${_CMD}
 .elif defined(SUBDIRLIST)
@@ -24,6 +33,8 @@
 SUBDIR += astro
 SUBDIR += audio
 SUBDIR += benchmarks
+SUBDIR += biology
+SUBDIR += books
 SUBDIR += cad
 SUBDIR += chinese
 SUBDIR += comms
@@ -33,81 +44,75 @@
 SUBDIR += editors
 SUBDIR += education
 SUBDIR += emulators
+SUBDIR += fonts
 SUBDIR += games
-#SUBDIR += german
+SUBDIR += geo
 SUBDIR += graphics
+SUBDIR += inputmethods
 SUBDIR += japanese
 SUBDIR += java
 SUBDIR += korean
 SUBDIR += lang
 SUBDIR += mail
 SUBDIR += math
-SUBDIR += mbone
+SUBDIR += meta
 SUBDIR += misc
+SUBDIR += multimedia
 SUBDIR += net
 SUBDIR += news
-SUBDIR += palm
 SUBDIR += plan9
 SUBDIR += print
 SUBDIR += productivity
-SUBDIR += russian
 SUBDIR += security
 SUBDIR += shells
 SUBDIR += sysutils
+SUBDIR += telephony
 SUBDIR += textproc
-#SUBDIR += vietnamese
 SUBDIR += www
 SUBDIR += x11
-.  if exists(mystuff) && !make(describe)
-SUBDIR += mystuff
-.  endif
 .endif
 
-PORTSTOP?=	yes
-
 .include <bsd.port.subdir.mk>
 
-index:
-	@rm -f ${.CURDIR}/INDEX
-	@${MAKE} ${.CURDIR}/INDEX
+${INDEX}:
+	@echo "Please install portslist"
+	@echo "${SUDO} pkg_add portslist"
+	@exit 1
 
-${.CURDIR}/INDEX:
-	@echo "Generating INDEX..."
-	@${MAKE} describe ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
-	@echo "Done."
 
-print-index:	${.CURDIR}/INDEX
-	@awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nL-deps:\t%s\nB-deps:\t%s\nR-deps:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }' < ${.CURDIR}/INDEX
+print-index:	${INDEX}
+	@awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nL-deps:\t%s\nB-deps:\t%s\nR-deps:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }' < ${INDEX}
 
-print-licenses: ${.CURDIR}/INDEX
+print-licenses: ${INDEX}
 	@printf "Port                                    PC PF DC DF Maint\n"
-	@awk -F\| '{printf("%-40.39s%-3.2s%-3.2s%-3.2s%-3.2s%-25.25s\n",$$2,$$12,$$13,$$14,$$15,$$6);}' < ${.CURDIR}/INDEX
+	@awk -F\| '{printf("%-40.39s%-3.2s%-3.2s%-3.2s%-3.2s%-25.25s\n",$$2,$$12,$$13,$$14,$$15,$$6);}' < ${INDEX}
 
-search:	${.CURDIR}/INDEX
-.if !defined(key)
-	@echo "The search target requires a keyword parameter,"
-	@echo "e.g.: \"make search key=somekeyword\""
+search:	${INDEX}
+.if !defined(key) && !defined(name)
+	@echo "The search target requires a keyword or name parameter,"
+	@echo "e.g.: \"make search key=somekeyword\" \"make search name=somename\""
 .else
-	@egrep -i "${key}" ${.CURDIR}/INDEX | awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nL-deps:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArchs:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10, $$11); }'
+.  if defined(key)
+	@egrep -i -- "${key}" ${INDEX} | awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nL-deps:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArchs:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10, $$11); }'
+.  else
+	@awk -F\| '$$1 ~ /${name}/ { printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nL-deps:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArchs:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10, $$11); }' ${INDEX}
+.  endif
 .endif
 
+fix-permissions:
+	@{ echo "DUMMY_PACKAGE=Yes"; \
+	echo ".include <bsd.port.mk>"; }|${MAKE} -f - fix-permissions
 
-MIRROR_MK?= ${.CURDIR}/distfiles/Makefile
+distfiles-update-locatedb:
+	@PORTSDIR=${.CURDIR} /bin/sh ${.CURDIR}/infrastructure/fetch/distfiles-update-locatedb ${DISTFILES_DB}
 
-mirror-maker:
-	@mkdir -p ${MIRROR_MK:H}
-# Indirection needed for broken OSes that don't grok this exec
-	@echo "EXEC=exec" >${MIRROR_MK}
-	@echo "default:: ftp cdrom" >>${MIRROR_MK}
-	@echo ".PHONY: default all ftp cdrom" >>${MIRROR_MK}
-	@${MAKE} fetch-makefile \
-		ECHO_MSG='echo >&2' \
-		>>${MIRROR_MK}
+create_DEPENDS_CACHE:
+	@${_mk_DEPENDS_CACHE}; echo $${_DEPENDS_CACHE}
 
-DISTFILES_DB?=${.CURDIR}/infrastructure/db/locate.database
+destroy_DEPENDS_CACHE:
+	@${_PBUILD} rm -rf 2>/dev/null $${_DEPENDS_CACHE}
 
-distfiles-update-locatedb:
-	@PORTSDIR=${.CURDIR} /bin/sh ${.CURDIR}/infrastructure/fetch/distfiles-update-locatedb ${DISTFILES_DB}
 
-.PHONY: mirror-maker index search distfiles-update-locatedb \
-	print-licenses print-index
+.PHONY: index search distfiles-update-locatedb \
+	print-licenses print-index fix-permissions \
+	create_DEPENDS_CACHE destroy_DEPENDS_CACHE