=================================================================== RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v retrieving revision 1.58 retrieving revision 1.69 diff -u -r1.58 -r1.69 --- ports/Makefile 2008/05/18 11:22:14 1.58 +++ ports/Makefile 2012/05/28 09:38:04 1.69 @@ -1,19 +1,17 @@ -# $OpenBSD: Makefile,v 1.58 2008/05/18 11:22:14 espie Exp $ +# $OpenBSD: Makefile,v 1.69 2012/05/28 09:38:04 espie Exp $ # $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $ # PKGPATH = MIRROR_MK ?= ${.CURDIR}/distfiles/Makefile -PORTSTOP ?= yes DISTFILES_DB ?= ${.CURDIR}/infrastructure/db/locate.database - .if defined(SUBDIR) # nothing to do .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/build/index-retrieve index='${.CURDIR}/INDEX' +_CMD = perl ${.CURDIR}/infrastructure/bin/retrieve-index index='${.CURDIR}/INDEX' . if defined(key) _CMD += key='${key}' . endif @@ -45,6 +43,7 @@ SUBDIR += editors SUBDIR += education SUBDIR += emulators +SUBDIR += fonts SUBDIR += games SUBDIR += geo SUBDIR += graphics @@ -55,6 +54,7 @@ SUBDIR += lang SUBDIR += mail SUBDIR += math +SUBDIR += meta SUBDIR += misc SUBDIR += multimedia SUBDIR += net @@ -77,11 +77,11 @@ index: @rm -f ${.CURDIR}/INDEX - @${MAKE} ${.CURDIR}/INDEX + @${_MAKE} ${.CURDIR}/INDEX ${.CURDIR}/INDEX: @echo "Generating INDEX..." - @${MAKE} describe MACHINE_ARCH=i386 ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX + @${_MAKE} describe MACHINE_ARCH=i386 ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX @echo "Done." print-index: ${.CURDIR}/INDEX @@ -103,44 +103,17 @@ . endif .endif -LOCKDIR ?= - -mirror-maker: - @mkdir -p ${MIRROR_MK:H} -# Indirection needed for broken OSes that don't grok this exec - @echo "EXEC = exec" >${MIRROR_MK} - @echo "SIMPLE_LOCK = : ">>${MIRROR_MK} -.if !empty(LOCKDIR) - @echo 'LOCKDIR = ${LOCKDIR}' >>${MIRROR_MK} - @echo 'PORTSDIR = ${PORTSDIR}' >>${MIRROR_MK} - @echo 'LOCK_CMD = perl $${PORTSDIR}/infrastructure/build/dolock' >>${MIRROR_MK} - @echo 'UNLOCK_CMD = rm -f' >>${MIRROR_MK} - @echo 'SIMPLE_LOCK = $${LOCK_CMD} $${LOCKDIR}/$$$$lock.lock; trap "$${UNLOCK_CMD} $$$$lock.lock" 0 1 2 3 13 15' >>${MIRROR_MK} -.else - @echo 'SIMPLE_LOCK = :' >>${MIRROR_MK} -.endif - - @echo '' >>${MIRROR_MK} - @echo "default:: ftp cdrom" >>${MIRROR_MK} - @echo ".PHONY: default all ftp cdrom" >>${MIRROR_MK} - @_DONE_FILES=`mktemp /tmp/depends.XXXXXXXXX|| exit 1`; \ - export _DONE_FILES; \ - trap "rm -f $${_DONE_FILES}" 0 1 2 3 13 15; \ - ${MAKE} fetch-makefile \ - ECHO_MSG='echo >&2' \ - _FETCH_MAKEFILE=${MIRROR_MK} - homepages.html: @echo '' >>$@ distfiles-update-locatedb: @PORTSDIR=${.CURDIR} /bin/sh ${.CURDIR}/infrastructure/fetch/distfiles-update-locatedb ${DISTFILES_DB} pkglocatedb: - @pkg_mklocatedb -d ${.CURDIR}/packages/${MACHINE_ARCH}/all/ \ + @pkg_mklocatedb -a -d ${.CURDIR}/packages/${MACHINE_ARCH}/all/ \ >${.CURDIR}/packages/${MACHINE_ARCH}/ftp/pkglocatedb -.PHONY: mirror-maker index search distfiles-update-locatedb \ +.PHONY: index search distfiles-update-locatedb \ pkglocatedb print-licenses print-index