=================================================================== RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v retrieving revision 1.51 retrieving revision 1.75 diff -u -r1.51 -r1.75 --- ports/Makefile 2006/10/18 13:52:33 1.51 +++ ports/Makefile 2015/04/13 13:46:58 1.75 @@ -1,26 +1,31 @@ -# $OpenBSD: Makefile,v 1.51 2006/10/18 13:52:33 sturm Exp $ -# $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $ -# +# $OpenBSD: Makefile,v 1.75 2015/04/13 13:46:58 naddy Exp $ -PKGPATH= +.if !defined(BSD_OWN_MK) +. include +.endif + +PKGPATH = +MIRROR_MK ?= ${.CURDIR}/distfiles/Makefile +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' -. 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 +_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} @@ -40,23 +45,25 @@ 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 @@ -66,17 +73,15 @@ SUBDIR += x11 .endif -PORTSTOP?= yes - .include index: @rm -f ${.CURDIR}/INDEX - @${MAKE} ${.CURDIR}/INDEX + @${_MAKE} USE_CCACHE=No ${.CURDIR}/INDEX ${.CURDIR}/INDEX: @echo "Generating INDEX..." - @${MAKE} describe ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX + @${_MAKE} describe MACHINE_ARCH=amd64 ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX @echo "Done." print-index: ${.CURDIR}/INDEX @@ -91,42 +96,24 @@ @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) +. 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 +. 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 .endif - -MIRROR_MK?= ${.CURDIR}/distfiles/Makefile - -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} - @_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' \ - >>${MIRROR_MK} - homepages.html: @echo '' >>$@ -DISTFILES_DB?=${.CURDIR}/infrastructure/db/locate.database - distfiles-update-locatedb: @PORTSDIR=${.CURDIR} /bin/sh ${.CURDIR}/infrastructure/fetch/distfiles-update-locatedb ${DISTFILES_DB} pkglocatedb: - @pkg_mklocatedb ${.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