diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2007-03-18 00:06:48 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-03-18 00:06:48 +0000 |
commit | 0d7fdcd1dab28dc247b84b610fba45ed72ac1004 (patch) | |
tree | 4738405616f6e916b8e1441af2c7cf1473baa222 /ports-mgmt/portmk | |
parent | - Fix plist: cover manpage links (diff) |
Update to current exprun, except the python bits, which would require changes
outside Mk/
Notes
Notes:
svn path=/head/; revision=187619
Diffstat (limited to 'ports-mgmt/portmk')
-rw-r--r-- | ports-mgmt/portmk/Mk/bsd.autotools.mk | 326 | ||||
-rw-r--r-- | ports-mgmt/portmk/Mk/bsd.efl.mk | 307 | ||||
-rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.mk | 354 | ||||
-rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.subdir.mk | 23 |
4 files changed, 842 insertions, 168 deletions
diff --git a/ports-mgmt/portmk/Mk/bsd.autotools.mk b/ports-mgmt/portmk/Mk/bsd.autotools.mk new file mode 100644 index 000000000000..41ad8cdb5441 --- /dev/null +++ b/ports-mgmt/portmk/Mk/bsd.autotools.mk @@ -0,0 +1,326 @@ +#-*- mode: makefile; tab-width: 4; -*- +# ex:ts=4 +# +# $FreeBSD$ +# +# Please view me with 4 column tabs! +# +# Please make sure all changes to this file are passed either through +# the maintainer, or portmgr@FreeBSD.org + +Autotools_Include_MAINTAINER= ade@FreeBSD.org + +#--------------------------------------------------------------------------- +# IMPORTANT! READ ME! YES, THAT MEANS YOU! +# +# The "versioned" autotools referenced here are for BUILDING other ports +# only. THIS CANNOT BE STRESSED HIGHLY ENOUGH. Things WILL BREAK if you +# try to use them for anything other than ports/ work. This particularly +# includes use as a run-time dependency. +# +# If you need unmodified versions of autotools, such as for use in an +# IDE, then you MUST use the devel/gnu-* equivalents, and NOT these. +# See devel/anjuta and devel/kdevelop for examples. +# +# You have been WARNED! +#--------------------------------------------------------------------------- + +#--------------------------------------------------------------------------- +# Entry point into the autotools system +#--------------------------------------------------------------------------- +# +# USE_AUTOTOOLS= tool:version[:env] ... +# +# 'tool' can currently be one of: +# libtool, libltdl, autoconf, autoheader, automake, aclocal +# +# 'version' is tool dependent +# +# ':env' is used to pecify that the environment variables are needed, +# but the relevant tool should NOT be run as part of the +# run-autotools target +# +# XXX: there is currently no sanity checking of the supplied variables +# other than to detect actually available versions. This should +# probably be fixed at some point. +# +# In addition, the following variables can be set in the port Makefile +# to be passed to the relevant tools: +# +# AUTOMAKE_ARGS=... +# - Extra arguments passed to automake during configure step +# +# ACLOCAL_ARGS=... +# - Arguments passed to aclocal during configure step +# +# AUTOCONF_ARGS=... +# - Extra arguments passed to autoconf during configure step +# +# AUTOHEADER_ARGS=... +# - Extra arguments passed to autoheader during configure step +# +# LIBTOOLFLAGS=<value> +# - Arguments passed to libtool during configure step +# +# LIBTOOLFILES=<list-of-files> +# - A list of files to patch during libtool pre-configuration +# Defaults to "aclocal.m4" if autoconf is in use, otherwise +# ${CONFIGURE_SCRIPT} (usually "configure") +# +#--------------------------------------------------------------------------- + +# XXX: here be dragons :) +# +.for item in ${USE_AUTOTOOLS} +AUTOTOOL_${item:C/^([^:]+).*/\1/}${item:M*\:*\:*:C/^[^:]+:[^:]+:([^:]+)/_\1/}= ${item:C/^[^:]+:([^:]+).*/\1/} +.endfor + +# XXX: temporary to highlight any missed ports in the conversion +# +.if defined(AUTOTOOL_libtool_inc) +IGNORE+= error: libtool:${AUTOTOOL_libtool_inc}:inc construct no longer available +.endif + +#--------------------------------------------------------------------------- +# AUTOMAKE/ACLOCAL +#--------------------------------------------------------------------------- + +.if defined(AUTOTOOL_automake) +AUTOTOOL_automake_env= ${AUTOTOOL_automake} +GNU_CONFIGURE?= yes +.endif + +.if defined(AUTOTOOL_aclocal) +AUTOTOOL_automake_env= ${AUTOTOOL_aclocal} +GNU_CONFIGURE?= yes +.endif + +.if defined(AUTOTOOL_automake_env) +AUTOMAKE_VERSION= ${AUTOTOOL_automake_env} + +# Make sure we specified a legal version of automake +# +. if !exists(${PORTSDIR}/devel/automake${AUTOMAKE_VERSION}/Makefile) +IGNORE+= cannot install: unknown AUTOMAKE version: ${AUTOMAKE_VERSION} +. endif + +# Set up the automake environment +# +AUTOMAKE= ${LOCALBASE}/bin/automake${AUTOMAKE_VERSION} +AUTOMAKE_DIR= ${LOCALBASE}/share/automake${AUTOMAKE_VERSION} +ACLOCAL= ${LOCALBASE}/bin/aclocal${AUTOMAKE_VERSION} +ACLOCAL_DIR= ${LOCALBASE}/share/aclocal${AUTOMAKE_VERSION} +AUTOMAKE_PATH= ${LOCALBASE}/libexec/automake${AUTOMAKE_VERSION}: +AUTOMAKE_VARS= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} + +AUTOMAKE_DEPENDS= ${AUTOMAKE}:${PORTSDIR}/devel/automake${AUTOMAKE_VERSION} +BUILD_DEPENDS+= ${AUTOMAKE_DEPENDS} + +# XXX: backwards compatibility shim +# +. if ${AUTOMAKE_VERSION} == 14 +AUTOMAKE_ARGS+= -i +. endif + +. if defined(AUTOTOOL_aclocal) +ACLOCAL_ARGS?= --acdir=${ACLOCAL_DIR} +. endif + +.endif + +#--------------------------------------------------------------------------- +# AUTOCONF/AUTOHEADER +#--------------------------------------------------------------------------- + +.if defined(AUTOTOOL_autoheader) +AUTOTOOL_autoconf= ${AUTOTOOL_autoheader} +.endif + +.if defined(AUTOTOOL_autoconf) +AUTOTOOL_autoconf_env= ${AUTOTOOL_autoconf} +GNU_CONFIGURE?= yes +.endif + +.if defined(AUTOTOOL_autoconf_env) +AUTOCONF_VERSION= ${AUTOTOOL_autoconf_env} + +# Make sure we specified a legal version of autoconf +# +. if !exists(${PORTSDIR}/devel/autoconf${AUTOCONF_VERSION}/Makefile) +IGNORE+= cannot install: unknown AUTOCONF version: ${AUTOCONF_VERSION} +. endif + +# Set up the autoconf/autoheader environment +# +AUTOCONF= ${LOCALBASE}/bin/autoconf${AUTOCONF_VERSION} +AUTOCONF_DIR= ${LOCALBASE}/share/autoconf${AUTOCONF_VERSION} +AUTOHEADER= ${LOCALBASE}/bin/autoheader${AUTOCONF_VERSION} +AUTOIFNAMES= ${LOCALBASE}/bin/ifnames${AUTOCONF_VERSION} +AUTOM4TE= ${LOCALBASE}/bin/autom4te${AUTOCONF_VERSION} +AUTORECONF= ${LOCALBASE}/bin/autoreconf${AUTOCONF_VERSION} +AUTOSCAN= ${LOCALBASE}/bin/autoscan${AUTOCONF_VERSION} +AUTOUPDATE= ${LOCALBASE}/bin/autoupdate${AUTOCONF_VERSION} +AUTOCONF_PATH= ${LOCALBASE}/libexec/autoconf${AUTOCONF_VERSION}: +AUTOCONF_VARS= AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} AUTOIFNAMES=${AUTOIFNAMES} AUTOM4TE=${AUTOM4TE} AUTORECONF=${AUTORECONF} AUTOSCAN=${AUTOSCAN} AUTOUPDATE=${AUTOUPDATE} + +AUTOCONF_DEPENDS= ${AUTOCONF}:${PORTSDIR}/devel/autoconf${AUTOCONF_VERSION} +BUILD_DEPENDS+= ${AUTOCONF_DEPENDS} + +.endif + +#--------------------------------------------------------------------------- +# LIBTOOL/LIBLTDL +#--------------------------------------------------------------------------- + +# Convenience function to save people having to depend directly on +# devel/libltdl15 +# +.if defined(AUTOTOOL_libltdl) +LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl15 +.endif + +.if defined(AUTOTOOL_libtool) +GNU_CONFIGURE?= YES +AUTOTOOL_libtool_env= ${AUTOTOOL_libtool} +.endif + +.if defined(AUTOTOOL_libtool_env) +LIBTOOL_VERSION= ${AUTOTOOL_libtool_env} + +# Make sure we specified a legal version of libtool +# +. if !exists(${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}/Makefile) +IGNORE+= cannot install: unknown LIBTOOL version: ${LIBTOOL_VERSION} +. endif + +# Set up the libtool environment +# +LIBTOOL= ${LOCALBASE}/bin/libtool +LIBTOOLIZE= ${LOCALBASE}/bin/libtoolize +LIBTOOL_LIBEXECDIR= ${LOCALBASE}/libexec/libtool +LIBTOOL_SHAREDIR= ${LOCALBASE}/share/libtool +LIBTOOL_M4= ${LOCALBASE}/share/aclocal/libtool.m4 +LTMAIN= ${LIBTOOL_SHAREDIR}/ltmain.sh +LIBTOOL_VARS= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} LIBTOOL_M4=${LIBTOOL_M4} + +LIBTOOL_DEPENDS= ${LIBTOOL}:${PORTSDIR}/devel/libtool${LIBTOOL_VERSION} +BUILD_DEPENDS+= ${LIBTOOL_DEPENDS} + +LIBTOOLFLAGS?= # default to empty + +. if defined(AUTOTOOL_autoconf) +LIBTOOLFILES?= aclocal.m4 +. else +LIBTOOLFILES?= ${CONFIGURE_SCRIPT} +. endif + +.endif + +#--------------------------------------------------------------------------- +# Environmental handling +# Now that we've got our environments defined for autotools, add them +# in so that the rest of the world can handle them +# +AUTOTOOLS_PATH= ${AUTOMAKE_PATH}${AUTOCONF_PATH} +AUTOTOOLS_VARS= ${AUTOMAKE_VARS} ${AUTOCONF_VARS} ${LIBTOOL_VARS} + +.if defined(AUTOTOOLS_PATH) && (${AUTOTOOLS_PATH} != "") +AUTOTOOLS_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} +CONFIGURE_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} +MAKE_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} +SCRIPTS_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} +. for item in automake aclocal autoconf autoheader libtool +. if defined(AUTOTOOL_${item}_env) +${item:U}_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} +. endif +. endfor +.endif + +.if defined(AUTOTOOLS_VARS) && (${AUTOTOOLS_VARS} != "") +AUTOTOOLS_ENV+= ${AUTOTOOLS_VARS} +CONFIGURE_ENV+= ${AUTOTOOLS_VARS} +MAKE_ENV+= ${AUTOTOOLS_VARS} +SCRIPTS_ENV+= ${AUTOTOOLS_VARS} +. for item in automake aclocal autoconf autoheader libtool +. if defined(AUTOTOOL_${item}_env) +${item:U}_ENV+= ${AUTOTOOLS_VARS} +. endif +. endfor +.endif + +#--------------------------------------------------------------------------- +# Make targets +#--------------------------------------------------------------------------- + +# run-autotools +# +# Part of the configure set - run appropriate programs prior to +# the actual configure target if autotools are in use. +# If needed, this target can be overridden, for example to change +# the order of autotools running. + +.if !target(run-autotools) +run-autotools:: run-autotools-aclocal patch-autotools run-autotools-autoheader \ + run-autotools-autoconf run-autotools-automake +.endif + +.if !target(run-autotools-aclocal) +run-autotools-aclocal: +. if defined(AUTOTOOL_aclocal) + @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + ${ACLOCAL_ARGS}) +. else + @${DO_NADA} +. endif +.endif + +.if !target(run-autotools-automake) +run-autotools-automake: +. if defined(AUTOTOOL_automake) + @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \ + ${AUTOMAKE_ARGS}) +. else + @${DO_NADA} +. endif +.endif + +.if !target(run-autotools-autoconf) +run-autotools-autoconf: +. if defined(AUTOTOOL_autoconf) + @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \ + ${AUTOCONF_ARGS}) +. else + @${DO_NADA} +. endif +.endif + +.if !target(run-autotools-autoheader) +run-autotools-autoheader: +. if defined(AUTOTOOL_autoheader) + @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \ + ${AUTOHEADER_ARGS}) +. else + @${DO_NADA} +. endif +.endif + +# patch-autotools +# +# Special target to automatically make libtool using ports use the +# libtool port. See above for default values of LIBTOOLFILES. + +.if !target(patch-autotools) +patch-autotools:: +. if defined(AUTOTOOL_libtool) + @(cd ${PATCH_WRKSRC}; \ + for file in ${LIBTOOLFILES}; do \ + ${CP} $$file $$file.tmp; \ + ${SED} -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + $$file.tmp > $$file; \ + ${RM} $$file.tmp; \ + done); +. else + @${DO_NADA} +. endif +.endif diff --git a/ports-mgmt/portmk/Mk/bsd.efl.mk b/ports-mgmt/portmk/Mk/bsd.efl.mk new file mode 100644 index 000000000000..b8d0f1098ee3 --- /dev/null +++ b/ports-mgmt/portmk/Mk/bsd.efl.mk @@ -0,0 +1,307 @@ +# +# $MBSDlabs: portmk/bsd.efl.mk,v 1.17 2006/10/02 14:57:48 stas Exp $ +# $FreeBSD$ +# +# bsd.efl.mk - Support for Enlightenment Foundation Libraries (EFL) +# +# Author: Stanislav Sedov <ssedov@mbsd.msk.ru> +# Inspired by bsd.sdl.mk by Edwin Groothuis <edwin@freebsd.org> +# +# You can specify EFL-related library dependency using "USE_EFL=" statement, +# e.g. "USE_EFL= ecore evas" will add x11/ecore and graphics/evas as dependency +# for your port. +# You can check existency of certain library throught "WANT_EFL/HAVE_EFL" pair. +# Note: WANT_EFL should be defined before including <bsd.port.pre.mk>, and +# HAVE_EFL variable could be tested after it. For example: +# +# WANT_EFL= yes +# .include <bsd.port.pre.mk> +# .if ${HAVE_EFL:Mevas} +# USE_EFL+= evas +# .endif +# +# Currently recognized variables are: +# USE_EFL - lists all EFL libraries which port depends on +# WANT_EFL - the port wants to test which of EFL libraries are installed +# on the target system +# USE_EFL_ESMART- the ports depends on specified esmart objects (or on all +# esmart objects if "yes") +# +# The following variables could be tested after inclusion of bsd.port.pre.mk: +# HAVE_EFL - lists all EFL libraries which are available on target system +# HAVE_EFL_ESMART - esmart objects available +# +# Feel free to send any comments and suggestion to maintainer. +# + +EFL_Include_MAINTAINER= ssedov@mbsd.msk.ru + +# +# Define all supported libraries +# +_USE_EFL_ALL= ecore edb edje eet embryo emotion engrave enhance epeg \ + epsilon etk etox evas evfs ewl exml imlib2 + +# For each library supported we define the following variables: +# _%%LIB%%_CATEGORY - category the port belongs to +# _%%LIB%%_DEPENDS - other EFL libraries the library +# itself depends on. We'll define them explicitly +# to handle unwanted deinstalls. +# _%%LIB%%_PREFIX - where the library is installed +# _%%LIB%%_VERSION - version of the shared library +# _%%LIB%%_SLIB - name of the shared library +# + +_ecore_CATEGORY= x11 +_ecore_DEPENDS= evas +_ecore_PREFIX= ${LOCALBASE} +_ecore_VERSION= 1 + +_edb_CATEGORY= databases +_edb_PREFIX= ${LOCALBASE} +_edb_VERSION= 1 + +_eet_CATEGORY= devel +_eet_PREFIX= ${LOCALBASE} +_eet_VERSION= 9 + +_edje_CATEGORY= graphics +_edje_DEPENDS= embryo eet imlib2 evas ecore +_edje_PREFIX= ${LOCALBASE} +_edje_VERSION= 5 + +_embryo_CATEGORY= lang +_embryo_PREFIX= ${LOCALBASE} +_embryo_VERSION= 9 + +_emotion_CATEGORY= multimedia +_emotion_DEPENDS= ecore edje eet embryo evas +_emotion_PREFIX= ${LOCALBASE} +_emotion_VERSION= 0 + +_engrave_CATEGORY= devel +_engrave_DEPENDS= ecore evas +_engrave_PREFIX= ${LOCALBASE} +_engrave_VERSION= 1 + +_enhance_CATEGORY= x11-toolkits +_enhance_DEPENDS= ecore etk exml +_enhance_PREFIX= ${LOCALBASE} +_enhance_VERSION= 0 + +_epeg_CATEGORY= graphics +_epeg_PREFIX= ${LOCALBASE} +_epeg_VERSION= 9 + +_epsilon_CATEGORY= graphics +_epsilon_DEPENDS= epeg edje imlib2 ecore +_epsilon_PREFIX= ${LOCALBASE} +_epsilon_VERSION= 0 + +_etk_CATEGORY= x11-toolkits +_etk_DEPENDS= evas ecore edje +_etk_PREFIX= ${LOCALBASE} +_etk_VERSION= 1 + +_etox_CATEGORY= x11-toolkits +_etox_DEPENDS= edb evas ecore +_etox_PREFIX= ${LOCALBASE} +_etox_VERSION= 0 + +_evas_CATEGORY= graphics +_evas_DEPENDS= eet edb +_evas_PREFIX= ${LOCALBASE} +_evas_VERSION= 1 + +_evfs_CATEGORY= devel +_evfs_DEPENDS= eet ecore +_evfs_PREFIX= ${LOCALBASE} +_evfs_VERSION= 0 + +_ewl_CATEGORY= x11-toolkits +_ewl_DEPENDS= evas ecore edje epsilon +_ewl_PREFIX= ${LOCALBASE} +_ewl_VERSION= 1 + +_exml_CATEGORY= textproc +_exml_DEPENDS= ecore +_exml_PREFIX= ${LOCALBASE} +_exml_VERSION= 1 + +_imlib2_CATEGORY= graphics +_imlib2_PREFIX= ${LOCALBASE} +_imlib2_VERSION= 4 +_imlib2_SLIB= Imlib2 + +# +# Assign values for variables which were not defined explicitly +# +.for LIB in ${_USE_EFL_ALL} +. if !defined(_${LIB}_DEPENDS) +_${LIB}_DEPENDS= #empty +. endif +. if !defined(_${LIB}_SLIB) +_${LIB}_SLIB=${LIB} +. endif +.endfor + +# +# Esmart support. We'll define esmart components in the way they are +# defined for EFL. +# Values processed: +# _esmart_COMP_CATEGORY - Where the port for this esmart object is located +# _esmart_COMP_PORTNAME - Object's port subdirectory +# _esmart_COMP_DEPENDS - Other components which this object depends on +# _esmart_COMP_PREFIX - Where the shared library for this object is located +# _esmart_COMP_VERSION - Version of the shared library +# + +# All components that are currently supported +_EFL_ESMART_ALL= container draggies file_dialog text_entry \ + thumb trans_x11 + +# +# Generic stock esmart definitions +# +_EFL_ESMART_CATEGORY= graphics +_EFL_ESMART_PORTNAME= esmart +_EFL_ESMART_DEPENDS= epsilon evas ecore imlib2 edje +_EFL_ESMART_PREFIX= ${LOCALBASE} +_EFL_ESMART_VERSION= 0 + +# +# Assign values for variables which were not defined explicitly +# +.for COMP in ${_EFL_ESMART_ALL} +. if !defined(_esmart_${COMP}_CATEGORY) +_esmart_${COMP}_CATEGORY= ${_EFL_ESMART_CATEGORY} +. endif +. if !defined(_esmart_${COMP}_PORTNAME) +_esmart_${COMP}_PORTNAME= ${_EFL_ESMART_PORTNAME} +. endif +. if !defined(_esmart_${COMP}_PREFIX) +_esmart_${COMP}_PREFIX= ${_EFL_ESMART_PREFIX} +. endif +. if !defined(_esmart_${COMP}_DEPENDS) +_esmart_${COMP}_DEPENDS= #empty +. endif +. if !defined(_esmart_${COMP}_SLIB) +_esmart_${COMP}_SLIB= esmart_${COMP} +. endif +. if !defined(_esmart_${COMP}_VERSION) +_esmart_${COMP}_VERSION= ${_EFL_ESMART_VERSION} +. endif +.endfor + +# +# Handle WANT_EFL feature +# +.if !defined(AFTERPORTMK) +.if !defined(EFL_Include_pre) + +EFL_Include_pre= bsd.efl.mk + +HAVE_EFL?= +HAVE_EFL_ESMART?= +.if defined(WANT_EFL) +. for LIB in ${_USE_EFL_ALL} +. if exists(${_${LIB}_PREFIX}/lib/lib${_${LIB}_SLIB}.so.${_${LIB}_VERSION}) +HAVE_EFL+= ${LIB} +. endif +. endfor +. for COMP in ${_EFL_ESMART_ALL} +. if exists(${_esmart_${COMP}_PREFIX}/lib/lib${_esmart_${COMP}_SLIB}.so.${_esmart_${COMP}_VERSION}) +HAVE_EFL_ESMART+= ${COMP} +. endif +. endfor +.endif + +.endif #EFL_Include_pre +.endif #AFTERPORTMK + +# +# Handle USE_EFL & USE_ESMART feature +# +.if !defined(BEFOREPORTMK) +.if !defined(EFL_Include_post) + +.if defined(USE_EFL_ESMART) + +USE_EFL+= ${_EFL_ESMART_DEPENDS} #we use EFL too + +_USE_EFL_ESMART= #empty +.if USE_EFL_ESMART=="yes" +_USE_EFL_ESMART= ${_EFL_ESMART_ALL} +.else +. for COMP in ${USE_EFL_ESMART} +. if ${_EFL_ESMART_ALL:M${COMP}}=="" +IGNORE= cannot install: unknown Esmart component ${COMP} +. else +_USE_EFL_ESMART+= ${COMP} ${_esmart_${COMP}_DEPENDS} +. endif +. endfor +.endif + +# Get rid of duplicates +#.if ${OSVERSION} > 700016 +#_USE_EFL_ESMART_UQ= ${_USE_EFL_ESMART:O:u} +#.else +_USE_EFL_ESMART_UQ= #empty +. for COMP in ${_USE_EFL_ESMART} +. if ${_USE_EFL_ESMART_UQ:M${COMP}}=="" +_USE_EFL_ESMART_UQ+= ${COMP} +. endif +. endfor +#.endif + +.for COMP in ${_USE_EFL_ESMART_UQ} +LIB_DEPENDS+= ${_esmart_${COMP}_SLIB}.${_esmart_${COMP}_VERSION}:${PORTSDIR}/${_esmart_${COMP}_CATEGORY}/${_esmart_${COMP}_PORTNAME} +.endfor + +.endif #USE_EFL_ESMART + +.if defined(USE_EFL) + +EFL_Include_post= bsd.efl.mk + +# +# Check if we have all libraries requiested and build depends list +# +_USE_EFL= #empty +.for LIB in ${USE_EFL} +. if ${_USE_EFL_ALL:M${LIB}}=="" +IGNORE= cannot install: unknown library ${LIB} +. endif +_USE_EFL+= ${_${LIB}_DEPENDS} ${LIB} +.endfor + +# +# Get rid of duplicates +# +_USE_EFL_UQ= #empty +.for LIB in ${_USE_EFL} +. if ${_USE_EFL_UQ:M${LIB}}=="" +_USE_EFL_UQ+= ${LIB} +. endif +.endfor + +# +# define dependencies +# +.for LIB in ${_USE_EFL_UQ} +LIB_DEPENDS+= ${_${LIB}_SLIB}.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}/${LIB} +.endfor + +# +# Initialize configure enviropment +# +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${LDFLAGS}" + +PLIST_SUB+= E17_ARCH=freebsd${OSREL}-${ARCH} + +.endif #USE_EFL + +.endif #EFL_Include_post +.endif #BEFOREPORTMK diff --git a/ports-mgmt/portmk/Mk/bsd.port.mk b/ports-mgmt/portmk/Mk/bsd.port.mk index c2004607ec7f..b17c58085afe 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.mk @@ -217,7 +217,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # NOT_FOR_ARCHS_REASON # NOT_FOR_ARCHS_REASON_${ARCH} # - Reason why it's not for ${NOT_FOR_ARCHS}s -# IA32_BINARY_PORT - Set this instead of ONLY_FOR_ARCHS if the given port +# IA32_BINARY_PORT +# - Set this instead of ONLY_FOR_ARCHS if the given port # fetches and installs compiled i386 binaries. # # Dependency checking. Use these if your port requires another port @@ -356,10 +357,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # versions for their nationality. # WITH_GHOSTSCRIPT_GPL # - If set, this port uses the GPL version of the ghostscript -# software instead of the GNU version, which is used otherwise. -# WITH_GHOSTSCRIPT_AFPL -# - If set, this port uses the AFPL version of the ghostscript -# software instead of the GNU version, which is used otherwise. +# software instead of the AFPL version, which is used otherwise. +# WITH_GHOSTSCRIPT_GNU +# - If set, this port uses the GNU version of the ghostscript +# software instead of the AFPL version, which is used otherwise. ## # USE_BISON - If set, this port uses bison for building. ## @@ -406,9 +407,12 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # (libtool, autoconf, autoheader, automake et al.) # See bsd.autotools.mk for more details. ## -# USE_SCONS - If set, this port uses the Python-based SCons build system +# USE_SCONS - If set, this port uses the Python-based SCons build system # See bsd.scons.mk for more details. ## +# USE_EFL - If set, this port use EFL libraries. +# Implies inclusion of bsd.efl.mk. (Also see +# that file for more information on USE_EFL_*). # USE_JAVA - If set, this port relies on the Java language. # Implies inclusion of bsd.java.mk. (Also see # that file for more information on USE_JAVA_*). @@ -541,8 +545,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # ${LINUXBASE_REL} if USE_LINUX_PREFIX is set, # otherwise ${LOCALBASE_REL} # -# IGNORE_PATH_CHECKS - There are some sanity checks against PREFIX and DESTDIR. -# You can diasble these checks with defining +# IGNORE_PATH_CHECKS +# - There are some sanity checks against PREFIX and DESTDIR. +# You can disable these checks with defining # this variable, but this is not recommended! # Only do this if you really know what you are # doing. These sanity checks are the following: @@ -728,7 +733,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # # Default sequence for "all" is: # -# check-sanity fetch checksum extract patch configure build +# check-sanity fetch checksum extract patch configure build # # Please read the comments in the targets section below; you # should be able to use the pre-* or post-* targets/scripts @@ -945,10 +950,18 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # # DOCSDIR - Name of the directory to install the packages docs in. # Default: ${TARGETDIR}/share/doc/${PORTNAME} +# DOCSDIR_REL - The DOCSDIR relative to ${TARGETDIR} # EXAMPLESDIR - Name of the directory to install the packages examples in. # Default: ${TARGETDIR}/share/examples/${PORTNAME} +# EXAMPLESDIR_REL +# - The EXAMPLESDIR relative to ${TARGETDIR} # DATADIR - Name of the directory to install the packages shared data in. # Default: ${TARGETDIR}/share/${PORTNAME} +# DATADIR_REL - The DATADIR relative to ${TARGETDIR} +# +# WWWDIR - Name of the directory to install the packages www data in. +# Default: ${TARGETDIR}/www/${PORTNAME} +# WWWDIR_REL - The WWWDIR relative to ${TARGETDIR} # # DESKTOPDIR - Name of the directory to install ${DESKTOP_ENTRIES} in. # Default: ${TARGETDIR}/share/applications @@ -1305,7 +1318,7 @@ DOS2UNIX_REGEX?= .* .if defined(_PREMKINCLUDED) check-makefile:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: you cannot include bsd.port[.pre].mk twice" + @${ECHO_MSG} "${PKGNAME}: Makefile error: you cannot include bsd.port[.pre].mk twice" @${FALSE} .endif @@ -1500,6 +1513,14 @@ PERL= ${LOCALBASE}/bin/perl .endif .endif +.if defined(USE_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART) +.if exists(${DEVELPORTSDIR}/Mk/bsd.efl.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.efl.mk" +.else +.include "${PORTSDIR}/Mk/bsd.efl.mk" +.endif +.endif + .if defined(USE_JAVA) .if exists(${DEVELPORTSDIR}/Mk/bsd.java.mk) .include "${DEVELPORTSDIR}/Mk/bsd.java.mk" @@ -1656,7 +1677,7 @@ WWWGRP?= www .if defined(_POSTMKINCLUDED) check-makefile:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: you cannot include bsd.port[.post].mk twice" + @${ECHO_MSG} "${PKGNAME}: Makefile error: you cannot include bsd.port[.post].mk twice" @${FALSE} .endif @@ -1678,7 +1699,7 @@ PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BAS DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR} SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \ - DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR} + WWWDIR=${WWWDIR} DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR} PLIST_REINPLACE+= dirrmtry stopdaemon PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true! @@ -1700,9 +1721,9 @@ CFLAGS:= ${CFLAGS:N-O*:N-fno-strict*} ${DEBUG_FLAGS} .endif .if defined(NOPORTDOCS) -PLIST_SUB+= PORTDOCS="@comment " +PLIST_SUB+= PORTDOCS="@comment " .else -PLIST_SUB+= PORTDOCS="" +PLIST_SUB+= PORTDOCS="" .endif CONFIGURE_SHELL?= ${SH} @@ -1715,7 +1736,7 @@ MAKE_ENV+= SHELL=${SH} NO_LINT=YES .if ${MANCOMPRESSED} != yes && ${MANCOMPRESSED} != no && \ ${MANCOMPRESSED} != maybe check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: value of MANCOMPRESSED (is \"${MANCOMPRESSED}\") can only be \"yes\", \"no\" or \"maybe\"". + @${ECHO_MSG} "${PKGNAME}: Makefile error: value of MANCOMPRESSED (is \"${MANCOMPRESSED}\") can only be \"yes\", \"no\" or \"maybe\"". @${FALSE} .endif .endif @@ -2035,6 +2056,14 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif +.if defined(USE_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART) +.if exists(${DEVELPORTSDIR}/Mk/bsd.efl.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.efl.mk" +.else +.include "${PORTSDIR}/Mk/bsd.efl.mk" +.endif +.endif + .if defined(USE_JAVA) .if exists(${DEVELPORTSDIR}/Mk/bsd.java.mk) .include "${DEVELPORTSDIR}/Mk/bsd.java.mk" @@ -2159,20 +2188,20 @@ CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include # Set the default for the installation of Postscript(TM)- # compatible functionality. .if !defined(WITHOUT_X11) -.if defined(WITH_GHOSTSCRIPT_AFPL) -GHOSTSCRIPT_PORT?= print/ghostscript-afpl +.if defined(WITH_GHOSTSCRIPT_GNU) +GHOSTSCRIPT_PORT?= print/ghostscript-gnu .elif defined(WITH_GHOSTSCRIPT_GPL) GHOSTSCRIPT_PORT?= print/ghostscript-gpl .else -GHOSTSCRIPT_PORT?= print/ghostscript-gnu +GHOSTSCRIPT_PORT?= print/ghostscript-afpl .endif .else -.if defined(WITH_GHOSTSCRIPT_AFPL) -GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11 +.if defined(WITH_GHOSTSCRIPT_GNU) +GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11 .elif defined(WITH_GHOSTSCRIPT_GPL) GHOSTSCRIPT_PORT?= print/ghostscript-gpl-nox11 .else -GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11 +GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11 .endif .endif @@ -2199,6 +2228,18 @@ RUN_DEPENDS+= cdrecord:${PORTSDIR}/sysutils/cdrtools REINPLACE_ARGS?= -i.bak REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS} +# Macro for coping entire directory tree with correct permissions +COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${CHOWN} -R ${BINOWN}:${BINGRP} $$1 && \ + ${FIND} $$1 -type d -exec chmod 755 {} \; && \ + ${FIND} $$1 -type f -exec chmod ${BINMODE} {} \;' -- +COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ + 2>&1) && \ + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \ + ${FIND} $$1/ -type d -exec chmod 755 {} \; && \ + ${FIND} $$1/ -type f -exec chmod ${SHAREMODE} {} \;' -- + # Names of cookies used to skip already completed stages EXTRACT_COOKIE?= ${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX:S/\//_/g} CONFIGURE_COOKIE?= ${WRKDIR}/.configure_done.${PORTNAME}.${PREFIX:S/\//_/g} @@ -2484,8 +2525,8 @@ _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} _G_TEMP= ${_group} . if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default check-makevars:: - @${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be" - @${ECHO_CMD} "used in group definitions. Please fix your MASTER_SITES" + @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES" @${FALSE} . endif _MASTER_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@} @@ -2501,8 +2542,8 @@ _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} _G_TEMP= ${_group} . if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default check-makevars:: - @${ECHO_CMD} "The words all, ALL and default are reserved and cannot be" - @${ECHO_CMD} "used in group definitions. Please fix your PATCH_SITES" + @${ECHO_MSG} "The words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES" @${FALSE} . endif _PATCH_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@} @@ -2523,8 +2564,8 @@ _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} _G_TEMP= ${_group} . if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default check-makevars:: - @${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be" - @${ECHO_CMD} "used in group definitions. Please fix your MASTER_SITE_SUBDIR" + @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR" @${FALSE} . endif . if defined(_MASTER_SITES_${_group}) @@ -2544,8 +2585,8 @@ _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} _G_TEMP= ${_group} . if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default check-makevars:: - @${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be" - @${ECHO_CMD} "used in group definitions. Please fix your PATCH_SITE_SUBDIR" + @${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" + @${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR" @${FALSE} . endif . if defined(_PATCH_SITES_${_group}) @@ -2877,7 +2918,7 @@ check-makefile:: .if !defined(CATEGORIES) check-categories: - @${ECHO_CMD} "${PKGNAME}: Makefile error: CATEGORIES is mandatory." + @${ECHO_MSG} "${PKGNAME}: Makefile error: CATEGORIES is mandatory." @${FALSE} .else @@ -2901,7 +2942,7 @@ check-categories: @if ${ECHO_CMD} ${VALID_CATEGORIES} | ${GREP} -wq ${cat}; then \ ${TRUE}; \ else \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: category ${cat} not in list of valid categories."; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: category ${cat} not in list of valid categories."; \ ${FALSE}; \ fi .endfor @@ -2999,7 +3040,7 @@ __pmlinks!= ${ECHO_CMD} '${MLINKS:S/ / /}' | ${AWK} \ }' | ${SED} -e 's \([^/ ][^ ]*\.\(.\)[^. ]*\) $${MAN\2PREFIX}/$$$$$$$${__lang}/man\2/\1${MANEXT}g' -e 's/ //g' -e 's/MANlPREFIX/MANLPREFIX/g' -e 's/MANnPREFIX/MANNPREFIX/g' .if ${__pmlinks:Mbroken} == "broken" check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: unable to parse MLINKS." + @${ECHO_MSG} "${PKGNAME}: Makefile error: unable to parse MLINKS." @${FALSE} .endif _MLINKS= ${_MLINKS_PREPEND} @@ -3084,12 +3125,18 @@ INFO_PATH?= info .endif DOCSDIR?= ${TARGETDIR}/share/doc/${PORTNAME} +DOCSDIR_REL?= ${DOCSDIR:S,^${TARGETDIR}/,,} EXAMPLESDIR?= ${TARGETDIR}/share/examples/${PORTNAME} +EXAMPLESDIR_REL?= ${EXAMPLESDIR:S,^${TARGETDIR}/,,} DATADIR?= ${TARGETDIR}/share/${PORTNAME} +DATADIR_REL?= ${DATADIR:S,^${TARGETDIR}/,,} +WWWDIR?= ${TARGETDIR}/www/${PORTNAME} +WWWDIR_REL?= ${WWWDIR:S,^${TARGETDIR}/,,} -PLIST_SUB+= DOCSDIR="${DOCSDIR:S,^${TARGETDIR}/,,}" \ - EXAMPLESDIR="${EXAMPLESDIR:S,^${TARGETDIR}/,,}" \ - DATADIR="${DATADIR:S,^${TARGETDIR}/,,}" +PLIST_SUB+= DOCSDIR="${DOCSDIR_REL}" \ + EXAMPLESDIR="${EXAMPLESDIR_REL}" \ + DATADIR="${DATADIR_REL}" \ + WWWDIR="${WWWDIR_REL}" DESKTOPDIR?= ${TARGETDIR}/share/applications _DESKTOPDIR_REL= ${DESKTOPDIR:S,^${TARGETDIR}/,,}/ @@ -3136,11 +3183,11 @@ LDCONFIG_RUNLIST!= ${ECHO_CMD} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX}!g" .if defined(ONLY_FOR_ARCHS) .for __ARCH in ${ONLY_FOR_ARCHS} .if ${ARCH:M${__ARCH}} != "" -__ARCH_OK?= 1 +__ARCH_OK?= 1 .endif .endfor .else -__ARCH_OK?= 1 +__ARCH_OK?= 1 .endif .if defined(NOT_FOR_ARCHS) @@ -3416,15 +3463,20 @@ check-vulnerable: fi .endif +# set alg to any of SIZE, MD5, SHA256 (or any other checksum algorithm): +DISTINFO_DATA?= DIR=${DIST_SUBDIR}; ${AWK} -v alg=$$alg \ + -v file=$${DIR:+$$DIR/}$${file\#\#*/} \ + '$$1 == alg && $$2 == "(" file ")" {print $$4}' ${MD5_FILE} + # Fetch .if !target(do-fetch) do-fetch: @${MKDIR} ${_DISTDIR} - @(cd ${_DISTDIR}; \ + @cd ${_DISTDIR};\ ${_MASTER_SITES_ENV} ; \ for _file in ${DISTFILES}; do \ - file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \ + file=$${_file%%:*}; \ select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \ force_fetch=false; \ filebasename=`${BASENAME} $$file`; \ @@ -3435,8 +3487,6 @@ do-fetch: fi; \ done; \ if [ ! -f $$file -a ! -f $$filebasename -o "$$force_fetch" = "true" ]; then \ - DIR=${DIST_SUBDIR}; \ - pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ if [ -L $$file -o -L $$filebasename ]; then \ ${ECHO_MSG} "=> ${_DISTDIR}/$$file is a broken symlink."; \ ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ @@ -3444,7 +3494,8 @@ do-fetch: exit 1; \ fi ; \ if [ -f ${MD5_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \ - if ! ${GREP} -q "^MD5 ($$pattern)" ${MD5_FILE}; then \ + _md5sum=`alg=MD5; ${DISTINFO_DATA}`; \ + if [ -z "$$_md5sum" ]; then \ ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is not in ${MD5_FILE}."; \ ${ECHO_MSG} "=> Either ${MD5_FILE} is out of date, or"; \ ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is spelled incorrectly."; \ @@ -3471,8 +3522,7 @@ do-fetch: fi ; \ for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ - DIR=${DIST_SUBDIR}; \ - CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) ${MKDIR} $${file%/*}; \ args="-o $${file} $${site}$${file}";; \ @@ -3486,10 +3536,10 @@ do-fetch: ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \ exit 1; \ fi \ - done) + done .if defined(PATCHFILES) - @(cd ${_DISTDIR}; \ - ${_PATCH_SITES_ENV} ; \ + @cd ${_DISTDIR};\ + ${_PATCH_SITES_ENV} ; \ for _file in ${PATCHFILES}; do \ file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \ select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \ @@ -3524,9 +3574,7 @@ do-fetch: fi ; \ for site in `eval $$SORTED_PATCH_SITES_CMD_TMP`; do \ ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ - DIR=${DIST_SUBDIR}; \ - pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ - CKSIZE=`${GREP} "^SIZE ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) ${MKDIR} $${file%/*}; \ args="-o $${file} $${site}$${file}";; \ @@ -3540,7 +3588,7 @@ do-fetch: ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \ exit 1; \ fi \ - done) + done .endif .endif @@ -3680,7 +3728,7 @@ do-configure: INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ - ${ECHO_CMD} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ + ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \ (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ ${FALSE}; \ fi) @@ -3886,22 +3934,22 @@ check-already-installed: if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \ if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \ if [ -z "${DESTDIR}" ] ; then \ - ${ECHO_CMD} "===> ${PKGNAME} is already installed"; \ + ${ECHO_MSG} "===> ${PKGNAME} is already installed"; \ else \ ${ECHO_MSG} "===> ${PKGNAME} is already installed in ${DESTDIR}"; \ fi; \ else \ if [ -z "${DESTDIR}" ] ; then \ - ${ECHO_CMD} "===> An older version of ${PKGORIGIN} is already installed ($${found_package})"; \ + ${ECHO_MSG} "===> An older version of ${PKGORIGIN} is already installed ($${found_package})"; \ else \ ${ECHO_MSG} "===> An older version of ${PKGORIGIN} is already installed in ${DESTDIR} ($${found_package})"; \ fi; \ fi; \ - ${ECHO_CMD} " You may wish to \`\`make deinstall'' and install this port again"; \ - ${ECHO_CMD} " by \`\`make reinstall'' to upgrade it properly."; \ - ${ECHO_CMD} " If you really wish to overwrite the old port of ${PKGORIGIN}"; \ - ${ECHO_CMD} " without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \ - ${ECHO_CMD} " in your environment or the \"make install\" command line."; \ + ${ECHO_MSG} " You may wish to \`\`make deinstall'' and install this port again"; \ + ${ECHO_MSG} " by \`\`make reinstall'' to upgrade it properly."; \ + ${ECHO_MSG} " If you really wish to overwrite the old port of ${PKGORIGIN}"; \ + ${ECHO_MSG} " without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \ + ${ECHO_MSG} " in your environment or the \"make install\" command line."; \ exit 1; \ fi .else @@ -3932,8 +3980,8 @@ install-mtree: .if !defined(NO_MTREE) @if [ `${ID} -u` = 0 ]; then \ if [ ! -f ${MTREE_FILE} ]; then \ - ${ECHO_CMD} "Error: mtree file \"${MTREE_FILE}\" is missing."; \ - ${ECHO_CMD} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \ + ${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \ + ${ECHO_MSG} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \ exit 1; \ else \ ${MTREE_CMD} ${MTREE_ARGS} ${TARGETDIR}/ >/dev/null; \ @@ -4368,9 +4416,9 @@ pre-su-install-script: pretty-print-www-site: @www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \ if [ -n "$${www_site}" ]; then \ - ${ECHO_CMD} -n " and/or visit the "; \ - ${ECHO_CMD} -n "<a href=\"$${www_site}\">web site</a>"; \ - ${ECHO_CMD} " for futher informations"; \ + ${ECHO_MSG} -n " and/or visit the "; \ + ${ECHO_MSG} -n "<a href=\"$${www_site}\">web site</a>"; \ + ${ECHO_MSG} " for futher informations"; \ fi .endif @@ -4583,8 +4631,8 @@ fetch-list: continue; \ fi; \ fi; \ - DIR=${DIST_SUBDIR}; \ - CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + DIR=${DIST_SUBDIR};\ + CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) args="-o $${file} $${site}$${file}";; \ *) args=$${site}$${file};; \ @@ -4615,8 +4663,7 @@ fetch-list: SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \ fi ; \ for site in `eval $$SORTED_PATCH_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ - DIR=${DIST_SUBDIR}; \ - CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) args="-o $${file} $${site}$${file}";; \ *) args=$${site}$${file};; \ @@ -4651,8 +4698,8 @@ check-checksum-algorithms: for alg in ${CHECKSUM_ALGORITHMS:U}; do \ eval alg_executable=\$$$$alg; \ if [ -z "$$alg_executable" ]; then \ - ${ECHO_CMD} "Checksum algorithm $$alg: Couldn't find the executable."; \ - ${ECHO_CMD} "Set $$alg=/path/to/$$alg in /etc/make.conf and try again."; \ + ${ECHO_MSG} "Checksum algorithm $$alg: Couldn't find the executable."; \ + ${ECHO_MSG} "Set $$alg=/path/to/$$alg in /etc/make.conf and try again."; \ exit 1; \ fi; \ done; \ @@ -4693,15 +4740,10 @@ makesum: check-checksum-algorithms .if !target(checksum) checksum: fetch check-checksum-algorithms - @ \ - \ - ${checksum_init} \ - \ + @${checksum_init} \ if [ -f ${MD5_FILE} ]; then \ - ( cd ${DISTDIR}; OK=""; \ + cd ${DISTDIR}; OK="";\ for file in ${_CKSUMFILES}; do \ - pattern="`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ - \ ignored="true"; \ for alg in ${CHECKSUM_ALGORITHMS:U}; do \ ignore="false"; \ @@ -4709,7 +4751,7 @@ checksum: fetch check-checksum-algorithms \ if [ $$alg_executable != "NO" ]; then \ MKSUM=`$$alg_executable < $$file`; \ - CKSUM=`${GREP} "^$$alg ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSUM=`${DISTINFO_DATA}`; \ else \ ignore="true"; \ fi; \ @@ -4754,8 +4796,6 @@ checksum: fetch check-checksum-algorithms done; \ \ for file in ${_IGNOREFILES}; do \ - pattern="`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ - \ ignored="true"; \ alreadymatched="false"; \ for alg in ${CHECKSUM_ALGORITHMS:U}; do \ @@ -4763,7 +4803,7 @@ checksum: fetch check-checksum-algorithms eval alg_executable=\$$$$alg; \ \ if [ $$alg_executable != "NO" ]; then \ - CKSUM=`${GREP} "^$$alg ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSUM=`${DISTINFO_DATA}`; \ else \ ignore="true"; \ fi; \ @@ -4811,7 +4851,6 @@ checksum: fetch check-checksum-algorithms if [ "$$OK" != "true" ]; then \ exit 1; \ fi \ - ); \ elif [ -n "${_CKSUMFILES:M*}" ]; then \ ${ECHO_MSG} "=> No checksum file (${MD5_FILE})."; \ fi @@ -5129,62 +5168,60 @@ fetch-recursive-list: done .endif +# Used by fetch-required and fetch-required list, this script looks +# at each of the dependencies. If 3 items are specified in the tuple, +# such as foo:${PORTSDIR}/graphics/foo:extract, the first item (foo) +# is examined. Only if it begins with a / and does not exist on the +# file-system will ``make targ'' proceed. +# For more usual (dual-item) dependency tuples, the ``make targ'' +# proceeds, if the exact package, which the directory WOULD'VE installed, +# is not yet installed. +# This is the exact behaviour of the old code, and it may need +# revisiting. For example, the entire first case seems dubious, and in +# the second case we, probably, should be satisfied with _any_ (earlier) +# package, with the same origin as that of the dir. +# +# -mi +FETCH_LIST?= for i in $$deps; do \ + prog=$${i%%:*}; dir=$${i\#*:}; \ + case $$dir in \ + *:*) if [ $$prog != $${prog\#/} -o ! -e $$prog ]; then \ + dir=$${dir%%:*}; \ + else \ + continue; \ + fi;; \ + *) if [ -d ${PKG_DBDIR}/$$(cd $$dir; ${MAKE} -V PKGNAME) ]; then \ + continue; \ + fi;; \ + esac; \ + echo cd $$dir; ${MAKE} $$targ; \ + done + .if !target(fetch-required) fetch-required: fetch +.if defined(NO_DEPENDS) + @${ECHO_MSG} "===> NO_DEPENDS is set, not fetching any distfiles for ${PKG_NAME}" +.else @${ECHO_MSG} "===> Fetching all required distfiles for ${PKGNAME} and dependencies" .for deptype in EXTRACT PATCH FETCH BUILD RUN .if defined(${deptype}_DEPENDS) -.if !defined(NO_DEPENDS) - @for i in ${${deptype}_DEPENDS}; do \ - prog=`${ECHO_CMD} $$i | ${CUT} -f 1 -d ':'`; \ - dir=`${ECHO_CMD} $$i | ${CUT} -f 2-999 -d ':'`; \ - if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ - dir=`${ECHO_CMD} $$dir | ${CUT} -f 1 -d ':'`; \ - if ${EXPR} "$$prog" : \\/ >/dev/null; then \ - if [ ! -e "$$prog" ]; then \ - (cd $$dir; ${MAKE} fetch); \ - fi; \ - fi; \ - else \ - (cd $$dir; \ - tmp=`${MAKE} -V PKGNAME`; \ - if [ ! -d ${PKG_DBDIR}/$${tmp} ]; then \ - ${MAKE} fetch; \ - fi ); \ - fi; \ - done -.endif + @targ=fetch; deps="${${deptype}_DEPENDS}"; ${FETCH_LIST} .endif .endfor .endif +.endif + .if !target(fetch-required-list) fetch-required-list: fetch-list +.if !defined(NO_DEPENDS) .for deptype in EXTRACT PATCH FETCH BUILD RUN .if defined(${deptype}_DEPENDS) -.if !defined(NO_DEPENDS) - @for i in ${${deptype}_DEPENDS}; do \ - prog=`${ECHO_CMD} $$i | ${CUT} -f 1 -d ':'`; \ - dir=`${ECHO_CMD} $$i | ${CUT} -f 2-999 -d ':'`; \ - if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ - dir=`${ECHO_CMD} $$dir | ${CUT} -f 1 -d ':'`; \ - if ${EXPR} "$$prog" : \\/ >/dev/null; then \ - if [ ! -e "$$prog" ]; then \ - (cd $$dir; ${MAKE} fetch-list); \ - fi; \ - fi; \ - else \ - (cd $$dir; \ - tmp=`${MAKE} -V PKGNAME`; \ - if [ ! -d ${PKG_DBDIR}/$${tmp} ]; then \ - ${MAKE} fetch-list; \ - fi ); \ - fi; \ - done -.endif + @targ=fetch-list; deps="${${deptype}_DEPENDS}"; ${FETCH_LIST} .endif .endfor .endif +.endif .if !target(checksum-recursive) checksum-recursive: @@ -5202,7 +5239,7 @@ build-depends-list: .endif BUILD-DEPENDS-LIST= \ - for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u); do \ + for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${SED} -E -e 's,([^: ]*):([^: ]*)(:[^ ]*)?,\2,g' -e 'y/ /\n/'| ${SORT} -u); do \ if [ -d $$dir ]; then \ ${ECHO_CMD} $$dir; \ else \ @@ -5216,7 +5253,7 @@ run-depends-list: .endif RUN-DEPENDS-LIST= \ - for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u); do \ + for dir in $$(${ECHO_CMD} "${_LIB_RUN_DEPENDS:C,.*:([^:]*).*,\1,}" | ${SED} -e 'y/ /\n/' | ${SORT} -u); do \ if [ -d $$dir ]; then \ ${ECHO_CMD} $$dir; \ else \ @@ -5232,6 +5269,7 @@ package-depends-list: @${PACKAGE-DEPENDS-LIST} .endif +_LIB_RUN_DEPENDS= ${LIB_DEPENDS} ${RUN_DEPENDS} PACKAGE-DEPENDS-LIST?= \ if [ "${CHILD_DEPENDS}" ]; then \ installed=$$(${PKG_INFO} -qO ${PKGORIGIN} 2>/dev/null || \ @@ -5247,21 +5285,22 @@ PACKAGE-DEPENDS-LIST?= \ done; \ fi; \ checked="${PARENT_CHECKED}"; \ - for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':'); do \ + for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \ dir=$$(${REALPATH} $$dir); \ if [ -d $$dir ]; then \ - if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \ - childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ - set -- $$childout; \ - childdir=""; \ - while [ $$\# != 0 ]; do \ - childdir="$$childdir $$2"; \ - ${ECHO_CMD} "$$1 $$2 $$3"; \ - shift 3; \ - done; \ - checked="$$dir $$childdir $$checked"; \ - fi; \ - else \ + case $$checked in \ + $$dir|$$dir\ *|*\ $$dir|*\ $$dir\ *) continue;; \ + esac; \ + childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ + set -- $$childout; \ + childdir=""; \ + while [ $$\# != 0 ]; do \ + childdir="$$childdir $$2"; \ + ${ECHO_CMD} "$$1 $$2 $$3"; \ + shift 3; \ + done; \ + checked="$$dir $$childdir $$checked"; \ + else \\ ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \ fi; \ done @@ -5281,7 +5320,7 @@ package-recursive: package # Show missing dependiencies missing: @for dir in $$(${ALL-DEPENDS-LIST}); do \ - THISORIGIN=$$(${ECHO_CMD} $$dir | ${SED} 's,${PORTSDIR}/,,'); \ + THISORIGIN=$${dir##${PORTSDIR}/}; \ installed=$$(${PKG_INFO} -qO $${THISORIGIN}); \ if [ -z "$$installed" ]; then \ ${ECHO_CMD} $$THISORIGIN; \ @@ -5411,13 +5450,13 @@ ${.CURDIR}/README.html: _PRETTY_PRINT_DEPENDS_LIST=\ if [ ! -r ${INDEXDIR}/${INDEXFILE} ] ; then \ - ${ECHO_CMD} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \ + ${ECHO_MSG} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \ else \ target=${.TARGET:C/pretty-print-(.*)-depends-list/\1/} ; \ if [ "$$target" = "build" ] ; then fldnum=8 ; else fldnum=9 ; fi ; \ - ${ECHO_CMD} -n 'This port requires package(s) "' ; \ - ${ECHO_CMD} -n `${AWK} -F\| "\\$$1 ~ /^${PKGNAME}/ {print \\$$$${fldnum};}" ${INDEXDIR}/${INDEXFILE}` ; \ - ${ECHO_CMD} "\" to $$target."; \ + ${ECHO_MSG} -n 'This port requires package(s) "' ; \ + ${ECHO_MSG} -n `${AWK} -F\| "\\$$1 ~ /^${PKGNAME}/ {print \\$$$${fldnum};}" ${INDEXDIR}/${INDEXFILE}` ; \ + ${ECHO_MSG} "\" to $$target."; \ fi; @@ -5442,7 +5481,7 @@ apply-slist: .if defined(SUB_FILES) .for file in ${SUB_FILES} .if !exists(${FILESDIR}/${file}.in) - @${ECHO_CMD} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1 + @${ECHO_MSG} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1 .else @${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/${file}.in > ${WRKDIR}/${file} .endif @@ -5462,7 +5501,7 @@ ${i:S/-//:U}= ${WRKDIR}/${SUB_FILES:M${i}*} generate-plist: @${ECHO_MSG} "===> Generating temporary packing list" @${MKDIR} `${DIRNAME} ${TMPPLIST}` - @if [ ! -f ${DESCR} ]; then ${ECHO_CMD} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi + @if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi @>${TMPPLIST} @for file in ${PLIST_FILES}; do \ ${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \ @@ -5484,7 +5523,7 @@ generate-plist: @${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST} .endif @for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -E -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \ - ${ECHO_CMD} "@unexec rm -f %D/$${i%.gz} %D/$${i%.gz}.gz" >> ${TMPPLIST}; \ + ${ECHO_CMD} "@unexec rm -f %D/$$i %D/$${i%.gz} %D/$${i%.bz2} %D/$$i.gz %D/$$i.bz2" >> ${TMPPLIST}; \ done .endfor @if [ -f ${PLIST} ]; then \ @@ -5497,7 +5536,7 @@ generate-plist: .endfor .for dir in ${PLIST_DIRS} - @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | ${SED} -e 's,^,@dirrm ,' >> ${TMPPLIST} + @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dirrm ,' >> ${TMPPLIST} .endfor # To be removed once INSTALLS_SHLIB has been eradicated. .if defined(INSTALLS_SHLIB) && !defined(INSTALL_AS_USER) @@ -5540,15 +5579,14 @@ add-plist-docs: .for x in ${PORTDOCS} @if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \ if [ ! -e ${DOCSDIR}/${x} ]; then \ - ${ECHO_CMD} ${DOCSDIR}/${x} | \ - ${SED} -e 's,^${TARGETDIR}/,,' >> ${TMPPLIST}; \ + ${ECHO_CMD} ${DOCSDIR_REL}/${x} >> ${TMPPLIST}; \ fi;fi .endfor @${FIND} -P ${PORTDOCS:S/^/${DOCSDIR}\//} ! -type d 2>/dev/null | \ ${SED} -ne 's,^${TARGETDIR}/,,p' >> ${TMPPLIST} @${FIND} -P -d ${PORTDOCS:S/^/${DOCSDIR}\//} -type d 2>/dev/null | \ ${SED} -ne 's,^${TARGETDIR}/,@dirrm ,p' >> ${TMPPLIST} - @${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${TARGETDIR}/,,}" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm ${DOCSDIR_REL}" >> ${TMPPLIST} .else @${DO_NADA} .endif @@ -5593,7 +5631,7 @@ add-plist-post: install-rc-script: .if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES" .if defined(USE_RCORDER) - @${ECHO_CMD} "===> Installing early rc.d startup script(s)" + @${ECHO_MSG} "===> Installing early rc.d startup script(s)" @${ECHO_CMD} "@cwd /" >> ${TMPPLIST} @for i in ${USE_RCORDER}; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${DESTDIR}/etc/rc.d/$${i%.sh}; \ @@ -5602,7 +5640,7 @@ install-rc-script: @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} .endif .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES" - @${ECHO_CMD} "===> Installing rc.d startup script(s)" + @${ECHO_MSG} "===> Installing rc.d startup script(s)" @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} @for i in ${USE_RC_SUBR}; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${TARGETDIR}/etc/rc.d/$${i%.sh}${RC_SUBR_SUFFIX}; \ @@ -5680,7 +5718,7 @@ fake-pkg: if [ -f ${PKGMESSAGE} ]; then \ ${CP} ${PKGMESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \ fi; \ - for dep in `${PKG_INFO} -qf ${PKGNAME} | ${GREP} -w ^@pkgdep | ${AWK} '{print $$2}' | ${SORT} -u`; do \ + for dep in `${PKG_INFO} -qf ${PKGNAME} | ${AWK} '/^@pkgdep / {print $$2}' | ${SORT} -u`; do \ if [ -d ${PKG_DBDIR}/$$dep -a -z `${ECHO_CMD} $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \ if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \ >/dev/null 2>&1; then \ @@ -5982,11 +6020,11 @@ check-desktop-entries: entry="$$entry ($$1)"; \ fi; \ if [ -z "$$1" ]; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 1 (Name) is empty"; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 1 (Name) is empty"; \ exit 1; \ fi; \ if [ -z "$$4" ]; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 4 (Exec) is empty"; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 4 (Exec) is empty"; \ exit 1; \ fi; \ if [ -n "$$5" ]; then \ @@ -5997,21 +6035,21 @@ check-desktop-entries: fi; \ done; \ if ! ${ECHO_CMD} "$$5" | ${GREP} -q ';$$'; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) does not end with a semicolon"; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) does not end with a semicolon"; \ exit 1; \ fi; \ else \ if [ -z "`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} desktop-categories`" ]; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) is empty and could not be deduced from the CATEGORIES variable"; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) is empty and could not be deduced from the CATEGORIES variable"; \ exit 1; \ fi; \ fi; \ if [ -z "$$6" ]; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is empty"; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is empty"; \ exit 1; \ fi; \ if [ "x$$6" != "xtrue" ] && [ "x$$6" != "xfalse" ]; then \ - ${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is not \"true\" or \"false\""; \ + ${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is not \"true\" or \"false\""; \ exit 1; \ fi; \ shift 6; \ diff --git a/ports-mgmt/portmk/Mk/bsd.port.subdir.mk b/ports-mgmt/portmk/Mk/bsd.port.subdir.mk index c433ff119cf4..97f28a956917 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.subdir.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.subdir.mk @@ -1,3 +1,6 @@ +#-*- mode: makefile; tab-width: 4; -*- +# ex:ts=4 +# # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 # $FreeBSD$ # @@ -7,19 +10,19 @@ # # +++ variables +++ # -# STRIP The flag passed to the install program to cause the binary -# to be stripped. This is to be used when building your -# own install script so that the entire system can be made -# stripped/not-stripped using a single knob. [-s] +# STRIP - The flag passed to the install program to cause the binary +# to be stripped. This is to be used when building your +# own install script so that the entire system can be made +# stripped/not-stripped using a single knob. [-s] # -# ECHO_MSG Used to print all the '===>' style prompts - override this -# to turn them off [echo]. +# ECHO_MSG - Used to print all the '===>' style prompts - override this +# to turn them off [echo]. # -# OPSYS Get the operating system type [`uname -s`] +# OPSYS - Get the operating system type [`uname -s`] # -# SUBDIR A list of subdirectories that should be built as well. -# Each of the targets will execute the same target in the -# subdirectories. +# SUBDIR - A list of subdirectories that should be built as well. +# Each of the targets will execute the same target in the +# subdirectories. # # # +++ targets +++ |