Attachment #59705 for bug #89809




.include <bsd.port.subdir.mk>

index:
	@rm -f ${INDEXDIR}/${INDEXFILE}
	@cd ${.CURDIR} && make ${INDEXDIR}/${INDEXFILE}

fetchindex:
	@cd ${INDEXDIR} && ${FETCHINDEX} ${MASTER_SITE_INDEX}/${INDEXFILE}.bz2 && bunzip2 -f ${INDEXFILE}.bz2 && chmod a+r ${INDEXFILE}

MASTER_SITE_INDEX?=	http://www.FreeBSD.org/ports/
FETCHINDEX?=	fetch -am

INDEX_ECHO_1ST=		echo
.endif

${INDEXDIR}/${INDEXFILE}:
	@${INDEX_ECHO_1ST} "Generating ${INDEXFILE} - please wait.."; \
	if [ "${INDEX_PRISTINE}" != "" ]; then \
		export LOCALBASE=/nonexistentlocal; \

	cat $${tmpdir}/${INDEXFILE}.desc.* | perl ${.CURDIR}/Tools/make_index | \
		sed -e 's/  */ /g' -e 's/|  */|/g' -e 's/  *|/|/g' -e 's./..g' | \
		sort -t '|' +1 -2 | \
		sed -e 's../.g' > ${INDEXDIR}/${INDEXFILE}.tmp; \
	if [ "${INDEX_PRISTINE}" != "" ]; then \
		sed -e "s,$${LOCALBASE},/usr/local," -e "s,$${X11BASE},/usr/X11R6," \
			${INDEXDIR}/${INDEXFILE}.tmp > ${INDEXDIR}/${INDEXFILE}; \
	else \
		mv ${INDEXDIR}/${INDEXFILE}.tmp ${INDEXDIR}/${INDEXFILE}; \
	fi; \
	rm -rf $${tmpdir}; \
	echo " Done."

print-index:	${INDEXDIR}/${INDEXFILE}
	@awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nE-deps:\t%s\nP-deps:\t%s\nF-deps:\t%s\nWWW:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$11, $$12, $$13, $$10); }' < ${INDEXDIR}/${INDEXFILE}

CVS?= cvs
SUP?= cvsup




LINUXBASE?=		${DESTDIR}/compat/linux
DISTDIR?=		${PORTSDIR}/distfiles
_DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
INDEXDIR?=		${PORTSDIR}
.if ${OSVERSION} >= 500036
INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]).*/\1/}
.else

	defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \
	defined(LIB_DEPENDS) || defined(DEPENDS)
	@${ECHO_CMD} -n 'This port requires package(s) "'
	@${ECHO_CMD} -n `${GREP} '^${PKGNAME}|' ${INDEXDIR}/${INDEXFILE} | ${AWK} -F\| '{print $$8;}'`
	@${ECHO_CMD} '" to build.'
.endif
.endif

pretty-print-run-depends-list:
.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS)
	@${ECHO_CMD} -n 'This port requires package(s) "'
	@${ECHO_CMD} -n `${GREP} '^${PKGNAME}|' ${INDEXDIR}/${INDEXFILE} | ${AWK} -F\| '{print $$9;}'`
	@${ECHO_CMD} '" to run.'
.endif
.endif

Lines 240-246 Link Here

(-)Mk/bsd.port.subdir.mk (-3 / +3 lines)
240	.if defined(PORTSTOP)	240	.if defined(PORTSTOP)
241	readmes: readme ${SUBDIR:S/^/_/:S/$/.readmes/}	241	readmes: readme ${SUBDIR:S/^/_/:S/$/.readmes/}
242	@${ECHO_MSG} "===> Creating README.html for all ports"	242	@${ECHO_MSG} "===> Creating README.html for all ports"
243	@perl ${PORTSDIR}/Tools/make_readmes < ${PORTSDIR}/${INDEXFILE}	243	@perl ${PORTSDIR}/Tools/make_readmes < ${INDEXDIR}/${INDEXFILE}
244	.else	244	.else
245	readmes: readme	245	readmes: readme
246	.endif	246	.endif
Lines 333-339 Link Here
333	PORTSEARCH_XKEYLIM?=0	333	PORTSEARCH_XKEYLIM?=0
334	PORTSEARCH_IGNORECASE?=1	334	PORTSEARCH_IGNORECASE?=1
335		335
336	search: ${PORTSDIR}/${INDEXFILE}	336	search: ${INDEXDIR}/${INDEXFILE}
337	@here=${.CURDIR}; \	337	@here=${.CURDIR}; \
338	cd ${PORTSDIR}; \	338	cd ${PORTSDIR}; \
339	if [ -z "$$key" -a -z "$$xkey" -a \	339	if [ -z "$$key" -a -z "$$xkey" -a \
Lines 431-434 Link Here
431	if (i in disp) \	431	if (i in disp) \
432	printf("%s:\t%s\n", names[i], $$i); \	432	printf("%s:\t%s\n", names[i], $$i); \
433	print(""); \	433	print(""); \
434	}' ${PORTSDIR}/${INDEXFILE}	434	}' ${INDEXDIR}/${INDEXFILE}

Return to bug 89809

Lines 67-77 Link Here

(-)Makefile (-9 / +9 lines)
67	.include <bsd.port.subdir.mk>	67	.include <bsd.port.subdir.mk>
68		68
69	index:	69	index:
70	@rm -f ${.CURDIR}/${INDEXFILE}	70	@rm -f ${INDEXDIR}/${INDEXFILE}
71	@cd ${.CURDIR} && make ${.CURDIR}/${INDEXFILE}	71	@cd ${.CURDIR} && make ${INDEXDIR}/${INDEXFILE}
72		72
73	fetchindex:	73	fetchindex:
74	@cd ${.CURDIR} && ${FETCHINDEX} ${MASTER_SITE_INDEX}/${INDEXFILE}.bz2 && bunzip2 -f ${INDEXFILE}.bz2 && chmod a+r ${INDEXFILE}	74	@cd ${INDEXDIR} && ${FETCHINDEX} ${MASTER_SITE_INDEX}/${INDEXFILE}.bz2 && bunzip2 -f ${INDEXFILE}.bz2 && chmod a+r ${INDEXFILE}
75		75
76	MASTER_SITE_INDEX?= http://www.FreeBSD.org/ports/	76	MASTER_SITE_INDEX?= http://www.FreeBSD.org/ports/
77	FETCHINDEX?= fetch -am	77	FETCHINDEX?= fetch -am
Lines 85-91 Link Here
85	INDEX_ECHO_1ST= echo	85	INDEX_ECHO_1ST= echo
86	.endif	86	.endif
87		87
88	${.CURDIR}/${INDEXFILE}:	88	${INDEXDIR}/${INDEXFILE}:
89	@${INDEX_ECHO_1ST} "Generating ${INDEXFILE} - please wait.."; \	89	@${INDEX_ECHO_1ST} "Generating ${INDEXFILE} - please wait.."; \
90	if [ "${INDEX_PRISTINE}" != "" ]; then \	90	if [ "${INDEX_PRISTINE}" != "" ]; then \
91	export LOCALBASE=/nonexistentlocal; \	91	export LOCALBASE=/nonexistentlocal; \
Lines 119-136 Link Here
119	cat $${tmpdir}/${INDEXFILE}.desc.* \| perl ${.CURDIR}/Tools/make_index \| \	119	cat $${tmpdir}/${INDEXFILE}.desc.* \| perl ${.CURDIR}/Tools/make_index \| \
120	sed -e 's/ / /g' -e 's/\| /\|/g' -e 's/ *\|/\|/g' -e 's./..g' \| \	120	sed -e 's/ / /g' -e 's/\| /\|/g' -e 's/ *\|/\|/g' -e 's./..g' \| \
121	sort -t '\|' +1 -2 \| \	121	sort -t '\|' +1 -2 \| \
122	sed -e 's../.g' > ${.CURDIR}/${INDEXFILE}.tmp; \	122	sed -e 's../.g' > ${INDEXDIR}/${INDEXFILE}.tmp; \
123	if [ "${INDEX_PRISTINE}" != "" ]; then \	123	if [ "${INDEX_PRISTINE}" != "" ]; then \
124	sed -e "s,$${LOCALBASE},/usr/local," -e "s,$${X11BASE},/usr/X11R6," \	124	sed -e "s,$${LOCALBASE},/usr/local," -e "s,$${X11BASE},/usr/X11R6," \
125	${.CURDIR}/${INDEXFILE}.tmp > ${.CURDIR}/${INDEXFILE}; \	125	${INDEXDIR}/${INDEXFILE}.tmp > ${INDEXDIR}/${INDEXFILE}; \
126	else \	126	else \
127	mv ${.CURDIR}/${INDEXFILE}.tmp ${.CURDIR}/${INDEXFILE}; \	127	mv ${INDEXDIR}/${INDEXFILE}.tmp ${INDEXDIR}/${INDEXFILE}; \
128	fi; \	128	fi; \
129	rm -rf $${tmpdir}; \	129	rm -rf $${tmpdir}; \
130	echo " Done."	130	echo " Done."
131		131
132	print-index: ${.CURDIR}/${INDEXFILE}	132	print-index: ${INDEXDIR}/${INDEXFILE}
133	@awk -F\\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nE-deps:\t%s\nP-deps:\t%s\nF-deps:\t%s\nWWW:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$11, $$12, $$13, $$10); }' < ${.CURDIR}/${INDEXFILE}	133	@awk -F\\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nE-deps:\t%s\nP-deps:\t%s\nF-deps:\t%s\nWWW:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$11, $$12, $$13, $$10); }' < ${INDEXDIR}/${INDEXFILE}
134		134
135	CVS?= cvs	135	CVS?= cvs
136	SUP?= cvsup	136	SUP?= cvsup

Lines 1204-1209 Link Here

(-)Mk/bsd.port.mk (-2 / +3 lines)
1204	LINUXBASE?= ${DESTDIR}/compat/linux	1204	LINUXBASE?= ${DESTDIR}/compat/linux
1205	DISTDIR?= ${PORTSDIR}/distfiles	1205	DISTDIR?= ${PORTSDIR}/distfiles
1206	_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}	1206	_DISTDIR?= ${DISTDIR}/${DIST_SUBDIR}
		1207	INDEXDIR?= ${PORTSDIR}
1207	.if ${OSVERSION} >= 500036	1208	.if ${OSVERSION} >= 500036
1208	INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/}	1209	INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/}
1209	.else	1210	.else
Lines 4790-4796 Link Here
4790	defined(FETCH_DEPENDS) \|\| defined(BUILD_DEPENDS) \|\| \	4791	defined(FETCH_DEPENDS) \|\| defined(BUILD_DEPENDS) \|\| \
4791	defined(LIB_DEPENDS) \|\| defined(DEPENDS)	4792	defined(LIB_DEPENDS) \|\| defined(DEPENDS)
4792	@${ECHO_CMD} -n 'This port requires package(s) "'	4793	@${ECHO_CMD} -n 'This port requires package(s) "'
4793	@${ECHO_CMD} -n `${GREP} '^${PKGNAME}\|' ${PORTSDIR}/${INDEXFILE} \| ${AWK} -F\\| '{print $$8;}'`	4794	@${ECHO_CMD} -n `${GREP} '^${PKGNAME}\|' ${INDEXDIR}/${INDEXFILE} \| ${AWK} -F\\| '{print $$8;}'`
4794	@${ECHO_CMD} '" to build.'	4795	@${ECHO_CMD} '" to build.'
4795	.endif	4796	.endif
4796	.endif	4797	.endif
Lines 4799-4805 Link Here
4799	pretty-print-run-depends-list:	4800	pretty-print-run-depends-list:
4800	.if defined(RUN_DEPENDS) \|\| defined(LIB_DEPENDS) \|\| defined(DEPENDS)	4801	.if defined(RUN_DEPENDS) \|\| defined(LIB_DEPENDS) \|\| defined(DEPENDS)
4801	@${ECHO_CMD} -n 'This port requires package(s) "'	4802	@${ECHO_CMD} -n 'This port requires package(s) "'
4802	@${ECHO_CMD} -n `${GREP} '^${PKGNAME}\|' ${PORTSDIR}/${INDEXFILE} \| ${AWK} -F\\| '{print $$9;}'`	4803	@${ECHO_CMD} -n `${GREP} '^${PKGNAME}\|' ${INDEXDIR}/${INDEXFILE} \| ${AWK} -F\\| '{print $$9;}'`
4803	@${ECHO_CMD} '" to run.'	4804	@${ECHO_CMD} '" to run.'
4804	.endif	4805	.endif
4805	.endif	4806	.endif