===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.68
retrieving revision 1.77
diff -u -r1.68 -r1.77
--- ports/Makefile	2012/03/09 10:57:54	1.68
+++ ports/Makefile	2018/07/09 13:48:16	1.77
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.68 2012/03/09 10:57:54 espie Exp $
-# $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
-#
+# $OpenBSD: Makefile,v 1.77 2018/07/09 13:48:16 espie Exp $
 
+.if !defined(BSD_OWN_MK)
+.  include <bsd.own.mk>
+.endif
+
 PKGPATH =
 MIRROR_MK ?= ${.CURDIR}/distfiles/Makefile
-PORTSTOP ?= yes
 DISTFILES_DB ?= ${.CURDIR}/infrastructure/db/locate.database
 
 .if defined(SUBDIR)
@@ -12,7 +13,7 @@
 .elif defined(key) || defined(name) || defined(category) || defined(author)
 
 # set up subdirs from the index, assume it's up-to-date
-_CMD = perl ${.CURDIR}/infrastructure/bin/retrieve-index index='${.CURDIR}/INDEX'
+_CMD = perl ${.CURDIR}/infrastructure/bin/port-search-helper index='${.CURDIR}/INDEX'
 .  if defined(key)
 _CMD += key='${key}'
 .  endif
@@ -60,11 +61,9 @@
 SUBDIR += multimedia
 SUBDIR += net
 SUBDIR += news
-SUBDIR += palm
 SUBDIR += plan9
 SUBDIR += print
 SUBDIR += productivity
-SUBDIR += russian
 SUBDIR += security
 SUBDIR += shells
 SUBDIR += sysutils
@@ -78,11 +77,11 @@
 
 index:
 	@rm -f ${.CURDIR}/INDEX
-	@${_MAKE} ${.CURDIR}/INDEX
+	@${_MAKE} USE_CCACHE=No ${.CURDIR}/INDEX
 
 ${.CURDIR}/INDEX:
 	@echo "Generating INDEX..."
-	@${_MAKE} describe MACHINE_ARCH=i386 ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
+	@${_MAKE} describe MACHINE_ARCH=amd64 ARCH=amd64 ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
 	@echo "Done."
 
 print-index:	${.CURDIR}/INDEX