View | Details | Raw Unified | Return to bug 66032 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.port.mk (-40 / +150 lines)
Lines 993-1001 Link Here
993
# tree we are and thus can't go relative.  They can, of course, be overridden
994
# tree we are and thus can't go relative.  They can, of course, be overridden
994
# by individual Makefiles or local system make configuration.
995
# by individual Makefiles or local system make configuration.
995
PORTSDIR?=		/usr/ports
996
PORTSDIR?=		/usr/ports
996
LOCALBASE?=		${DESTDIR}/usr/local
997
LOCALBASE?=		/usr/local
997
X11BASE?=		${DESTDIR}/usr/X11R6
998
X11BASE?=		/usr/X11R6
998
LINUXBASE?=		${DESTDIR}/compat/linux
999
LINUXBASE?=		/compat/linux
999
DISTDIR?=		${PORTSDIR}/distfiles
1000
DISTDIR?=		${PORTSDIR}/distfiles
1000
_DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
1001
_DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
1001
.if ${OSVERSION} >= 500036
1002
.if ${OSVERSION} >= 500036
Lines 1193-1198 Link Here
1193
1194
1194
_POSTMKINCLUDED=	yes
1195
_POSTMKINCLUDED=	yes
1195
1196
1197
.if defined(DESTDIR)
1198
check-makevars::
1199
	@${ECHO_CMD} "${PKGNAME}: Makefile error: DESTDIR is not user settable"
1200
	@${FALSE}
1201
.endif
1202
1196
WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
1203
WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
1197
.if defined(NO_WRKSUBDIR)
1204
.if defined(NO_WRKSUBDIR)
1198
WRKSRC?=		${WRKDIR}
1205
WRKSRC?=		${WRKDIR}
Lines 1205-1210 Link Here
1205
BUILD_WRKSRC?=	${WRKSRC}
1212
BUILD_WRKSRC?=	${WRKSRC}
1206
INSTALL_WRKSRC?=${WRKSRC}
1213
INSTALL_WRKSRC?=${WRKSRC}
1207
1214
1215
WRKINST?=	${WRKDIR}/.inst
1216
1217
.if defined(CLEANROOM_INSTALL)
1218
DESTDIR=	${WRKINST}
1219
INSTALL_ENV+=	DESTDIR="${WRKINST}"
1220
SCRIPTS_ENV+=	DESTDIR="${WRKINST}"
1221
.else
1222
DESTDIR=
1223
.endif
1224
1208
PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
1225
PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
1209
1226
1210
.if defined(WITHOUT_CPU_CFLAGS)
1227
.if defined(WITHOUT_CPU_CFLAGS)
Lines 1576-1587 Link Here
1576
.endif
1595
.endif
1577
1596
1578
# Names of cookies used to skip already completed stages
1597
# Names of cookies used to skip already completed stages
1579
EXTRACT_COOKIE?=	${WRKDIR}/.extract_done.${PKGNAME}.${PREFIX:S/\//_/g}
1598
.for target in extract patch configure build pkgbuild install package
1580
CONFIGURE_COOKIE?=	${WRKDIR}/.configure_done.${PKGNAME}.${PREFIX:S/\//_/g}
1599
${target:U}_COOKIE?=	${WRKDIR}/.${target}_done.${PKGNAME}.${PREFIX:S/\//_/g}
1581
INSTALL_COOKIE?=	${WRKDIR}/.install_done.${PKGNAME}.${PREFIX:S/\//_/g}
1600
.endfor
1582
BUILD_COOKIE?=		${WRKDIR}/.build_done.${PKGNAME}.${PREFIX:S/\//_/g}
1583
PATCH_COOKIE?=		${WRKDIR}/.patch_done.${PKGNAME}.${PREFIX:S/\//_/g}
1584
PACKAGE_COOKIE?=	${WRKDIR}/.package_done.${PKGNAME}.${PREFIX:S/\//_/g}
1585
1601
1586
# How to do nothing.  Override if you, for some strange reason, would rather
1602
# How to do nothing.  Override if you, for some strange reason, would rather
1587
# do something.
1603
# do something.
Lines 2318-2323 Link Here
2318
PKGFILE?=		${.CURDIR}/${PKGNAME}${PKG_SUFX}
2334
PKGFILE?=		${.CURDIR}/${PKGNAME}${PKG_SUFX}
2319
.endif
2335
.endif
2320
2336
2337
.if defined(CLEANROOM_INSTALL)
2338
_PKGFILE?=		${WRKDIR}/${PKGNAME}${PKG_SUFX}
2339
.else
2340
_PKGFILE?=		${PKGFILE}
2341
.endif
2342
2321
# The "latest version" link -- ${PKGNAME} minus everthing after the last '-'
2343
# The "latest version" link -- ${PKGNAME} minus everthing after the last '-'
2322
PKGLATESTREPOSITORY?=	${PACKAGES}/Latest
2344
PKGLATESTREPOSITORY?=	${PACKAGES}/Latest
2323
PKGBASE?=			${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
2345
PKGBASE?=			${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
Lines 2580-2586 Link Here
2580
IGNORECMD=	${ECHO_MSG} "===>  ${PKGNAME} ${IGNORE}."
2604
IGNORECMD=	${ECHO_MSG} "===>  ${PKGNAME} ${IGNORE}."
2581
.endif
2605
.endif
2582
2606
2583
.for target in check-sanity fetch checksum extract patch configure all build install reinstall package
2607
.for target in check-sanity fetch checksum extract patch configure all build pkgbuild install reinstall package
2584
${target}:
2608
${target}:
2585
	@${IGNORECMD}
2609
	@${IGNORECMD}
2586
.if defined(INSTALLS_DEPENDS)
2610
.if defined(INSTALLS_DEPENDS)
Lines 3110-3132 Link Here
3110
3134
3111
# Install
3135
# Install
3112
3136
3137
.if defined(CLEANROOM_INSTALL) && ${PKGINSTALLVER} < 20040426
3138
check-makefile::
3139
	@${ECHO_CMD} "${PKGNAME}: Makefile error: please upgrade pkg_install to use CLEANROOM_INSTALL"
3140
	@${FALSE}
3141
.endif
3142
3113
.if !target(do-install)
3143
.if !target(do-install)
3114
do-install:
3144
do-install:
3115
.if defined(USE_GMAKE)
3145
.if defined(USE_GMAKE)
3116
	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
3146
	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
3117
.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
3147
.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
3118
	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man)
3148
	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man)
3119
.if ${XFREE86_HTML_MAN:L} == yes
3149
.if ${XFREE86_HTML_MAN:L} == yes
3120
	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
3150
	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
3121
.endif
3151
.endif
3122
.endif
3152
.endif
3123
.else # !defined(USE_GMAKE)
3153
.else # !defined(USE_GMAKE)
3124
.if defined(PERL_MODBUILD)
3154
.if defined(PERL_MODBUILD)
3125
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${INSTALL_TARGET})
3155
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${INSTALL_TARGET})
3126
.else
3156
.else
3127
	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
3157
	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
3128
.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
3158
.if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
3129
	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man)
3159
	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man)
3130
.if ${XFREE86_HTML_MAN:L} == yes
3160
.if ${XFREE86_HTML_MAN:L} == yes
3131
	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
3161
	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
3132
.endif
3162
.endif
Lines 3135-3144 Link Here
3135
.endif
3165
.endif
3136
.endif
3166
.endif
3137
3167
3168
.if !target(install-package)
3169
install-package: pkgbuild
3170
	@${PKG_ADD} ${_PKGFILE}
3171
.endif
3172
3138
# Package
3173
# Package
3139
3174
3140
.if !target(do-package)
3175
.if !target(do-package)
3141
do-package: ${TMPPLIST}
3176
do-package: ${TMPPLIST}
3177
.if !defined(CLEANROOM_INSTALL)
3142
	@if [ -d ${PACKAGES} ]; then \
3178
	@if [ -d ${PACKAGES} ]; then \
3143
		if [ ! -d ${PKGREPOSITORY} ]; then \
3179
		if [ ! -d ${PKGREPOSITORY} ]; then \
3144
			if ! ${MKDIR} ${PKGREPOSITORY}; then \
3180
			if ! ${MKDIR} ${PKGREPOSITORY}; then \
Lines 3161-3167 Link Here
3161
	if [ -f ${PKGMESSAGE} ]; then \
3197
	if [ -f ${PKGMESSAGE} ]; then \
3162
		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -D ${PKGMESSAGE}"; \
3198
		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -D ${PKGMESSAGE}"; \
3163
	fi; \
3199
	fi; \
3164
	if ${PKG_CMD} ${PKG_ARGS} ${PKGFILE}; then \
3200
	if [ -n "${DESTDIR}" ]; then \
3201
		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -S ${DESTDIR}"; \
3202
	fi; \
3203
	if ${PKG_CMD} ${PKG_ARGS} ${_PKGFILE}; then \
3204
		if [ -d ${PACKAGES} ]; then \
3205
			cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} package-links; \
3206
		fi; \
3207
	else \
3208
		cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} delete-package; \
3209
		exit 1; \
3210
	fi
3211
.else
3212
	@_LATE_PKG_ARGS=""; \
3213
	if [ -f ${PKGINSTALL} ]; then \
3214
		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -i ${PKGINSTALL}"; \
3215
	fi; \
3216
	if [ -f ${PKGDEINSTALL} ]; then \
3217
		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -k ${PKGDEINSTALL}"; \
3218
	fi; \
3219
	if [ -f ${PKGREQ} ]; then \
3220
		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -r ${PKGREQ}"; \
3221
	fi; \
3222
	if [ -f ${PKGMESSAGE} ]; then \
3223
		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -D ${PKGMESSAGE}"; \
3224
	fi; \
3225
	if [ -n "${DESTDIR}" ]; then \
3226
		_LATE_PKG_ARGS="$${_LATE_PKG_ARGS} -S ${DESTDIR}"; \
3227
	fi; \
3228
	${PKG_CMD} ${PKG_ARGS} ${_PKGFILE}
3229
.endif
3230
.endif
3231
3232
.if !target(copy-package)
3233
copy-package:
3234
	@if ${CP} -f ${_PKGFILE} ${PKGFILE}; then \
3165
		if [ -d ${PACKAGES} ]; then \
3235
		if [ -d ${PACKAGES} ]; then \
3166
			cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} package-links; \
3236
			cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} package-links; \
3167
		fi; \
3237
		fi; \
Lines 3274-3285 Link Here
3274
3344
3275
.if !target(install-mtree)
3345
.if !target(install-mtree)
3276
install-mtree:
3346
install-mtree:
3277
	@${MKDIR} ${PREFIX}
3347
	@${MKDIR} ${DESTDIR}${PREFIX}
3278
	@if [ `${ID} -u` != 0 ]; then \
3348
	@if [ `${ID} -u` != 0 ]; then \
3279
		if [ -w ${PREFIX}/ ]; then \
3349
		if [ -w ${DESTDIR}${PREFIX}/ ]; then \
3280
			${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \
3350
			${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \
3281
		else \
3351
		else \
3282
			${ECHO_MSG} "Error: ${PREFIX}/ not writable."; \
3352
			${ECHO_MSG} "Error: ${DESTDIR}${PREFIX}/ not writable."; \
3283
			${FALSE}; \
3353
			${FALSE}; \
3284
		fi; \
3354
		fi; \
3285
	fi
3355
	fi
Lines 3290-3298 Link Here
3290
			${ECHO_CMD} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
3360
			${ECHO_CMD} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
3291
			exit 1; \
3361
			exit 1; \
3292
		else \
3362
		else \
3293
			${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
3363
			${MTREE_CMD} ${MTREE_ARGS} ${DESTDIR}${PREFIX}/ >/dev/null; \
3294
			if [ ${MTREE_FILE} = "/etc/mtree/BSD.local.dist" ]; then \
3364
			if [ ${MTREE_FILE} = "/etc/mtree/BSD.local.dist" ]; then \
3295
				cd ${PREFIX}/share/nls; \
3365
				cd ${DESTDIR}${PREFIX}/share/nls; \
3296
				${LN} -shf C POSIX; \
3366
				${LN} -shf C POSIX; \
3297
				${LN} -shf C en_US.US-ASCII; \
3367
				${LN} -shf C en_US.US-ASCII; \
3298
			fi; \
3368
			fi; \
Lines 3486-3502 Link Here
3486
_BUILD_DEP=		configure
3556
_BUILD_DEP=		configure
3487
_BUILD_SEQ=		build-message pre-build pre-build-script do-build \
3557
_BUILD_SEQ=		build-message pre-build pre-build-script do-build \
3488
				post-build post-build-script
3558
				post-build post-build-script
3559
.if !defined(CLEANROOM_INSTALL)
3489
_INSTALL_DEP=	build
3560
_INSTALL_DEP=	build
3490
_INSTALL_SEQ=	install-message check-conflicts \
3561
_INSTALL_SEQ=	install-message check-conflicts \
3491
			    run-depends lib-depends pre-install pre-install-script \
3562
			    run-depends lib-depends pre-install pre-install-script \
3492
				generate-plist check-already-installed
3563
				generate-plist check-already-installed
3493
_INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
3564
_INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
3494
				pre-su-install-script do-install post-install add-plist-info \
3565
				pre-su-install-script do-install post-install add-plist-info \
3495
				post-install-script add-plist-docs compress-man run-ldconfig fake-pkg \
3566
				post-install-script add-plist-docs compress-man run-ldconfig fake-pkg
3496
				security-check
3567
_INSTALL_SEQ2=	security-check
3497
_PACKAGE_DEP=	install
3568
_PACKAGE_DEP=	install
3498
_PACKAGE_SEQ=	package-message pre-package pre-package-script \
3569
_PACKAGE_SEQ=	package-message pre-package pre-package-script \
3499
				do-package post-package-script
3570
				do-package post-package post-package-script
3571
.else
3572
_PKGBUILD_DEP=	build
3573
_PKGBUILD_SEQ=	pkgbuild-message pre-pkgbuild pre-pkgbuild-script \
3574
				pre-install pre-install-script \
3575
				generate-plist
3576
_PKGBUILD_SUSEQ= check-umask install-mtree pre-su-install \
3577
				pre-su-install-script do-install post-install add-plist-info \
3578
				post-install-script add-plist-docs compress-man \
3579
				post-pkgbuild post-pkgbuild-script
3580
_PKGBUILD_SEQ2=	pkgbuild2-message pre-package pre-package-script \
3581
				do-package post-package post-package-script
3582
_INSTALL_DEP=	pkgbuild
3583
_INSTALL_SEQ=	install-message check-conflicts run-depends lib-depends check-already-installed
3584
_INSTALL_SUSEQ=	install-package run-ldconfig
3585
_INSTALL_SEQ2=	security-check
3586
_PACKAGE_DEP=	pkgbuild
3587
_PACKAGE_SEQ=	package-message copy-package
3588
3589
.endif
3500
3590
3501
.if !target(check-sanity)
3591
.if !target(check-sanity)
3502
check-sanity: ${_SANITY_SEQ}
3592
check-sanity: ${_SANITY_SEQ}
Lines 3510-3516 Link Here
3510
# Main logic. The loop generates 6 main targets and using cookies
3600
# Main logic. The loop generates 6 main targets and using cookies
3511
# ensures that those already completed are skipped.
3601
# ensures that those already completed are skipped.
3512
3602
3513
.for target in extract patch configure build install package
3603
.for target in extract patch configure build pkgbuild install package
3514
3604
3515
.if !target(${target}) && defined(_OPTIONS_OK)
3605
.if !target(${target}) && defined(_OPTIONS_OK)
3516
${target}: ${${target:U}_COOKIE}
3606
${target}: ${${target:U}_COOKIE}
Lines 3533-3546 Link Here
3533
	@cd ${.CURDIR} && \
3623
	@cd ${.CURDIR} && \
3534
		${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SUSEQ}"
3624
		${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SUSEQ}"
3535
	@${ECHO_MSG} "===>  Returning to user credentials"
3625
	@${ECHO_MSG} "===>  Returning to user credentials"
3626
.if defined(_${target:U}_SEQ2)
3627
	@cd ${.CURDIR} && \
3628
		${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SEQ2}
3629
.endif
3536
	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
3630
	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
3537
.elif defined(USE_SUBMAKE)
3631
.elif defined(USE_SUBMAKE)
3538
${${target:U}_COOKIE}: ${_${target:U}_DEP}
3632
${${target:U}_COOKIE}: ${_${target:U}_DEP}
3539
	@cd ${.CURDIR} && \
3633
	@cd ${.CURDIR} && \
3540
		${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ}
3634
		${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ} ${_${target:U}_SEQ2}
3541
	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
3635
	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
3542
.else
3636
.else
3543
${${target:U}_COOKIE}: ${_${target:U}_DEP} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ}
3637
${${target:U}_COOKIE}: ${_${target:U}_DEP} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ} ${_${target:U}_SEQ2}
3544
	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
3638
	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
3545
.endif
3639
.endif
3546
3640
Lines 3563-3569 Link Here
3563
.ORDER: ${_PATCH_DEP} ${_PATCH_SEQ}
3657
.ORDER: ${_PATCH_DEP} ${_PATCH_SEQ}
3564
.ORDER: ${_CONFIGURE_DEP} ${_CONFIGURE_SEQ}
3658
.ORDER: ${_CONFIGURE_DEP} ${_CONFIGURE_SEQ}
3565
.ORDER: ${_BUILD_DEP} ${_BUILD_SEQ}
3659
.ORDER: ${_BUILD_DEP} ${_BUILD_SEQ}
3566
.ORDER: ${_INSTALL_DEP} ${_INSTALL_SEQ}
3660
.if defined(CLEANROOM_INSTALL)
3661
.ORDER:	${_PKGBUILD_DEP} ${_PKGBUILD_SEQ} ${_PKGBUILD_SUSEQ} ${_PKGBUILD_SEQ2}
3662
.endif
3663
.ORDER: ${_INSTALL_DEP} ${_INSTALL_SEQ} ${_INSTALL_SUSEQ} ${_INSTALL_SEQ2}
3567
.ORDER: ${_PACKAGE_DEP} ${_PACKAGE_SEQ}
3664
.ORDER: ${_PACKAGE_DEP} ${_PACKAGE_SEQ}
3568
3665
3569
extract-message:
3666
extract-message:
Lines 3574-3588 Link Here
3574
	@${ECHO_MSG} "===>  Configuring for ${PKGNAME}"
3671
	@${ECHO_MSG} "===>  Configuring for ${PKGNAME}"
3575
build-message:
3672
build-message:
3576
	@${ECHO_MSG} "===>  Building for ${PKGNAME}"
3673
	@${ECHO_MSG} "===>  Building for ${PKGNAME}"
3674
.if !defined(CLEANROOM_INSTALL)
3577
install-message:
3675
install-message:
3578
	@${ECHO_MSG} "===>  Installing for ${PKGNAME}"
3676
	@${ECHO_MSG} "===>  Installing for ${PKGNAME}"
3579
package-message:
3677
package-message:
3580
	@${ECHO_MSG} "===>  Building package for ${PKGNAME}"
3678
	@${ECHO_MSG} "===>  Building package for ${PKGNAME}"
3679
.else
3680
pkgbuild-message:
3681
	@${ECHO_MSG} "===>  Clean room installation for ${PKGNAME}"
3682
pkgbuild2-message:
3683
	@${ECHO_MSG} "===>  Building package for ${PKGNAME}"
3684
install-message:
3685
	@${ECHO_MSG} "===>  Installing package for ${PKGNAME}"
3686
package-message:
3687
	@${ECHO_MSG} "===>  Archiving package for ${PKGNAME}"
3688
.endif
3581
3689
3582
# Empty pre-* and post-* targets
3690
# Empty pre-* and post-* targets
3583
3691
3584
.for stage in pre post
3692
.for stage in pre post
3585
.for name in check-sanity fetch extract patch configure build install package
3693
.for name in check-sanity fetch extract patch configure build pkgbuild install package
3586
3694
3587
.if !target(${stage}-${name})
3695
.if !target(${stage}-${name})
3588
${stage}-${name}:
3696
${stage}-${name}:
Lines 3719-3724 Link Here
3719
3827
3720
.if !target(clean)
3828
.if !target(clean)
3721
clean:
3829
clean:
3830
.if ${UID} != 0 && !defined(INSTALL_AS_USER) && defined(CLEANROOM_INSTALL)
3831
	@${ECHO_MSG} "===>  Switching to root credentials for '${.TARGET}' target"
3832
	@cd ${.CURDIR} && \
3833
		${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${.TARGET}"
3834
	@${ECHO_MSG} "===>  Returning to user credentials"
3835
.else
3722
.if !defined(NOCLEANDEPENDS)
3836
.if !defined(NOCLEANDEPENDS)
3723
	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} clean-depends
3837
	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} clean-depends
3724
.endif
3838
.endif
Lines 3731-3736 Link Here
3731
	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} post-clean
3845
	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} post-clean
3732
.endif
3846
.endif
3733
.endif
3847
.endif
3848
.endif
3734
3849
3735
.if !target(pre-distclean)
3850
.if !target(pre-distclean)
3736
pre-distclean:
3851
pre-distclean:
Lines 3978-3984 Link Here
3978
package-noinstall:
4093
package-noinstall:
3979
	@${MKDIR} ${WRKDIR}
4094
	@${MKDIR} ${WRKDIR}
3980
	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} pre-package \
4095
	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} pre-package \
3981
		pre-package-script do-package post-package-script
4096
		pre-package-script do-package post-package post-package-script
3982
	@${RM} -f ${TMPPLIST}
4097
	@${RM} -f ${TMPPLIST}
3983
	-@${RMDIR} ${WRKDIR}
4098
	-@${RMDIR} ${WRKDIR}
3984
.endif
4099
.endif
Lines 4562-4572 Link Here
4562
		[ "`${SED} -En -e '/^@cw?d[ 	]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
4677
		[ "`${SED} -En -e '/^@cw?d[ 	]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \
4563
		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
4678
		${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
4564
	fi
4679
	fi
4565
	@${FIND} -P ${PORTDOCS:S/^/${DOCSDIR}\//} ! -type d 2>/dev/null | \
4680
	@${FIND} -P ${PORTDOCS:S/^/${DESTDIR}${DOCSDIR}\//} ! -type d 2>/dev/null | \
4566
		${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
4681
		${SED} -ne 's,^${DESTDIR}${PREFIX}/,,p' >> ${TMPPLIST}
4567
	@${FIND} -P -d ${PORTDOCS:S/^/${DOCSDIR}\//} -type d 2>/dev/null | \
4682
	@${FIND} -P -d ${PORTDOCS:S/^/${DESTDIR}${DOCSDIR}\//} -type d 2>/dev/null | \
4568
		${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
4683
		${SED} -ne 's,^${DESTDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
4569
	@if [ -d "${DOCSDIR}" ]; then \
4684
	@if [ -d "${DESTDIR}${DOCSDIR}" ]; then \
4570
		${ECHO_CMD} "@unexec rmdir %D/${DOCSDIR:S,^${PREFIX}/,,} 2>/dev/null || true" >> ${TMPPLIST}; \
4685
		${ECHO_CMD} "@unexec rmdir %D/${DOCSDIR:S,^${PREFIX}/,,} 2>/dev/null || true" >> ${TMPPLIST}; \
4571
	fi
4686
	fi
4572
.else
4687
.else
Lines 4579-4585 Link Here
4579
.for i in ${INFO}
4694
.for i in ${INFO}
4580
	@${ECHO_CMD} "@unexec install-info --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
4695
	@${ECHO_CMD} "@unexec install-info --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
4581
		>> ${TMPPLIST}
4696
		>> ${TMPPLIST}
4582
	@${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
4697
	@${LS} ${DESTDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${DESTDIR}${PREFIX}/::g >> ${TMPPLIST}
4583
	@${ECHO_CMD} "@exec install-info %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
4698
	@${ECHO_CMD} "@exec install-info %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
4584
		>> ${TMPPLIST}
4699
		>> ${TMPPLIST}
4585
.endfor
4700
.endfor
Lines 4590-4610 Link Here
4590
.if defined(_MANPAGES) || defined(_MLINKS)
4705
.if defined(_MANPAGES) || defined(_MLINKS)
4591
.if ${MANCOMPRESSED} == yes && defined(NOMANCOMPRESS)
4706
.if ${MANCOMPRESSED} == yes && defined(NOMANCOMPRESS)
4592
	@${ECHO_MSG} "===>   Uncompressing manual pages for ${PKGNAME}"
4707
	@${ECHO_MSG} "===>   Uncompressing manual pages for ${PKGNAME}"
4593
	@_manpages='${_MANPAGES:S/'/'\''/g}' && [ "$${_manpages}" != "" ] && ( eval ${GUNZIP_CMD} $${_manpages} ) || ${TRUE}
4708
	@_manpages='${_MANPAGES:S/^/${DESTDIR}/:S/'/'\''/g}' && [ "$${_manpages}" != "" ] && ( eval ${GUNZIP_CMD} $${_manpages} ) || ${TRUE}
4594
.elif ${MANCOMPRESSED} == no && !defined(NOMANCOMPRESS)
4709
.elif ${MANCOMPRESSED} == no && !defined(NOMANCOMPRESS)
4595
	@${ECHO_MSG} "===>   Compressing manual pages for ${PKGNAME}"
4710
	@${ECHO_MSG} "===>   Compressing manual pages for ${PKGNAME}"
4596
	@_manpages='${_MANPAGES:S/'/'\''/g}' && [ "$${_manpages}" != "" ] && ( eval ${GZIP_CMD} $${_manpages} ) || ${TRUE}
4711
	@_manpages='${_MANPAGES:S/^/${DESTDIR}/:S/'/'\''/g}' && [ "$${_manpages}" != "" ] && ( eval ${GZIP_CMD} $${_manpages} ) || ${TRUE}
4597
.endif
4712
.endif
4598
.if defined(_MLINKS)
4713
.if defined(_MLINKS)
4599
	@set ${_MLINKS}; \
4714
	@set ${_MLINKS}; \
4600
	while :; do \
4715
	while :; do \
4601
		[ $$# -eq 0 ] && break || ${TRUE}; \
4716
		[ $$# -eq 0 ] && break || ${TRUE}; \
4602
		${RM} -f $${2%.gz}; ${RM} -f $$2.gz; \
4717
		${RM} -f ${DESTDIR}$${2%.gz}; ${RM} -f ${DESTDIR}$$2.gz; \
4603
		${LN} -fs `${ECHO_CMD} $$1 $$2 | ${AWK} '{ \
4718
		${LN} -fs `${ECHO_CMD} $$1 $$2 | ${AWK} '{ \
4604
					z=split($$1, a, /\//); x=split($$2, b, /\//); \
4719
					z=split($$1, a, /\//); x=split($$2, b, /\//); \
4605
					while (a[i] == b[i]) i++; \
4720
					while (a[i] == b[i]) i++; \
4606
					for (q=i; q<x; q++) printf "../"; \
4721
					for (q=i; q<x; q++) printf "../"; \
4607
					for (; i<z; i++) printf a[i] "/"; printf a[z]; }'` $$2; \
4722
					for (; i<z; i++) printf a[i] "/"; printf a[z]; }'` ${DESTDIR}$$2; \
4608
		shift; shift; \
4723
		shift; shift; \
4609
	done
4724
	done
4610
.endif
4725
.endif

Return to bug 66032