diff options
| author | linimon <linimon@FreeBSD.org> | 2006-07-10 13:12:25 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2006-07-10 13:12:25 +0800 |
| commit | e36bb2f24bcf0fef654c848f034057fd57de2032 (patch) | |
| tree | 7ac02b87182482f69a3adf238b9540e1cf36b503 | |
| parent | 308e0ba157e59b873c73a8d74b61c3292e73567f (diff) | |
| download | freebsd-ports-gnome-e36bb2f24bcf0fef654c848f034057fd57de2032.tar.gz freebsd-ports-gnome-e36bb2f24bcf0fef654c848f034057fd57de2032.tar.zst freebsd-ports-gnome-e36bb2f24bcf0fef654c848f034057fd57de2032.zip | |
Bring this up to ports/Mk/bsd.port.mk 1.537 (incorporates 1.536).
Forgotten by: linimon
| -rw-r--r-- | devel/portmk/Mk/bsd.port.mk | 20 | ||||
| -rw-r--r-- | ports-mgmt/portmk/Mk/bsd.port.mk | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/devel/portmk/Mk/bsd.port.mk b/devel/portmk/Mk/bsd.port.mk index 8453a86ff9a1..a0e8a705a04b 100644 --- a/devel/portmk/Mk/bsd.port.mk +++ b/devel/portmk/Mk/bsd.port.mk @@ -382,9 +382,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_OPENSSL - If set, this port relies on the OpenSSL package. ## # USE_OPENLDAP - If set, this port uses the OpenLDAP libraries. -# Implies: WANT_OPENLDAP_VER?=22 +# Implies: WANT_OPENLDAP_VER?=23 # WANT_OPENLDAP_VER -# - Legal values are: 21, 22, 23 +# - Legal values are: 22, 23, 24 # If set to an unkown value, the port is marked BROKEN. # WANT_OPENLDAP_SASL # - If set, the system should use OpenLDAP libraries @@ -1459,6 +1459,14 @@ PERL= ${LOCALBASE}/bin/perl .endif .endif +.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) +.if exists(${DEVELPORTSDIR}/Mk/bsd.wx.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.wx.mk" +.else +.include "${PORTSDIR}/Mk/bsd.wx.mk" +.endif +.endif + .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER80) .if exists(${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk) .include "${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk" @@ -1483,14 +1491,6 @@ PERL= ${LOCALBASE}/bin/perl .endif .endif -.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) -.if exists(${DEVELPORTSDIR}/Mk/bsd.wx.mk) -.include "${DEVELPORTSDIR}/Mk/bsd.wx.mk" -.else -.include "${PORTSDIR}/Mk/bsd.wx.mk" -.endif -.endif - .if ${OSVERSION} >= 502123 X_WINDOW_SYSTEM ?= xorg .elif (${OSVERSION} >= 450005 && !defined(XFREE86_VERSION)) || \ diff --git a/ports-mgmt/portmk/Mk/bsd.port.mk b/ports-mgmt/portmk/Mk/bsd.port.mk index 8453a86ff9a1..a0e8a705a04b 100644 --- a/ports-mgmt/portmk/Mk/bsd.port.mk +++ b/ports-mgmt/portmk/Mk/bsd.port.mk @@ -382,9 +382,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_OPENSSL - If set, this port relies on the OpenSSL package. ## # USE_OPENLDAP - If set, this port uses the OpenLDAP libraries. -# Implies: WANT_OPENLDAP_VER?=22 +# Implies: WANT_OPENLDAP_VER?=23 # WANT_OPENLDAP_VER -# - Legal values are: 21, 22, 23 +# - Legal values are: 22, 23, 24 # If set to an unkown value, the port is marked BROKEN. # WANT_OPENLDAP_SASL # - If set, the system should use OpenLDAP libraries @@ -1459,6 +1459,14 @@ PERL= ${LOCALBASE}/bin/perl .endif .endif +.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) +.if exists(${DEVELPORTSDIR}/Mk/bsd.wx.mk) +.include "${DEVELPORTSDIR}/Mk/bsd.wx.mk" +.else +.include "${PORTSDIR}/Mk/bsd.wx.mk" +.endif +.endif + .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER80) .if exists(${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk) .include "${DEVELPORTSDIR}/Mk/bsd.gstreamer.mk" @@ -1483,14 +1491,6 @@ PERL= ${LOCALBASE}/bin/perl .endif .endif -.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) -.if exists(${DEVELPORTSDIR}/Mk/bsd.wx.mk) -.include "${DEVELPORTSDIR}/Mk/bsd.wx.mk" -.else -.include "${PORTSDIR}/Mk/bsd.wx.mk" -.endif -.endif - .if ${OSVERSION} >= 502123 X_WINDOW_SYSTEM ?= xorg .elif (${OSVERSION} >= 450005 && !defined(XFREE86_VERSION)) || \ |