diff options
| -rw-r--r-- | CHANGES | 21 | ||||
| -rw-r--r-- | Mk/bsd.autotools.mk | 5 | ||||
| -rw-r--r-- | Mk/bsd.efl.mk | 307 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 156 | ||||
| -rw-r--r-- | Mk/bsd.port.subdir.mk | 23 |
5 files changed, 441 insertions, 71 deletions
@@ -10,6 +10,27 @@ in the release notes. All ports committers are allowed to commit to this file. +20070324: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * Default LIBTOOLFILES value was changed from literal `configure' + to ${CONFIGURE_SCRIPT}. + + * bsd.efl.mk was moved to ports/Mk. USE_EFL family of macros is now + generally available to all ports. + + * New macros COPYTREE_BIN and COPYTREE_SHARE were added, to allow + for easy installation of a tree hierarchy, either with executable (bin) + or read-only (share) permissions on files. + + * A new variable WWWDIR was added, with default value of + ${PREFIX}/www/${PORTNAME}. + + * Variables DOCSDIR_REL, DATADIR_REL, EXAMPLESDIR_REL and WWWDIR_REL were + added for porter's convenience. They contain the values of their + respective non-REL variables, except relative to installation PREFIX. + 20070306: AUTHOR: portmgr@FreeBSD.org The following changes were made to the ports infrastructure: diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk index ecd69ad14561..41ad8cdb5441 100644 --- a/Mk/bsd.autotools.mk +++ b/Mk/bsd.autotools.mk @@ -64,7 +64,8 @@ Autotools_Include_MAINTAINER= ade@FreeBSD.org # # 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" +# Defaults to "aclocal.m4" if autoconf is in use, otherwise +# ${CONFIGURE_SCRIPT} (usually "configure") # #--------------------------------------------------------------------------- @@ -210,7 +211,7 @@ LIBTOOLFLAGS?= # default to empty . if defined(AUTOTOOL_autoconf) LIBTOOLFILES?= aclocal.m4 . else -LIBTOOLFILES?= configure +LIBTOOLFILES?= ${CONFIGURE_SCRIPT} . endif .endif diff --git a/Mk/bsd.efl.mk b/Mk/bsd.efl.mk new file mode 100644 index 000000000000..b8d0f1098ee3 --- /dev/null +++ b/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/Mk/bsd.port.mk b/Mk/bsd.port.mk index 8e5bfab5bfc9..64f038f906a8 100644 --- a/Mk/bsd.port.mk +++ b/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 @@ -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 @@ -1471,6 +1484,10 @@ PERL= ${LOCALBASE}/bin/perl .include "${PORTSDIR}/Mk/bsd.python.mk" .endif +.if defined(USE_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART) +.include "${PORTSDIR}/Mk/bsd.efl.mk" +.endif + .if defined(USE_JAVA) .include "${PORTSDIR}/Mk/bsd.java.mk" .endif @@ -1574,7 +1591,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 @@ -1596,7 +1613,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! @@ -1618,9 +1635,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} @@ -1633,7 +1650,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 @@ -1934,6 +1951,10 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .include "${PORTSDIR}/Mk/bsd.gstreamer.mk" .endif +.if defined(USE_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART) +.include "${PORTSDIR}/Mk/bsd.efl.mk" +.endif + .if defined(USE_JAVA) .include "${PORTSDIR}/Mk/bsd.java.mk" .endif @@ -2046,6 +2067,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} @@ -2327,8 +2360,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@} @@ -2344,8 +2377,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@} @@ -2366,8 +2399,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}) @@ -2387,8 +2420,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}) @@ -2720,7 +2753,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 @@ -2744,7 +2777,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 @@ -2842,7 +2875,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} @@ -2927,12 +2960,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}/,,}/ @@ -2979,11 +3018,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) @@ -3523,7 +3562,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) @@ -3729,22 +3768,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 @@ -3775,8 +3814,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; \ @@ -4211,9 +4250,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 @@ -4494,8 +4533,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; \ @@ -5254,13 +5293,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; @@ -5285,7 +5324,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 @@ -5305,7 +5344,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}; \ @@ -5383,15 +5422,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 @@ -5436,7 +5474,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}; \ @@ -5445,7 +5483,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}; \ @@ -5825,11 +5863,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 \ @@ -5840,21 +5878,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/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index c433ff119cf4..97f28a956917 100644 --- a/Mk/bsd.port.subdir.mk +++ b/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 +++ |