View | Details | Raw Unified | Return to bug 92445 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.autotools.mk (-3 / +3 lines)
Lines 99-105 Link Here
99
# Make sure we specified a legal version of automake
99
# Make sure we specified a legal version of automake
100
#
100
#
101
. if !exists(${PORTSDIR}/devel/automake${AUTOMAKE_VERSION}/Makefile)
101
. if !exists(${PORTSDIR}/devel/automake${AUTOMAKE_VERSION}/Makefile)
102
BROKEN+=	Unknown AUTOMAKE version: ${AUTOMAKE_VERSION}
102
IGNORE+=	Unknown AUTOMAKE version: ${AUTOMAKE_VERSION}
103
. endif
103
. endif
104
104
105
# Set up the automake environment
105
# Set up the automake environment
Lines 145-151 Link Here
145
# Make sure we specified a legal version of autoconf
145
# Make sure we specified a legal version of autoconf
146
#
146
#
147
. if !exists(${PORTSDIR}/devel/autoconf${AUTOCONF_VERSION}/Makefile)
147
. if !exists(${PORTSDIR}/devel/autoconf${AUTOCONF_VERSION}/Makefile)
148
BROKEN+=	Unknown AUTOCONF version: ${AUTOCONF_VERSION}
148
IGNORE+=	Unknown AUTOCONF version: ${AUTOCONF_VERSION}
149
. endif
149
. endif
150
150
151
# Set up the autoconf/autoheader environment
151
# Set up the autoconf/autoheader environment
Lines 193-199 Link Here
193
# Make sure we specified a legal version of libtool
193
# Make sure we specified a legal version of libtool
194
#
194
#
195
. if !exists(${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}/Makefile)
195
. if !exists(${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}/Makefile)
196
BROKEN+=	Unknown LIBTOOL version: ${LIBTOOL_VERSION}
196
IGNORE+=	Unknown LIBTOOL version: ${LIBTOOL_VERSION}
197
. endif
197
. endif
198
198
199
# Set up the libtool environment
199
# Set up the libtool environment
(-)Mk/bsd.database.mk (-13 / +13 lines)
Lines 25-31 Link Here
25
#				  Default: 41.
25
#				  Default: 41.
26
# WANT_MYSQL_VER
26
# WANT_MYSQL_VER
27
#				- Maintainer can set an arbitrary version of MySQL by using it.
27
#				- Maintainer can set an arbitrary version of MySQL by using it.
28
# BROKEN_WITH_MYSQL
28
# IGNORE_WITH_MYSQL
29
#				- This variable can be defined if the ports doesn't support
29
#				- This variable can be defined if the ports doesn't support
30
#				  one or more version of MySQL.
30
#				  one or more version of MySQL.
31
# MYSQL_VER		- Internal variable for MySQL version.
31
# MYSQL_VER		- Internal variable for MySQL version.
Lines 43-49 Link Here
43
# WANT_PGSQL_VER
43
# WANT_PGSQL_VER
44
#				- Maintainer can set an arbitrary version of PostgreSQL by
44
#				- Maintainer can set an arbitrary version of PostgreSQL by
45
#				  using it.
45
#				  using it.
46
# BROKEN_WITH_PGSQL
46
# IGNORE_WITH_PGSQL
47
#				- This variable can be defined if the ports doesn't support
47
#				- This variable can be defined if the ports doesn't support
48
#				  one or more versions of PostgreSQL.
48
#				  one or more versions of PostgreSQL.
49
##
49
##
Lines 72-78 Link Here
72
72
73
.if defined(WANT_MYSQL_VER)
73
.if defined(WANT_MYSQL_VER)
74
.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${WANT_MYSQL_VER}
74
.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${WANT_MYSQL_VER}
75
BROKEN=		The port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client.
75
IGNORE=		The port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client.
76
.endif
76
.endif
77
MYSQL_VER=	${WANT_MYSQL_VER}
77
MYSQL_VER=	${WANT_MYSQL_VER}
78
.elif defined(WITH_MYSQL_VER)
78
.elif defined(WITH_MYSQL_VER)
Lines 87-105 Link Here
87
87
88
.if defined(_MYSQL_VER)
88
.if defined(_MYSQL_VER)
89
.if ${_MYSQL_VER} != ${MYSQL_VER}
89
.if ${_MYSQL_VER} != ${MYSQL_VER}
90
BROKEN=	MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client
90
IGNORE=	MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client
91
.endif
91
.endif
92
.endif
92
.endif
93
93
94
# And now we are checking if we can use it
94
# And now we are checking if we can use it
95
.if defined(MYSQL${MYSQL_VER}_LIBVER)
95
.if defined(MYSQL${MYSQL_VER}_LIBVER)
96
.if defined(BROKEN_WITH_MYSQL)
96
.if defined(IGNORE_WITH_MYSQL)
97
.	for VER in ${BROKEN_WITH_MYSQL}
97
.	for VER in ${IGNORE_WITH_MYSQL}
98
.		if (${MYSQL_VER} == "${VER}")
98
.		if (${MYSQL_VER} == "${VER}")
99
IGNORE=		Doesn't work with MySQL version : ${MYSQL_VER} (Doesn't support MySQL ${BROKEN_WITH_MYSQL})
99
IGNORE=		Doesn't work with MySQL version : ${MYSQL_VER} (Doesn't support MySQL ${IGNORE_WITH_MYSQL})
100
.		endif
100
.		endif
101
.	endfor
101
.	endfor
102
.endif # BROKEN_WITH_MYSQL
102
.endif # IGNORE_WITH_MYSQL
103
LIB_DEPENDS+=	mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
103
LIB_DEPENDS+=	mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
104
.else
104
.else
105
IGNORE=		Unknown MySQL version: ${MYSQL_VER}
105
IGNORE=		Unknown MySQL version: ${MYSQL_VER}
Lines 119-125 Link Here
119
.endif
119
.endif
120
120
121
.if defined(WANT_PGSQL_VER) && defined(_PGSQL_VER) && ${WANT_PGSQL_VER} != ${_PGSQL_VER}
121
.if defined(WANT_PGSQL_VER) && defined(_PGSQL_VER) && ${WANT_PGSQL_VER} != ${_PGSQL_VER}
122
BROKEN=		the port wants postgresql${WANT_PGSQL_VER}-client but you have postgresql${_PGSQL_VER}-client installed
122
IGNORE=		the port wants postgresql${WANT_PGSQL_VER}-client but you have postgresql${_PGSQL_VER}-client installed
123
.endif
123
.endif
124
124
125
.if defined(_PGSQL_VER)
125
.if defined(_PGSQL_VER)
Lines 132-144 Link Here
132
132
133
# And now we are checking if we can use it
133
# And now we are checking if we can use it
134
.if defined(PGSQL${PGSQL_VER}_LIBVER)
134
.if defined(PGSQL${PGSQL_VER}_LIBVER)
135
.if defined(BROKEN_WITH_PGSQL)
135
.if defined(IGNORE_WITH_PGSQL)
136
.	for VER in ${BROKEN_WITH_PGSQL}
136
.	for VER in ${IGNORE_WITH_PGSQL}
137
.		if (${PGSQL_VER} == "${VER}")
137
.		if (${PGSQL_VER} == "${VER}")
138
IGNORE=		Does not work with postgresql${PGSQL_VER}-client PostgresSQL (${BROKEN_WITH_PGSQL} not supported)
138
IGNORE=		Does not work with postgresql${PGSQL_VER}-client PostgresSQL (${IGNORE_WITH_PGSQL} not supported)
139
.		endif
139
.		endif
140
.	endfor
140
.	endfor
141
.endif # BROKEN_WITH_PGSQL
141
.endif # IGNORE_WITH_PGSQL
142
LIB_DEPENDS+=	pq.${PGSQL${PGSQL_VER}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
142
LIB_DEPENDS+=	pq.${PGSQL${PGSQL_VER}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
143
.else
143
.else
144
IGNORE=		Unknown PostgreSQL version: ${PGSQL_VER}
144
IGNORE=		Unknown PostgreSQL version: ${PGSQL_VER}
(-)Mk/bsd.gcc.mk (-2 / +2 lines)
Lines 78-84 Link Here
78
.endfor
78
.endfor
79
79
80
.if !defined(_GCCVERSION_OKAY)
80
.if !defined(_GCCVERSION_OKAY)
81
BROKEN=	Unknown version of GCC specified (USE_GCC=${USE_GCC})
81
IGNORE=	Unknown version of GCC specified (USE_GCC=${USE_GCC})
82
.endif
82
.endif
83
83
84
#
84
#
Lines 94-100 Link Here
94
. endif
94
. endif
95
.endfor
95
.endfor
96
.if !defined(_GCCVERSION)
96
.if !defined(_GCCVERSION)
97
BROKEN=		Couldn't find your current GCCVERSION (OSVERSION=${OSVERSION})
97
IGNORE=		Couldn't find your current GCCVERSION (OSVERSION=${OSVERSION})
98
.endif
98
.endif
99
99
100
#
100
#
(-)Mk/bsd.gnome.mk (-5 / +5 lines)
Lines 596-608 Link Here
596
.      if defined(GNOME_DESKTOP_VERSION) && \
596
.      if defined(GNOME_DESKTOP_VERSION) && \
597
	defined(${component}_GNOME_DESKTOP_VERSION)
597
	defined(${component}_GNOME_DESKTOP_VERSION)
598
.         if ${GNOME_DESKTOP_VERSION}!=${${component}_GNOME_DESKTOP_VERSION}
598
.         if ${GNOME_DESKTOP_VERSION}!=${${component}_GNOME_DESKTOP_VERSION}
599
BROKEN=	${PORTNAME} wants to use the GNOME
599
IGNORE=	${PORTNAME} wants to use the GNOME
600
BROKEN+=${${component}_GNOME_DESKTOP_VERSION} desktop, but you wish to use
600
IGNORE+=${${component}_GNOME_DESKTOP_VERSION} desktop, but you wish to use
601
BROKEN+=the GNOME ${GNOME_DESKTOP_VERSION} desktop
601
IGNORE+=the GNOME ${GNOME_DESKTOP_VERSION} desktop
602
.         endif
602
.         endif
603
.      endif
603
.      endif
604
.  if ${_USE_GNOME_ALL:M${component}}==""
604
.  if ${_USE_GNOME_ALL:M${component}}==""
605
BROKEN=	Unknown component ${component}
605
IGNORE=	Unknown component ${component}
606
.  endif
606
.  endif
607
_USE_GNOME+=	${${component}_USE_GNOME_IMPL} ${component}
607
_USE_GNOME+=	${${component}_USE_GNOME_IMPL} ${component}
608
. endfor
608
. endfor
Lines 628-634 Link Here
628
						done;
628
						done;
629
.else
629
.else
630
.if ${USE_GNOME:Mltverhack}!=""
630
.if ${USE_GNOME:Mltverhack}!=""
631
BROKEN= ${PORTNAME} uses the ltverhack GNOME component but does not use libtool
631
IGNORE= ${PORTNAME} uses the ltverhack GNOME component but does not use libtool
632
.endif
632
.endif
633
.endif
633
.endif
634
634
(-)Mk/bsd.gstreamer.mk (-1 / +1 lines)
Lines 237-243 Link Here
237
RUN_DEPENDS+=   ${_GST_LIB_BASE}/libgst${ext}.so:${PORTSDIR}/${${ext}_DEPENDS}
237
RUN_DEPENDS+=   ${_GST_LIB_BASE}/libgst${ext}.so:${PORTSDIR}/${${ext}_DEPENDS}
238
.  endif
238
.  endif
239
. else
239
. else
240
BROKEN=	Unknown gstreamer-plugin -- ${ext}
240
IGNORE=	Unknown gstreamer-plugin -- ${ext}
241
. endif
241
. endif
242
.endfor
242
.endfor
243
243
(-)Mk/bsd.kde.mk (-2 / +2 lines)
Lines 68-74 Link Here
68
USE_QT_VER=		3
68
USE_QT_VER=		3
69
PREFIX=			${KDE_PREFIX}
69
PREFIX=			${KDE_PREFIX}
70
.else
70
.else
71
BROKEN=			Unknown value in USE_KDELIBS_VER
71
IGNORE=			Unknown value in USE_KDELIBS_VER
72
.endif # ${USE_KDELIBS_VER} == 3
72
.endif # ${USE_KDELIBS_VER} == 3
73
.endif # defined(USE_KDELIBS_VER)
73
.endif # defined(USE_KDELIBS_VER)
74
74
Lines 122-128 Link Here
122
CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
122
CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
123
.endif # !defined(QT_NONSTANDARD)
123
.endif # !defined(QT_NONSTANDARD)
124
.else
124
.else
125
BROKEN=Unsupported value of USE_QT_VER
125
IGNORE=Unsupported value of USE_QT_VER
126
.endif # defined(USE_QT_VER)
126
.endif # defined(USE_QT_VER)
127
127
128
# End of USE_QT_VER section
128
# End of USE_QT_VER section
(-)Mk/bsd.php.mk (-4 / +4 lines)
Lines 18-24 Link Here
18
# The port can set these options in its Makefile before bsd.ports.pre.mk:
18
# The port can set these options in its Makefile before bsd.ports.pre.mk:
19
#
19
#
20
# DEFAULT_PHP_VER=N - Use PHP version N if PHP is not yet installed.
20
# DEFAULT_PHP_VER=N - Use PHP version N if PHP is not yet installed.
21
# BROKEN_WITH_PHP=N - The port doesn't work with PHP version N.
21
# IGNORE_WITH_PHP=N - The port doesn't work with PHP version N.
22
# USE_PHPIZE=yes    - Use to build a PHP extension.
22
# USE_PHPIZE=yes    - Use to build a PHP extension.
23
# USE_PHPEXT=yes    - Use to build, install and register a PHP extension.
23
# USE_PHPEXT=yes    - Use to build, install and register a PHP extension.
24
# USE_PHP_BUILD=yes - Set PHP also as a build dependency.
24
# USE_PHP_BUILD=yes - Set PHP also as a build dependency.
Lines 71-80 Link Here
71
.endif
71
.endif
72
PHP_EXT_INC?=	""
72
PHP_EXT_INC?=	""
73
73
74
.if defined(BROKEN_WITH_PHP)
74
.if defined(IGNORE_WITH_PHP)
75
.	for VER in ${BROKEN_WITH_PHP}
75
.	for VER in ${IGNORE_WITH_PHP}
76
.		if ${PHP_VER} == "${VER}"
76
.		if ${PHP_VER} == "${VER}"
77
BROKEN=		Doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${BROKEN_WITH_PHP})
77
IGNORE=		Doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${IGNORE_WITH_PHP})
78
.		endif
78
.		endif
79
.	endfor
79
.	endfor
80
.endif
80
.endif

Return to bug 92445