diff options
| author | ade <ade@FreeBSD.org> | 2010-12-04 07:34:27 +0000 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2010-12-04 07:34:27 +0000 |
| commit | a44c192a2f5c31ae449c6b008b8a42bcc7ee099d (patch) | |
| tree | 14d9392b22ced431dae442dd74506f7e26011de3 /Mk | |
| parent | db3ee9b87911306ae5e8d8b79d43c0e4c925954d (diff) | |
| download | FreeBSD-ports-a44c192a2f5c31ae449c6b008b8a42bcc7ee099d.zip FreeBSD-ports-a44c192a2f5c31ae449c6b008b8a42bcc7ee099d.tar.gz | |
Sync to new bsd.autotools.mk
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.php.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index a2fd0dc..7743670 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -690,7 +690,7 @@ PLIST_SUB+= GTK2_VERSION="${GTK2_VERSION}" \ # Then handle the ltverhack component (it has to be done here, because # we rely on some bsd.autotools.mk variables, and bsd.autotools.mk is # included in the post-makefile section). -.if defined(AUTOTOOL_libtool) +.if defined(_AUTOTOOL_libtool) lthacks_CONFIGURE_ENV= ac_cv_path_DOLT_BASH= lthacks_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ ${CP} -pf ${LIBTOOL} ${WRKDIR}/gnome-libtool && \ diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk index 23af67b..db3cd62 100644 --- a/Mk/bsd.php.mk +++ b/Mk/bsd.php.mk @@ -157,7 +157,7 @@ SUB_LIST+= PHP_EXT_DIR=${PHP_EXT_DIR} .if defined(USE_PHPIZE) || defined(USE_PHPEXT) BUILD_DEPENDS+= ${PHPBASE}/bin/phpize:${PORTSDIR}/${PHP_PORT} GNU_CONFIGURE= yes -USE_AUTOTOOLS+= autoconf:268:env +USE_AUTOTOOLS+= autoconf:env CONFIGURE_ARGS+=--with-php-config=${PHPBASE}/bin/php-config configure-message: phpize-message do-phpize diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c25e695..ff7d73c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3748,6 +3748,11 @@ do-patch: fi .endif +.if !target(patch-autotools) +patch-autotools: + @${DO_NADA} +.endif + .if !target(run-autotools) run-autotools: @${DO_NADA} @@ -4412,7 +4417,7 @@ _EXTRACT_SEQ= check-build-conflicts extract-message checksum extract-depends \ post-extract post-extract-script _PATCH_DEP= extract _PATCH_SEQ= ask-license patch-message patch-depends patch-dos2unix pre-patch \ - pre-patch-script do-patch post-patch post-patch-script + pre-patch-script do-patch patch-autotools post-patch post-patch-script _CONFIGURE_DEP= patch _CONFIGURE_SEQ= build-depends lib-depends configure-message \ pre-configure pre-configure-script \ |
