PERFORCE change 116570 for review
Gabor Kovesdan
gabor at FreeBSD.org
Mon Mar 26 10:34:36 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=116570
Change 116570 by gabor at gabor_server on 2007/03/26 10:34:26
IFC
Affected files ...
.. //depot/projects/soc2006/gabor_destdir/CHANGES#4 integrate
.. //depot/projects/soc2006/gabor_destdir/GIDs#3 integrate
.. //depot/projects/soc2006/gabor_destdir/LEGAL#3 integrate
.. //depot/projects/soc2006/gabor_destdir/MOVED#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.efl.mk#1 branch
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#5 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#3 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.ocaml.mk#1 branch
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#7 edit
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#7 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#4 integrate
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.xfce.mk#1 branch
.. //depot/projects/soc2006/gabor_destdir/Tools/portbuild/scripts/dopackagestats#3 integrate
.. //depot/projects/soc2006/gabor_destdir/UIDs#3 integrate
.. //depot/projects/soc2006/gabor_destdir/UPDATING#4 integrate
Differences ...
==== //depot/projects/soc2006/gabor_destdir/CHANGES#4 (text+ko) ====
@@ -10,6 +10,27 @@
All ports committers are allowed to commit to this file.
+20070324:
+AUTHOR: portmgr at 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 at FreeBSD.org
The following changes were made to the ports infrastructure:
@@ -1283,4 +1304,4 @@
Contact Erwin Lansing if you have any questions about your use of
this document.
-$FreeBSD: ports/CHANGES,v 1.66 2007/03/06 06:21:46 linimon Exp $
+$FreeBSD: ports/CHANGES,v 1.67 2007/03/24 14:02:05 pav Exp $
==== //depot/projects/soc2006/gabor_destdir/GIDs#3 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: ports/GIDs,v 1.28 2007/02/17 09:57:35 dinoex Exp $
+$FreeBSD: ports/GIDs,v 1.32 2007/03/24 05:10:35 marcus Exp $
# Please keep this file sorted by GID!
smmsp:*:25:
bind:*:53:
@@ -20,7 +20,7 @@
qnofiles:*:81:
qmail:*:82:
mysql:*:88:
-vpopmail:*:89:
+vchkpw:*:89:
firebird:*:90:
mailman:*:91:
gdm:*:92:
@@ -54,9 +54,11 @@
fetchmail:*:124
postfix:*:125:
maildrop:*:126:
+nav:*:127:
vchat:*:128:
_bgpd:*:130:
_ospfd:*:131:
+_spamd:*:132:
dovecot:*:143:
rbldns:*:153:
sfs:*:171:
@@ -96,6 +98,7 @@
avahi:*:558:
tacacs:*:559:
distcc:*:561:
+polkit:*:562:
_xsi:*:600:
bnetd:*:700:
bopm:*:717:
==== //depot/projects/soc2006/gabor_destdir/LEGAL#3 (text+ko) ====
@@ -1,5 +1,5 @@
# Creator: Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.524 2007/02/20 21:47:23 nox Exp $
+# $FreeBSD: ports/LEGAL,v 1.530 2007/03/20 11:09:57 miwi Exp $
**********************************************************************
*** NOTE TO COMMITTERS ***
@@ -186,6 +186,8 @@
ezmlm-* mail/ezmlm-idx No license -- see
http://cr.yp.to/softwarelaw.html
f-prot-sig* security/f-prot-sig Free for personal use only
+f-protd security/f-protd 60 days free of trial for
+ everybody
f6kuzzzz.taz databases/libudbc Downloading and redistribution
terms are unclear
faac* audio/faac Restrictive copyright (do not
@@ -235,8 +237,8 @@
before downloading
freqship/* sysutils/freqsdwn License agreement is required
to download
-fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data Only Unreal Voodoo
- site is allowed to
+fretsonfire/FretsOnFire-*-linux* games/fretsonfire-data Only Unreal Voodoo
+ site is allowed to
distribute the music
ftree-* misc/ftree Cannot distribute commercially
fwtk/* security/fwtk No redistribution allowed
@@ -279,10 +281,6 @@
httprint_freebsd_*.zip security/httprint No cost for personal, education and non-commercial use
HyperSpec-*.tar.gz devel/clisp-hyperspec Commercial redistribution
prohibited
-IBMJava2-SDK-131.tgz java/linux-ibm-jdk13 Redistribution of repackaged
- binaries not permitted
-IBMJava2-SDK-* java/linux-ibm-jdk14 Redistribution of repackaged
- binaries not permitted
ICON-AquaFusion.* x11-themes/gnome-icons-aqua-fusion Author rights unclear
ICON-CoolGorilla.* x11-themes/gnome-icons-cool-gorilla Author rights unclear
CrystalSVGforGnomeIcons* x11-themes/gnome-icons-crystal Author rights unclear
@@ -433,6 +431,7 @@
ncftpd-* ftp/ncftpd 30 day evaluation license
netbeans3-* java/netbeans3 Restrictive copyright
netbeans4-* java/netbeans4 Restrictive copyright
+netbeans5-* java/netbeans5 Restrictive copyright
NetComponents-* java/netcomponents No redistribution except as part
of a substantially different product
netshow_linux.gz multimedia/netshow Commercial software
@@ -499,7 +498,7 @@
RealPlayer-*.rpm multimedia/linux-realplayer Redistribution not allowed
ruby/ruby_cast_256.zip security/ruby-cast_256 Crypto; export-controlled
runrev/linux.tgz devel/linux-runrev Do not sell for profit
-savage/savage* games/linux-savage Savage is freeware, but i am
+savage/savage* games/linux-savage Savage is freeware, but i am
not sure of its license
sdr-* mbone/sdr Crypto; export-controlled
serialmail-* mail/serialmail No license -- see
@@ -552,8 +551,8 @@
not permitted
susv3.tar.bz2 misc/susv3 Redistribution of the documents is
not permitted
-svm_light.tar.gz science/svmlight The software must not be further
- distributed without prior permission
+svm_light.tar.gz science/svmlight The software must not be further
+ distributed without prior permission
of the author
swing1_1_1* java/jfc Do not distribute without
value-added application
@@ -582,7 +581,7 @@
Japan, user must have
Japanese version of Windows
and EPSON printer specified
- by EULA
+ by EULA
tonicpoint-* graphics/tonicpoint-viewer Free for non-profit
tuc-* converters/tuc Author does not allow
CD-ROM distribution
@@ -677,3 +676,5 @@
tw_cli-* sysutils/tw_cli Redistribution forbidden by
license.
lha-1.14i-ac* archivers/lha-ac No Redistribution
+GotoBLAS* math/gotoblas No Redistribution
+gamess.*/gamess* science/gamess No Redistribution
==== //depot/projects/soc2006/gabor_destdir/MOVED#4 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1313 2007/03/08 14:29:11 ahze Exp $
+# $FreeBSD: ports/MOVED,v 1.1333 2007/03/25 20:41:50 ahze Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -2217,7 +2217,7 @@
mail/ruby-mime-types||2006-04-07|Has expired: mastersite disappeared, no longer maintained by author
devel/wftk||2006-04-07|master site disappeared
www/linux-flashplugin||2006-04-08|Removed due to license problem
-net/nic||2006-04-08|Deprecated for a long time
+net/nic|net-mgmt/horde-nic|2006-04-08|Moved to more appropriate category, updated to H3
www/flashpluginwrapper||2006-04-08|Removed as it depends on linux-flashplugin
mail/mew-mule||2006-04-10|Has expired: Does not work on the current emacs port
net/smbfs||2006-04-14|Incorporated into base system long ago
@@ -2501,7 +2501,6 @@
x11-themes/e17-theme-mclaren||2006-11-01|Has expired: doesn't work with recent e17
x11-themes/e17-theme-grey||2006-11-01|Has expired: doesn't work with recent e17
devel/ac-archive|devel/autoconf-archive|2006-11-01|Replace broken ac-archive with working autoconf-archive
-www/firefox-devel|www/firefox|2006-11-01|Firefox 2.0 is now stable
graphics/php4-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion
graphics/php5-imlib2|graphics/pecl-imlib2|2006-11-01|Follow PECL ports naming conversion
chinese/xcin25|chinese/xcin|2006-11-05|Reflect its real portname
@@ -2846,3 +2845,45 @@
devel/boost-gcc3|devel/boost|2007-03-07|Removed support for FreeBSD 4.
graphics/jpeg-mmx|graphics/jpeg|2007-03-08|Has expired: no longer needed.
graphics/gstreamer-plugins-jpeg-mmx80|graphics/gstreamer-plugins-jpeg80|2007-03-08|graphics/jpeg-mmx was removed
+java/linux-ibm-jdk13||2007-03-09|Has expired: Vulnerabilities in the browser plugin
+java/linux-ibm-jdk14||2007-03-09|Has expired: Vulnerabilities in the browser plugin
+japanese/emacs20-dl-canna||2007-03-09|Has expired: has deprecated dependency
+japanese/emacs20-dl-wnn6||2007-03-09|Has expired: has deprecated dependency
+misc/pbs||2007-03-11|Has expired: failed to build
+devel/pcre-utf8||2007-03-11|UTF8 support is now enabled in devel/pcre
+www/ruby-webunit||2007-03-13|Has expired: has deprecated dependencies
+emulators/grustibus||2007-03-13|Has expired: Project was abandoned 6 years ago and expects an old version of xmame (0.37b4), please use other frontends instead (like gxmame)
+graphics/drm-kmod||2007-03-13|Has expired: Broken on all supported versions of FreeBSD
+java/janosvm||2007-03-13|Has expired: Broken on all supported versions of FreeBSD
+korean/gau||2007-03-13|Has expired: Broken on all supported versions of FreeBSD
+lang/cyclone||2007-03-13|Has expired: Broken on all supported versions of FreeBSD
+lang/pike70||2007-03-13|Has expired: Please use pike72
+misc/lile||2007-03-13|Has expired: Broken on all supported versions of FreeBSD
+misc/muuz||2007-03-13|Has expired: Broken on all supported versions of FreeBSD
+misc/xdf||2007-03-13|Has expired: Broken on all supported versions of FreeBSD
+net/telnetx||2007-03-13|Has expired: Broken on all supported versions of FreeBSD
+sysutils/diskmark||2007-03-13|Has expired: Makes no sense on FreeBSD > 4.x. Use glabel(8) instead
+sysutils/diskusage||2007-03-13|Has expired: Unmainntaied, MASTER_SITES disappeared, WWW disappeared.
+sysutils/xperfmon3||2007-03-13|Has expired: Broken on all supported versions of FreeBSD
+comms/mwavem||2007-03-13|Has expired: Broken on all supported versions of FreeBSD
+chinese/big5fs||2007-03-14|Has expired: Use mount_cd9660(8), mount_msdosfs(8), or mount_ntfs(8) instead
+chinese/gbfs||2007-03-14|Has expired: Use mount_cd9660(8), mount_msdosfs(8), or mount_ntfs(8) instead
+audio/anthem||2007-03-16|Has expired: this software is not developed any more
+www/jakarta-tomcat41|www/tomcat41|2007-03-17|Renamed (no longer a Jakarta project)
+multimedia/totem-gstreamer|multimedia/totem|2007-03-19|multimedia/totem now uses gstreamer by default
+x11-wm/fluxbox-devel|x11-wm/fluxbox|2007-03-19|Merged into x11-wm/fluxbox
+lang/xotcl-thread||2007-03-21|Not longer needed
+graphics/gnome-colorscheme|graphics/agave|2007-03-21|Project renamed
+databases/zodb||2007-03-22|Has expired: outdated software, databases/zodb3 should be used
+finance/gnomepm||2007-03-22|Has expired: is unfetchable and has no homepage
+games/frabs||2007-03-22|Has expired: is unfetchable and homepage disappeared
+www/drupal|www/drupal4|2007-03-25|rename for drupal5
+www/drupal-attachment|www/drupal4-attachment|2007-03-25|rename for drupal5
+www/drupal-filemanager|www/drupal4-filemanager|2007-03-25|rename for drupal5
+www/drupal-gsitemap|www/drupal4-gsitemap|2007-03-25|rename for drupal5
+www/drupal-i18n|www/drupal4-i18n|2007-03-25|rename for drupal5
+www/drupal-nice_menus|www/drupal4-nice_menus|2007-03-25|rename for drupal5
+www/drupal-taxonomy_access|www/drupal4-taxonomy_access|2007-03-25|rename for drupal5
+www/drupal-textile|www/drupal4-textile|2007-03-25|rename for drupal5
+security/drupal-ldap_integration|security/drupal4-ldap_integration|2007-03-25|rename for drupal5
+devel/xdg-user-dirs-gtk||2007-03-25|Not all dependencies are in ports yet
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.autotools.mk#3 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.25 2006/12/04 01:07:25 ade Exp $
+# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.26 2007/03/24 14:02:06 pav Exp $
#
# Please view me with 4 column tabs!
#
@@ -64,7 +64,8 @@
#
# 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 @@
. if defined(AUTOTOOL_autoconf)
LIBTOOLFILES?= aclocal.m4
. else
-LIBTOOLFILES?= configure
+LIBTOOLFILES?= ${CONFIGURE_SCRIPT}
. endif
.endif
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#5 (text+ko) ====
@@ -1,9 +1,9 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.139 2007/02/04 22:25:07 tmclaugh Exp $
+# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.140 2007/03/19 05:19:11 marcus Exp $
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.401 2006/08/05 05:25:55 marcus Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $
#
# Please view me with 4 column tabs!
@@ -64,7 +64,8 @@
libgnomecanvas libgnomedb libgnomeprint libgnomeprintui \
libgnomeui libgsf libgsf_gnome libgtkhtml libidl librsvg2 libwnck \
libxml2 libxslt libzvt linc metacity nautilus2 nautiluscdburner \
- orbit2 pango pygnome2 pygnomeextras pygtk2 vte pygnomedesktop
+ orbit2 pango pygnome2 pygnomeextras pygtk2 vte pygnomedesktop \
+ libgnomekbd
GNOME_MAKEFILEIN?= Makefile.in
SCROLLKEEPER_DIR= /var/db/scrollkeeper
@@ -409,7 +410,7 @@
gnomecontrolcenter2_LIB_DEPENDS=gnome-window-settings.1:${PORTSDIR}/sysutils/gnome-control-center
gnomecontrolcenter2_DETECT=${LOCALBASE}/libdata/pkgconfig/gnome-window-settings-2.0.pc
-gnomecontrolcenter2_USE_GNOME_IMPL=desktopfileutils gnomedesktop gnomemenus metacity nautilus2 desktopfileutils
+gnomecontrolcenter2_USE_GNOME_IMPL=metacity nautilus2 gnomemenus desktopfileutils libgnomekbd gnomepanel
libgda2_LIB_DEPENDS= gda-2.3:${PORTSDIR}/databases/libgda2
libgda2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda.pc
@@ -459,15 +460,15 @@
s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|'
intlhack_USE_GNOME_IMPL=intltool
-gtkhtml3_LIB_DEPENDS= gtkhtml-3.8.15:${PORTSDIR}/www/gtkhtml3
-gtkhtml3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.8.pc
-gtkhtml3_USE_GNOME_IMPL=gail libgnomeui libgnomeprintui
+gtkhtml3_LIB_DEPENDS= gtkhtml-3.14.19:${PORTSDIR}/www/gtkhtml3
+gtkhtml3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.14.pc
+gtkhtml3_USE_GNOME_IMPL=gail libgnomeui
gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnome-speech
gnomespeech_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc
gnomespeech_USE_GNOME_IMPL=libbonobo
-evolutiondataserver_LIB_DEPENDS=edataserver-1.2.7:${PORTSDIR}/databases/evolution-data-server
+evolutiondataserver_LIB_DEPENDS=edataserver-1.2.9:${PORTSDIR}/databases/evolution-data-server
evolutiondataserver_DETECT= ${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc
evolutiondataserver_USE_GNOME_IMPL=libgnomeui
@@ -478,7 +479,7 @@
nautiluscdburner_LIB_DEPENDS=nautilus-burn.4:${PORTSDIR}/sysutils/nautilus-cd-burner
nautiluscdburner_DETECT= ${LOCALBASE}/libdata/pkgconfig/libnautilus-burn.pc
-nautiluscdburner_USE_GNOME_IMPL=nautilus2
+nautiluscdburner_USE_GNOME_IMPL=nautilus2 desktopfileutils
gnomemenus_LIB_DEPENDS= gnome-menu.2:${PORTSDIR}/x11/gnome-menus
gnomemenus_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-menu.pc
@@ -514,6 +515,10 @@
gnomesharp20_RUN_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20
gnomesharp20_USE_GNOME_IMPL= gnomepanel gtkhtml3 gtksharp20 librsvg2 vte
+libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
+libgnomekbd_LIB_DEPENDS= gnomekbd.1:${PORTSDIR}/x11/libgnomekbd
+libgnomekbd_USE_GNOME_IMPL= libgnomeui
+
# End component definition section
# This section defines tests for optional software. These work off four
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#3 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.68 2007/02/23 16:53:13 lofi Exp $
+# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.70 2007/03/25 04:07:55 lofi Exp $
#
# Please view me with 4 column tabs!
@@ -104,7 +104,7 @@
# Yeah, it's namespace pollution, but this is really the best place for this
# stuff. Arts does NOT use it anymore.
-KDE_VERSION= 3.5.5
+KDE_VERSION= 3.5.6
KDE_ORIGVER= ${KDE_VERSION}
KDE_PREFIX?= ${LOCALBASE}
@@ -158,7 +158,7 @@
MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"
.endif # !defined(QT_NONSTANDARD)
-QT4_VERSION= 4.2.2
+QT4_VERSION= 4.2.3
_QT_COMPONENTS_ALL= accessible assistant codecs-cn codecs-jp codecs-kr \
codecs-tw corelib designer doc gui iconengines \
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#7 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.555 2007/03/06 06:21:46 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.557 2007/03/24 14:02:06 pav Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -217,7 +217,8 @@
# 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,12 +407,18 @@
# (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_*).
+# USE_OCAML - If set, this port relies on the OCaml language.
+# Implies inclusion of bsd.ocaml.mk. (Also see
+# that file for more information on USE_OCAML*).
# USE_PYTHON - If set, this port relies on the Python language.
# Implies inclusion of bsd.python.mk. (Also see
# that file for more information on USE_PYTHON_*
@@ -538,8 +545,9 @@
# ${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:
@@ -725,7 +733,7 @@
#
# 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
@@ -761,8 +769,12 @@
#
# For fetch:
#
-# FETCH_CMD - Full path to ftp/http fetch command if not in $PATH.
-# Default: "/usr/bin/fetch -ARr"
+# FETCH_BINARY - Path to ftp/http fetch command if not in $PATH.
+# Default: "/usr/bin/fetch"
+# FETCH_ARGS - Arguments to ftp/http fetch command.
+# Default: "-ARr"
+# FETCH_CMD - ftp/http fetch command.
+# Default: ${FETCH_BINARY} ${FETCH_ARGS}
# FETCH_BEFORE_ARGS
# - Arguments to ${FETCH_CMD} before filename.
# Default: none
@@ -906,9 +918,9 @@
# - If set, bsd.port.mk will automatically run ldconfig commands
# from post-install and also add appropriate @exec/@unexec
# directives to directories listed in LDCONFIG_DIRS. (deprecated)
-# If USE_LINUX_PREFIX is defined, the Linux version of ldconfig
-# will be used instead of the native FreeBSD version (in such
-# case, LDCONFIG_DIRS is ignored).
+# If USE_LINUX_PREFIX is defined, the Linux version of
+# ldconfig will be used instead of the native FreeBSD
+# version, and LDCONFIG_DIRS will be ignored.
# LDCONFIG_DIRS - List of directories to run ldconfig if INSTALLS_SHLIB is set.
# Note that this is passed through sed just like the
# rest of PLIST, so ${PLIST_SUB} substitutions also
@@ -916,24 +928,41 @@
# %%PREFIX%% for ${PREFIX}, %%LOCALBASE%% for
# ${LOCALBASE_REL} and %%X11BASE%% for ${X11BASE_REL}.
# Default: %%PREFIX%%/lib
-# USE_LDCONFIG - If set to "yes", it replaces the old variable INSTALLS_SHLIB.
-# Otherwise, it can be set to a list of directories to be added to
-# ${PREFIX}/libdata/ldconfig/${UNIQUENAME}. Note that this
-# directory is used by ldconfig startup script, it is meant to
-# replace ldconfig scripts installed by some ports as (sometimes)
-# 000.${UNQUENAME}.sh.
+# USE_LDCONFIG - If set to "yes", this subsumes the function of the
+# deprecated variable INSTALLS_SHLIB and adds ${PREFIX}/lib
+# to the list of directories to be searched for shared
+# libraries. Otherwise, this is a list of directories to
+# be added to that list. The directory names are written to
+# ${PREFIX}/libdata/ldconfig/${UNIQUENAME} which is then
+# used by the ldconfig startup script.
+# This mechanism replaces ldconfig scripts installed by some
+# ports, often under such names as 000.${UNQUENAME}.sh.
# USE_LDCONFIG32
# - Same as USE_LDCONFIG but the target file is
# ${PREFIX}/libdata/ldconfig32/${UNIQUENAME} instead.
# Note: that should only be used on 64-bit architectures.
+# NO_LDCONFIG_MTREE
+# - Denotes whether the libdata/ldconfig directory is part of
+# the mtree on a given OSVERSION system. If it is not, we
+# create the directory, pull in the ldconfig_compat port,
+# and clean up on de-installation. NOTE: this variable is
+# internal to bsd.port.mk and must not be set in your Makefile.
#
# 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
# DESKTOP_ENTRIES
@@ -1289,7 +1318,7 @@
.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
@@ -1436,6 +1465,10 @@
.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
@@ -1444,6 +1477,10 @@
.include "${PORTSDIR}/Mk/bsd.ruby.mk"
.endif
+.if defined(USE_OCAML)
+.include "${PORTSDIR}/Mk/bsd.ocaml.mk"
+.endif
+
.if defined(USE_TCL) || defined(USE_TCL_BUILD) || defined(USE_TK) || defined(USE_TK_BUILD)
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
.endif
@@ -1480,6 +1517,10 @@
.include "${PORTSDIR}/Mk/bsd.sdl.mk"
.endif
+.if defined(USE_XFCE)
+.include "${PORTSDIR}/Mk/bsd.xfce.mk"
+.endif
+
# These do some path checks if DESTDIR is set correctly.
# You can force skipping these test by defining IGNORE_PATH_CHECKS
.if !defined(IGNORE_PATH_CHECKS)
@@ -1531,7 +1572,7 @@
.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
@@ -1552,6 +1593,7 @@
PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR}
+ WWWDIR=${WWWDIR}
PLIST_REINPLACE+= dirrmtry stopdaemon
PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true!
@@ -1573,9 +1615,9 @@
.endif
.if defined(NOPORTDOCS)
-PLIST_SUB+= PORTDOCS="@comment "
+PLIST_SUB+= PORTDOCS="@comment "
.else
-PLIST_SUB+= PORTDOCS=""
+PLIST_SUB+= PORTDOCS=""
.endif
CONFIGURE_SHELL?= ${SH}
@@ -1588,7 +1630,7 @@
.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
@@ -1889,6 +1931,10 @@
.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
@@ -1937,6 +1983,9 @@
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.endif
+.if defined(USE_XFCE)
+.include "${PORTSDIR}/Mk/bsd.xfce.mk"
+.endif
.if exists(${PORTSDIR}/../Makefile.inc)
.include "${PORTSDIR}/../Makefile.inc"
@@ -1998,6 +2047,18 @@
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}
@@ -2044,15 +2105,18 @@
PTHREAD_LIBS?= -pthread
.if exists(/usr/bin/fetch)
-FETCH_CMD?= /usr/bin/fetch -ApRr
+FETCH_BINARY?= /usr/bin/fetch
+FETCH_ARGS?= -ApRr
FETCH_REGET?= 1
.if !defined(DISABLE_SIZE)
FETCH_BEFORE_ARGS+= $${CKSIZE:+-S $$CKSIZE}
.endif
.else
-FETCH_CMD?= /usr/bin/ftp
+FETCH_BINARY?= /usr/bin/ftp
+FETCH_ARGS?= -R
FETCH_REGET?= 0
.endif
+FETCH_CMD?= ${FETCH_BINARY} ${FETCH_ARGS}
.if defined(RANDOMIZE_MASTER_SITES)
.if exists(/usr/games/random)
@@ -2257,8 +2321,8 @@
_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@}
@@ -2274,8 +2338,8 @@
_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@}
@@ -2296,8 +2360,8 @@
_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})
@@ -2317,8 +2381,8 @@
_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})
@@ -2650,7 +2714,7 @@
.if !defined(CATEGORIES)
check-categories:
- @${ECHO_CMD} "${PKGNAME}: Makefile error: CATEGORIES is mandatory."
+ @${ECHO_MSG} "${PKGNAME}: Makefile error: CATEGORIES is mandatory."
@${FALSE}
.else
@@ -2674,7 +2738,7 @@
@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
@@ -2772,7 +2836,7 @@
}' | ${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}
@@ -2857,12 +2921,18 @@
.endif
DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME}
+DOCSDIR_REL= ${DOCSDIR:S,^${PREFIX}/,,}
EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME}
+EXAMPLESDIR_REL= ${EXAMPLESDIR:S,^${PREFIX}/,,}
DATADIR?= ${PREFIX}/share/${PORTNAME}
+DATADIR_REL= ${DATADIR:S,^${PREFIX}/,,}
+WWWDIR?= ${PREFIX}/www/${PORTNAME}
+WWWDIR_REL= ${WWWDIR:S,^${PREFIX}/,,}
PLIST_SUB+= DOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}" \
EXAMPLESDIR="${EXAMPLESDIR:S,^${PREFIX}/,,}" \
- DATADIR="${DATADIR:S,^${PREFIX}/,,}"
+ DATADIR="${DATADIR:S,^${PREFIX}/,,}" \
+ WWWDIR="${WWWDIR:S,^${PREFIX}/,,}"
DESKTOPDIR?= ${PREFIX}/share/applications
_DESKTOPDIR_REL= ${DESKTOPDIR:S,^${PREFIX}/,,}/
@@ -2909,11 +2979,11 @@
.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)
@@ -3453,7 +3523,7 @@
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)
@@ -3654,11 +3724,11 @@
else \
${ECHO_CMD} "===> An older version of ${PKGORIGIN} is already installed ($${found_package})"; \
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
@@ -3689,8 +3759,8 @@
.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} ${PREFIX}/ >/dev/null; \
@@ -4066,9 +4136,9 @@
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
@@ -4325,8 +4395,8 @@
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; \
@@ -5052,13 +5122,13 @@
_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;
@@ -5083,7 +5153,7 @@
.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
@@ -5103,7 +5173,7 @@
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}; \
@@ -5181,15 +5251,14 @@
.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,^${PREFIX}/,,' >> ${TMPPLIST}; \
+ ${ECHO_CMD} ${DOCSDIR_REL}/${x} >> ${TMPPLIST}; \
fi;fi
.endfor
@${FIND} -P ${PORTDOCS:S/^/${DOCSDIR}\//} ! -type d 2>/dev/null | \
${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
@${FIND} -P -d ${PORTDOCS:S/^/${DOCSDIR}\//} -type d 2>/dev/null | \
${SED} -ne 's,^${PREFIX}/, at dirrm ,p' >> ${TMPPLIST}
- @${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
+ @${ECHO_CMD} "@dirrm ${DOCSDIR_REL}" >> ${TMPPLIST}
.else
@${DO_NADA}
.endif
@@ -5234,7 +5303,7 @@
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} /etc/rc.d/$${i%.sh}; \
@@ -5243,7 +5312,7 @@
@${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} ${PREFIX}/etc/rc.d/$${i%.sh}${RC_SUBR_SUFFIX}; \
@@ -5619,11 +5688,11 @@
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 \
@@ -5634,21 +5703,21 @@
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; \
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#7 (text+ko) ====
@@ -1,5 +1,8 @@
+#-*- mode: makefile; tab-width: 4; -*-
+# ex:ts=4
+#
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
-# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.68 2007/03/06 06:58:35 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.69 2007/03/24 14:02:06 pav Exp $
#
# The include file <bsd.port.subdir.mk> contains the default targets
# for building ports subdirectories.
@@ -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 +++
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#4 (text+ko) ====
@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list