===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.68
diff -u -r1.1.1.1 -r1.68
--- ports/Makefile	2009/02/09 14:42:32	1.1.1.1
+++ ports/Makefile	2012/03/09 10:57:54	1.68
@@ -1,46 +1,120 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/02/09 14:42:32 form Exp $
-# $RuOBSD: Makefile,v 1.4 2009/02/07 10:28:55 form Exp $
+# $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 $
+#
 
-ONLY_FOR_ARCHS=		amd64 i386
+PKGPATH =
+MIRROR_MK ?= ${.CURDIR}/distfiles/Makefile
+PORTSTOP ?= yes
+DISTFILES_DB ?= ${.CURDIR}/infrastructure/db/locate.database
 
-COMMENT=		thorough, stand alone memory test
-VERSION=		2.11
-DISTNAME=		memtest86+-${VERSION}
-CATEGORIES=		sysutils
+.if defined(SUBDIR)
+# nothing to do
+.elif defined(key) || defined(name) || defined(category) || defined(author)
 
-HOMEPAGE=		http://www.memtest.org
+# set up subdirs from the index, assume it's up-to-date
+_CMD = perl ${.CURDIR}/infrastructure/bin/retrieve-index index='${.CURDIR}/INDEX'
+.  if defined(key)
+_CMD += key='${key}'
+.  endif
+.  if defined(name)
+_CMD += maintainer='${name}'
+.  endif
+.  if defined(category)
+_CMD += category='${category}'
+.  endif
+.  if defined(maintainer)
+_CMD += maintainer='${maintainer}'
+.  endif
+SUBDIR != ${_CMD}
+.elif defined(SUBDIRLIST)
+SUBDIR != sed -e 's,[ 	]*\#.*,,' -e '/^[ 	]*$$/d' ${SUBDIRLIST}
+.else
+SUBDIR += archivers
+SUBDIR += astro
+SUBDIR += audio
+SUBDIR += benchmarks
+SUBDIR += biology
+SUBDIR += books
+SUBDIR += cad
+SUBDIR += chinese
+SUBDIR += comms
+SUBDIR += converters
+SUBDIR += databases
+SUBDIR += devel
+SUBDIR += editors
+SUBDIR += education
+SUBDIR += emulators
+SUBDIR += fonts
+SUBDIR += games
+SUBDIR += geo
+SUBDIR += graphics
+SUBDIR += inputmethods
+SUBDIR += japanese
+SUBDIR += java
+SUBDIR += korean
+SUBDIR += lang
+SUBDIR += mail
+SUBDIR += math
+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 += www
+SUBDIR += x11
+.endif
 
-MAINTAINER=		Oleg Safiullin <form@openbsd.org>
+.include <bsd.port.subdir.mk>
 
-# GPLv2
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
+index:
+	@rm -f ${.CURDIR}/INDEX
+	@${_MAKE} ${.CURDIR}/INDEX
 
-MASTER_SITES=		${HOMEPAGE}/download/${VERSION}/
+${.CURDIR}/INDEX:
+	@echo "Generating INDEX..."
+	@${_MAKE} describe MACHINE_ARCH=i386 ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
+	@echo "Done."
 
-USE_GMAKE=		Yes
-NO_REGRESS=		Yes
+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
 
-post-build:
-	@cd ${WRKBUILD} && sh ${WRKDIST}/makeiso.sh
-	@sed -e s,!!PREFIX!!,${TRUEPREFIX},g ${FILESDIR}/README.OpenBSD \
-	    > ${WRKBUILD}/README.OpenBSD
+print-licenses: ${.CURDIR}/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
 
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/memtest86+
-	${INSTALL_DATA} ${WRKDIST}/README ${PREFIX}/share/memtest86+
-	${INSTALL_DATA} ${WRKBUILD}/README.OpenBSD ${PREFIX}/share/memtest86+
-	${INSTALL_DATA} ${WRKBUILD}/memtest ${PREFIX}/share/memtest86+
-	${INSTALL_DATA} ${WRKBUILD}/memtest_s \
-	    ${PREFIX}/share/memtest86+/memtest-serial
-	${INSTALL_DATA} ${WRKDIST}/memtest.bin \
-	    ${PREFIX}/share/memtest86+/memtest.floppy
-	${INSTALL_DATA} ${WRKDIST}/memtest_s.bin \
-	    ${PREFIX}/share/memtest86+/memtest-serial.floppy
-	${INSTALL_DATA} ${WRKDIST}/memtest.iso ${PREFIX}/share/memtest86+
-	${INSTALL_DATA} ${WRKDIST}/memtest_s.iso \
-	    ${PREFIX}/share/memtest86+/memtest-serial.iso
+search:	${.CURDIR}/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
+.  if defined(key)
+	@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); }'
+.  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); }' ${.CURDIR}/INDEX
+.  endif
+.endif
 
-.include <bsd.port.mk>
+homepages.html:
+	@echo '<html><ul>' >$@
+	@${_MAKE} homepage-links ECHO_MSG='echo >&2' >>$@
+	@echo '</ul></html>' >>$@
+
+distfiles-update-locatedb:
+	@PORTSDIR=${.CURDIR} /bin/sh ${.CURDIR}/infrastructure/fetch/distfiles-update-locatedb ${DISTFILES_DB}
+
+pkglocatedb:
+	@pkg_mklocatedb -a -d ${.CURDIR}/packages/${MACHINE_ARCH}/all/ \
+	    >${.CURDIR}/packages/${MACHINE_ARCH}/ftp/pkglocatedb
+
+.PHONY: index search distfiles-update-locatedb \
+	pkglocatedb print-licenses print-index