Attachment #46134 for bug #70915




LDOCSDIR=	share/doc/pear/${PORTNAME}
LEXAMPLESDIR=	share/examples/pear/${PORTNAME}
LTESTSDIR=	${LPEARDIR}/tests/${PORTNAME}
LSQLSDIR=	${LPEARDIR}/sql/${PORTNAME}
PEARDIR=	${PHP_BASE}/${LPEARDIR}
PKGREGDIR=	${PHP_BASE}/${LPKGREGDIR}
DOCSDIR=	${PHP_BASE}/${LDOCSDIR}
EXAMPLESDIR=	${PHP_BASE}/${LEXAMPLESDIR}
TESTSDIR=	${PHP_BASE}/${LTESTSDIR}
SQLSDIR=	${PHP_BASE}/${LSQLSDIR}
.if defined(CATEGORY) && !empty(CATEGORY)
LINSTDIR=	${LPEARDIR}/${CATEGORY}
.else

.endif
PLIST_SUB=	PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \
		TESTSDIR=${LTESTSDIR} EXAMPLESDIR=${LEXAMPLESDIR} \
		INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR}

PKGINSTALL=	${PORTSDIR}/devel/pear-PEAR/pkg-install
PKGDEINSTALL=	${PORTSDIR}/devel/pear-PEAR/pkg-deinstall

FILES?=
DOCS?=
TESTS?=
SQLS?=
EXAMPLES?=
_TESTSDIR?=	tests
_SQLSDIR?=	sql
_DOCSDIR?=	docs
_EXAMPLESDIR?=	examples

# this is an easy way to eliminate duplicate entries in a variable :)
# if someone knows how to achieve the result without this terrible
# hack, please tell me!
.for v in FILES DOCS TESTS EXAMPLES SQLS
X${v}DIRS=	${${v}:M*/*:C;/[^/]+$;;}
. for XD in ${X${v}DIRS}
ALREADYTHERE=	0

	@${ECHO_MSG} "===>   Generating packing list"; \
	(for file in ${FILES}; do echo "${LINSTDIR}/$${file}"; done; \
	for file in ${TESTS}; do echo "${LTESTSDIR}/$${file}"; done; \
	for file in ${SQLS}; do echo "${LSQLSDIR}/$${file}"; done; \
	for file in ${DOCS}; do echo "%%PORTDOCS%%${LDOCSDIR}/$${file}"; done; \
	for file in ${EXAMPLES}; do echo "%%PORTDOCS%%${LEXAMPLESDIR}/$${file}"; done; \
	echo "${LPKGREGDIR}/package.xml"; \

	    while read dir; do echo "@dirrm ${LINSTDIR}/$${dir}"; done; \
	for d in ${TESTS}; do echo $${d}; done | ${DIRFILTER} | \
	    while read dir; do echo "@dirrm ${LTESTSDIR}/$${dir}"; done; \
	for d in ${SQLS}; do echo $${d}; done | ${DIRFILTER} | \
	    while read dir; do echo "@dirrm ${LSQLSDIR}/$${dir}"; done; \
	for d in ${DOCS}; do echo $${d}; done | ${DIRFILTER} | \
	    while read dir; do echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}/$${dir}"; done; \
	for d in ${EXAMPLES}; do echo $${d}; done | ${DIRFILTER} | \
	    while read dir; do echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}/$${dir}"; done; \
	if [ -n "${TESTS}" ]; then echo "@dirrm ${LTESTSDIR}"; fi; \
	if [ -n "${SQLS}" ]; then echo "@dirrm ${LSQLSDIR}"; fi; \
	if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \
	if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \
	echo "@dirrm ${LPKGREGDIR}"; \

	echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null || true"; \
	echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null || true"; \
	echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true") > ${PLIST}
	echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null || true") > ${PLIST}
. endif

. for t in files docs tests sqls examples
.  if !target(do-install-${t}-msg)
do-install-${t}-msg: .USE
.  endif
. endfor

pre-install: do-generate-plist
do-install: do-install-files do-install-docs do-install-tests do-install-sqls do-install-examples

do-install-files: do-install-files-msg
	@${MKDIR} ${INSTDIR}

.  endfor
.  for file in ${TESTS}
	@${INSTALL_DATA} ${WRKSRC}/${_TESTSDIR}/${file} ${TESTSDIR}/${file}
.  endfor
. endif

do-install-sqls: do-install-sqls-msg
. if !empty(SQLS)
	@${ECHO_MSG} "===> Installing sqls in ${SQLSDIR}."
	@${MKDIR} ${SQLSDIR}
.  for dir in ${SQLSDIRS}
	@${MKDIR} ${SQLSDIR}/${dir}
.  endfor
.  for file in ${SQLS}
	@${INSTALL_DATA} ${WRKSRC}/${_SQLSDIR}/${file} ${SQLSDIR}/${file}
.  endfor
. endif


Return to bug 70915

Lines 21-31 Link Here

(-)Makefile.common (-4 / +25 lines)
21	LDOCSDIR= share/doc/pear/${PORTNAME}	21	LDOCSDIR= share/doc/pear/${PORTNAME}
22	LEXAMPLESDIR= share/examples/pear/${PORTNAME}	22	LEXAMPLESDIR= share/examples/pear/${PORTNAME}
23	LTESTSDIR= ${LPEARDIR}/tests/${PORTNAME}	23	LTESTSDIR= ${LPEARDIR}/tests/${PORTNAME}
		24	LSQLSDIR= ${LPEARDIR}/sql/${PORTNAME}
24	PEARDIR= ${PHP_BASE}/${LPEARDIR}	25	PEARDIR= ${PHP_BASE}/${LPEARDIR}
25	PKGREGDIR= ${PHP_BASE}/${LPKGREGDIR}	26	PKGREGDIR= ${PHP_BASE}/${LPKGREGDIR}
26	DOCSDIR= ${PHP_BASE}/${LDOCSDIR}	27	DOCSDIR= ${PHP_BASE}/${LDOCSDIR}
27	EXAMPLESDIR= ${PHP_BASE}/${LEXAMPLESDIR}	28	EXAMPLESDIR= ${PHP_BASE}/${LEXAMPLESDIR}
28	TESTSDIR= ${PHP_BASE}/${LTESTSDIR}	29	TESTSDIR= ${PHP_BASE}/${LTESTSDIR}
		30	SQLSDIR= ${PHP_BASE}/${LSQLSDIR}
29	.if defined(CATEGORY) && !empty(CATEGORY)	31	.if defined(CATEGORY) && !empty(CATEGORY)
30	LINSTDIR= ${LPEARDIR}/${CATEGORY}	32	LINSTDIR= ${LPEARDIR}/${CATEGORY}
31	.else	33	.else
Lines 38-44 Link Here
38	.endif	40	.endif
39	PLIST_SUB= PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \	41	PLIST_SUB= PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \
40	TESTSDIR=${LTESTSDIR} EXAMPLESDIR=${LEXAMPLESDIR} \	42	TESTSDIR=${LTESTSDIR} EXAMPLESDIR=${LEXAMPLESDIR} \
41	INSTDIR=${LINSTDIR}	43	INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR}
42		44
43	PKGINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-install	45	PKGINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-install
44	PKGDEINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-deinstall	46	PKGDEINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-deinstall
Lines 46-60 Link Here
46	FILES?=	48	FILES?=
47	DOCS?=	49	DOCS?=
48	TESTS?=	50	TESTS?=
		51	SQLS?=
49	EXAMPLES?=	52	EXAMPLES?=
50	_TESTSDIR?= tests	53	_TESTSDIR?= tests
		54	_SQLSDIR?= sql
51	_DOCSDIR?= docs	55	_DOCSDIR?= docs
52	_EXAMPLESDIR?= examples	56	_EXAMPLESDIR?= examples
53		57
54	# this is an easy way to eliminate duplicate entries in a variable :)	58	# this is an easy way to eliminate duplicate entries in a variable :)
55	# if someone knows how to achieve the result without this terrible	59	# if someone knows how to achieve the result without this terrible
56	# hack, please tell me!	60	# hack, please tell me!
57	.for v in FILES DOCS TESTS EXAMPLES	61	.for v in FILES DOCS TESTS EXAMPLES SQLS
58	X${v}DIRS= ${${v}:M/:C;/[^/]+$;;}	62	X${v}DIRS= ${${v}:M/:C;/[^/]+$;;}
59	. for XD in ${X${v}DIRS}	63	. for XD in ${X${v}DIRS}
60	ALREADYTHERE= 0	64	ALREADYTHERE= 0
Lines 90-95 Link Here
90	@${ECHO_MSG} "===> Generating packing list"; \	94	@${ECHO_MSG} "===> Generating packing list"; \
91	(for file in ${FILES}; do echo "${LINSTDIR}/$${file}"; done; \	95	(for file in ${FILES}; do echo "${LINSTDIR}/$${file}"; done; \
92	for file in ${TESTS}; do echo "${LTESTSDIR}/$${file}"; done; \	96	for file in ${TESTS}; do echo "${LTESTSDIR}/$${file}"; done; \
		97	for file in ${SQLS}; do echo "${LSQLSDIR}/$${file}"; done; \
93	for file in ${DOCS}; do echo "%%PORTDOCS%%${LDOCSDIR}/$${file}"; done; \	98	for file in ${DOCS}; do echo "%%PORTDOCS%%${LDOCSDIR}/$${file}"; done; \
94	for file in ${EXAMPLES}; do echo "%%PORTDOCS%%${LEXAMPLESDIR}/$${file}"; done; \	99	for file in ${EXAMPLES}; do echo "%%PORTDOCS%%${LEXAMPLESDIR}/$${file}"; done; \
95	echo "${LPKGREGDIR}/package.xml"; \	100	echo "${LPKGREGDIR}/package.xml"; \
Lines 97-107 Link Here
97	while read dir; do echo "@dirrm ${LINSTDIR}/$${dir}"; done; \	102	while read dir; do echo "@dirrm ${LINSTDIR}/$${dir}"; done; \
98	for d in ${TESTS}; do echo $${d}; done \| ${DIRFILTER} \| \	103	for d in ${TESTS}; do echo $${d}; done \| ${DIRFILTER} \| \
99	while read dir; do echo "@dirrm ${LTESTSDIR}/$${dir}"; done; \	104	while read dir; do echo "@dirrm ${LTESTSDIR}/$${dir}"; done; \
		105	for d in ${SQLS}; do echo $${d}; done \| ${DIRFILTER} \| \
		106	while read dir; do echo "@dirrm ${LSQLSDIR}/$${dir}"; done; \
100	for d in ${DOCS}; do echo $${d}; done \| ${DIRFILTER} \| \	107	for d in ${DOCS}; do echo $${d}; done \| ${DIRFILTER} \| \
101	while read dir; do echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}/$${dir}"; done; \	108	while read dir; do echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}/$${dir}"; done; \
102	for d in ${EXAMPLES}; do echo $${d}; done \| ${DIRFILTER} \| \	109	for d in ${EXAMPLES}; do echo $${d}; done \| ${DIRFILTER} \| \
103	while read dir; do echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}/$${dir}"; done; \	110	while read dir; do echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}/$${dir}"; done; \
104	if [ -n "${TESTS}" ]; then echo "@dirrm ${LTESTSDIR}"; fi; \	111	if [ -n "${TESTS}" ]; then echo "@dirrm ${LTESTSDIR}"; fi; \
		112	if [ -n "${SQLS}" ]; then echo "@dirrm ${LSQLSDIR}"; fi; \
105	if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \	113	if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \
106	if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \	114	if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \
107	echo "@dirrm ${LPKGREGDIR}"; \	115	echo "@dirrm ${LPKGREGDIR}"; \
Lines 112-127 Link Here
112	echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null \|\| true"; \	120	echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null \|\| true"; \
113	echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null \|\| true"; \	121	echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null \|\| true"; \
114	echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null \|\| true") > ${PLIST}	122	echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null \|\| true") > ${PLIST}
		123	echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null \|\| true") > ${PLIST}
115	. endif	124	. endif
116		125
117	. for t in files docs tests examples	126	. for t in files docs tests sqls examples
118	. if !target(do-install-${t}-msg)	127	. if !target(do-install-${t}-msg)
119	do-install-${t}-msg: .USE	128	do-install-${t}-msg: .USE
120	. endif	129	. endif
121	. endfor	130	. endfor
122		131
123	pre-install: do-generate-plist	132	pre-install: do-generate-plist
124	do-install: do-install-files do-install-docs do-install-tests do-install-examples	133	do-install: do-install-files do-install-docs do-install-tests do-install-sqls do-install-examples
125		134
126	do-install-files: do-install-files-msg	135	do-install-files: do-install-files-msg
127	@${MKDIR} ${INSTDIR}	136	@${MKDIR} ${INSTDIR}
Lines 153-158 Link Here
153	. endfor	162	. endfor
154	. for file in ${TESTS}	163	. for file in ${TESTS}
155	@${INSTALL_DATA} ${WRKSRC}/${_TESTSDIR}/${file} ${TESTSDIR}/${file}	164	@${INSTALL_DATA} ${WRKSRC}/${_TESTSDIR}/${file} ${TESTSDIR}/${file}
		165	. endfor
		166	. endif
		167
		168	do-install-sqls: do-install-sqls-msg
		169	. if !empty(SQLS)
		170	@${ECHO_MSG} "===> Installing sqls in ${SQLSDIR}."
		171	@${MKDIR} ${SQLSDIR}
		172	. for dir in ${SQLSDIRS}
		173	@${MKDIR} ${SQLSDIR}/${dir}
		174	. endfor
		175	. for file in ${SQLS}
		176	@${INSTALL_DATA} ${WRKSRC}/${_SQLSDIR}/${file} ${SQLSDIR}/${file}
156	. endfor	177	. endfor
157	. endif	178	. endif
158		179