Date: Sun, 3 Jun 2012 13:12:30 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r716 - branches/experimental/Mk trunk/Mk Message-ID: <201206031312.q53DCUlI016402@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Sun Jun 3 13:12:30 2012
New Revision: 716
Log:
- Sync bsd.gecko.mk with ports
Modified:
branches/experimental/Mk/bsd.gecko.mk
trunk/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Sun Jun 3 13:07:26 2012 (r715)
+++ branches/experimental/Mk/bsd.gecko.mk Sun Jun 3 13:12:30 2012 (r716)
@@ -1,10 +1,10 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
# ex:ts=4
#
# Date created: 12 Nov 2005
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.56 2012/04/25 05:18:49 beat Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.59 2012/06/01 05:15:42 dinoex Exp $
#
# 4 column tabs prevent hair loss and tooth decay!
@@ -181,7 +181,7 @@
# is given by the maintainer via the port or by the
# user via defined variable try to find the highest
# stable installed version.
-# Available values: yes 10+ 12+ 36+ 10 12+ 36
+# Available values: yes 10+ 12+ 10 12+
# NOTE:
# default value 10 is used in case of USE_FIREFOX=yes
#
@@ -203,7 +203,7 @@
# version is given by the maintainer via the port
# or by the user via defined variable try to find
# the highest stable installed version.
-# Available values: yes 10+ 12+ 31+ 10 12 31
+# Available values: yes 10+ 12+ 10 12
# NOTE:
# default value 10 is used in case of USE_THUNDERBIRD=yes
#
@@ -223,11 +223,10 @@
.endif
_FIREFOX_DEFAULT_VERSION= 10
-_FIREFOX_VERSIONS= 10 12 36
-_FIREFOX_RANGE_VERSIONS= 10+ 12+ 36+
+_FIREFOX_VERSIONS= 10 12
+_FIREFOX_RANGE_VERSIONS= 10+ 12+
-# For specifying [36, ..]+
-_FIREFOX_36P= 36 ${_FIREFOX_12P}
+# For specifying [10, ..]+
_FIREFOX_12P= 12 ${_FIREFOX_10P}
_FIREFOX_10P= 10
@@ -269,16 +268,8 @@
.endif
.endif
.if ${_SUPFIREFOX} == no
-.if ${_FIREFOX_VER} < 36
_DISPLAY_VERSION_HAVE= ${_FIREFOX_VER}
-.else
-_DISPLAY_VERSION_HAVE:= ${_FIREFOX_VER:C/([0-9])([0-9])/\1.\2/}
-.endif
-.if ${USE_FIREFOX} < 36
_DISPLAY_VERSION_WANT= ${USE_FIREFOX}
-.else
-_DISPLAY_VERSION_WANT:= ${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/}
-.endif
IGNORE= cannot install: Firefox versions mismatch: firefox-${_DISPLAY_VERSION_HAVE} is installed and wanted version is firefox-${_DISPLAY_VERSION_WANT}
.endif
@@ -291,7 +282,6 @@
# Dependence lines for different Firefox versions
10_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
12_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
-36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36
# Add dependencies
.if defined(USE_FIREFOX)
@@ -383,11 +373,10 @@
.endif
_THUNDERBIRD_DEFAULT_VERSION= 10
-_THUNDERBIRD_VERSIONS= 10 12 31
-_THUNDERBIRD_RANGE_VERSIONS= 10+ 12+ 31+
+_THUNDERBIRD_VERSIONS= 10 12
+_THUNDERBIRD_RANGE_VERSIONS= 10+ 12+
-# For specifying [31, 30, ..]+
-_THUNDERBIRD_31P= 31 ${_THUNDERBIRD_12P}
+# For specifying [10, ..]+
_THUNDERBIRD_12P= 12 ${_THUNDERBIRD_10P}
_THUNDERBIRD_10P= 10
@@ -397,16 +386,8 @@
.endif
# Setting/finding Thunderbird version we want.
-.if exists(${LOCALBASE}/bin/thunderbird)
_TMP_VER!= ${LOCALBASE}/bin/thunderbird --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/ Thunderbird \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
-.if ${_TMP_VER} >= 100
_THUNDERBIRD_VER:= ${_TMP_VER:C/([0-9][0-9]).*/\1/}
-.else
-_THUNDERBIRD_VER= ${_TMP_VER}
-.endif
-.elif exists(${LOCALBASE}/bin/thunderbird3)
-_THUNDERBIRD_VER!= ${LOCALBASE}/bin/thunderbird3 --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/'
-.endif
# Check if installed Thunderbird version matches the wanted one
.if defined(_THUNDERBIRD_VER)
@@ -429,16 +410,8 @@
.endif
.endif
.if ${_SUPTHUNDERBIRD} != yes
-.if ${_THUNDERBIRD_VER} < 31
_DISPLAY_VERSION_HAVE= ${_THUNDERBIRD_VER}
-.else
-_DISPLAY_VERSION_HAVE:= ${_THUNDERBIRD_VER:C/([0-9])([0-9])/\1.\2/}
-.endif
-.if ${USE_THUNDERBIRD} < 31
_DISPLAY_VERSION_WANT= ${USE_THUNDERBIRD}
-.else
-_DISPLAY_VERSION_WANT:= ${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/}
-.endif
IGNORE= cannot install: Thunderbird versions mismatch: thunderbird-${_DISPLAY_VERSION_HAVE} is installed and wanted version is thunderbird-${_DISPLAY_VERSION_WANT}
.endif
.endif
@@ -450,7 +423,6 @@
# Dependence lines for different Thunderbird versions
10_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird-esr
12_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
-31_DEPENDS= ${LOCALBASE}/lib/thunderbird3/thunderbird:${PORTSDIR}/mail/thunderbird3
# Add dependencies
.if defined(USE_THUNDERBIRD)
@@ -623,7 +595,7 @@
nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
-png_LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+png_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
png_MOZ_OPTIONS= --with-system-png=${LOCALBASE}
xft_LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Sun Jun 3 13:07:26 2012 (r715)
+++ trunk/Mk/bsd.gecko.mk Sun Jun 3 13:12:30 2012 (r716)
@@ -1,10 +1,10 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
+#-*- tab-width: 4; -*-
# ex:ts=4
#
# Date created: 12 Nov 2005
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.56 2012/04/25 05:18:49 beat Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.59 2012/06/01 05:15:42 dinoex Exp $
#
# 4 column tabs prevent hair loss and tooth decay!
@@ -181,7 +181,7 @@
# is given by the maintainer via the port or by the
# user via defined variable try to find the highest
# stable installed version.
-# Available values: yes 10+ 12+ 36+ 10 12+ 36
+# Available values: yes 10+ 12+ 10 12+
# NOTE:
# default value 10 is used in case of USE_FIREFOX=yes
#
@@ -203,7 +203,7 @@
# version is given by the maintainer via the port
# or by the user via defined variable try to find
# the highest stable installed version.
-# Available values: yes 10+ 12+ 31+ 10 12 31
+# Available values: yes 10+ 12+ 10 12
# NOTE:
# default value 10 is used in case of USE_THUNDERBIRD=yes
#
@@ -223,11 +223,10 @@
.endif
_FIREFOX_DEFAULT_VERSION= 10
-_FIREFOX_VERSIONS= 10 12 36
-_FIREFOX_RANGE_VERSIONS= 10+ 12+ 36+
+_FIREFOX_VERSIONS= 10 12
+_FIREFOX_RANGE_VERSIONS= 10+ 12+
-# For specifying [36, ..]+
-_FIREFOX_36P= 36 ${_FIREFOX_12P}
+# For specifying [10, ..]+
_FIREFOX_12P= 12 ${_FIREFOX_10P}
_FIREFOX_10P= 10
@@ -269,16 +268,8 @@
.endif
.endif
.if ${_SUPFIREFOX} == no
-.if ${_FIREFOX_VER} < 36
_DISPLAY_VERSION_HAVE= ${_FIREFOX_VER}
-.else
-_DISPLAY_VERSION_HAVE:= ${_FIREFOX_VER:C/([0-9])([0-9])/\1.\2/}
-.endif
-.if ${USE_FIREFOX} < 36
_DISPLAY_VERSION_WANT= ${USE_FIREFOX}
-.else
-_DISPLAY_VERSION_WANT:= ${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/}
-.endif
IGNORE= cannot install: Firefox versions mismatch: firefox-${_DISPLAY_VERSION_HAVE} is installed and wanted version is firefox-${_DISPLAY_VERSION_WANT}
.endif
@@ -291,7 +282,6 @@
# Dependence lines for different Firefox versions
10_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
12_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
-36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36
# Add dependencies
.if defined(USE_FIREFOX)
@@ -383,11 +373,10 @@
.endif
_THUNDERBIRD_DEFAULT_VERSION= 10
-_THUNDERBIRD_VERSIONS= 10 12 31
-_THUNDERBIRD_RANGE_VERSIONS= 10+ 12+ 31+
+_THUNDERBIRD_VERSIONS= 10 12
+_THUNDERBIRD_RANGE_VERSIONS= 10+ 12+
-# For specifying [31, 30, ..]+
-_THUNDERBIRD_31P= 31 ${_THUNDERBIRD_12P}
+# For specifying [10, ..]+
_THUNDERBIRD_12P= 12 ${_THUNDERBIRD_10P}
_THUNDERBIRD_10P= 10
@@ -397,16 +386,8 @@
.endif
# Setting/finding Thunderbird version we want.
-.if exists(${LOCALBASE}/bin/thunderbird)
_TMP_VER!= ${LOCALBASE}/bin/thunderbird --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/ Thunderbird \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
-.if ${_TMP_VER} >= 100
_THUNDERBIRD_VER:= ${_TMP_VER:C/([0-9][0-9]).*/\1/}
-.else
-_THUNDERBIRD_VER= ${_TMP_VER}
-.endif
-.elif exists(${LOCALBASE}/bin/thunderbird3)
-_THUNDERBIRD_VER!= ${LOCALBASE}/bin/thunderbird3 --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/'
-.endif
# Check if installed Thunderbird version matches the wanted one
.if defined(_THUNDERBIRD_VER)
@@ -429,16 +410,8 @@
.endif
.endif
.if ${_SUPTHUNDERBIRD} != yes
-.if ${_THUNDERBIRD_VER} < 31
_DISPLAY_VERSION_HAVE= ${_THUNDERBIRD_VER}
-.else
-_DISPLAY_VERSION_HAVE:= ${_THUNDERBIRD_VER:C/([0-9])([0-9])/\1.\2/}
-.endif
-.if ${USE_THUNDERBIRD} < 31
_DISPLAY_VERSION_WANT= ${USE_THUNDERBIRD}
-.else
-_DISPLAY_VERSION_WANT:= ${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/}
-.endif
IGNORE= cannot install: Thunderbird versions mismatch: thunderbird-${_DISPLAY_VERSION_HAVE} is installed and wanted version is thunderbird-${_DISPLAY_VERSION_WANT}
.endif
.endif
@@ -450,7 +423,6 @@
# Dependence lines for different Thunderbird versions
10_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird-esr
12_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
-31_DEPENDS= ${LOCALBASE}/lib/thunderbird3/thunderbird:${PORTSDIR}/mail/thunderbird3
# Add dependencies
.if defined(USE_THUNDERBIRD)
@@ -623,7 +595,7 @@
nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
-png_LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+png_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
png_MOZ_OPTIONS= --with-system-png=${LOCALBASE}
xft_LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206031312.q53DCUlI016402>