summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-05-07 19:56:56 +0800
committerkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-05-07 19:56:56 +0800
commitb034c78df5c226ad79006ac9f82a7d550259d873 (patch)
treec24baed887d8b2cf0f69fc01aa664cebda69ab09
parent0d60971ccadd47965053eceb06c6297933e72a6a (diff)
downloadxorg-devel-ports-b034c78df5c226ad79006ac9f82a7d550259d873.tar.gz
xorg-devel-ports-b034c78df5c226ad79006ac9f82a7d550259d873.tar.zst
xorg-devel-ports-b034c78df5c226ad79006ac9f82a7d550259d873.zip
Merge r685
Sync with ports. git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@866 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--Mk/bsd.port.mk37
1 files changed, 0 insertions, 37 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 67c9f96..1b50f78 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -324,11 +324,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# GMAKE - Set to path of GNU make if not in $PATH.
# Default: gmake
##
-# USE_GETTEXT - The port uses GNU gettext (libintl).
-# 'build' as a build-time dependency
-# 'yes' as a library dependency
-# 'run' as a run-time dependency
-##
# USE_GHOSTSCRIPT
# - If set, this port needs ghostscript to both
# build and run. If a number is specified,
@@ -374,12 +369,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# USE_SDL - If set, this port uses the sdl libraries.
# See bsd.sdl.mk for more information.
##
-# USE_READLINE - If set, this port uses libreadline.
-# Legal values are: yes, base, port
-# yes, base: use base system libreadline on FreeBSD 9 or earlier,
-# use ports/devel/readline on FreeBSD 10.0+
-# port: always use ports/devel/readline
-##
# USE_OPENAL - If set, this port relies on the OpenAL package.
# Legal values are: al, soft, si, alut.
# If set to an unknown value, the port is marked broken.
@@ -526,8 +515,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
##
# USE_APACHE - If set, this port relies on an apache webserver.
#
-# USE_NCURSES - If set, this port relies on the ncurses package.
-#
# Conflict checking. Use if your port cannot be installed at the same time as
# another package.
#
@@ -1506,10 +1493,6 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
.include "${PORTSDIR}/Mk/bsd.kde4.mk"
.endif
-.if defined(USE_NCURSES)
-.include "${PORTSDIR}/Mk/bsd.ncurses.mk"
-.endif
-
.include "${PORTSDIR}/Mk/bsd.pbi.mk"
# Loading features
@@ -1717,14 +1700,6 @@ MAKE_ENV+= ${b}="${${b}}"
.include "${PORTSDIR}/Mk/bsd.ldap.mk"
.endif
-.if defined(USE_READLINE)
-.if ${USE_READLINE} == "port" || ${OSVERSION} > 1000000
-LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lreadline
-.endif
-.endif
-
.if defined(USE_OPENAL)
_OPENAL_ALL= al si soft alut
_OPENAL_LIBS= si soft
@@ -1857,18 +1832,6 @@ USE_LDCONFIG= ${PREFIX}/lib
IGNORE= has USE_LDCONFIG32 set to yes, which is not correct
.endif
-.if defined(USE_GETTEXT)
-. if ${USE_GETTEXT:L} == "build"
-BUILD_DEPENDS+= xgettext:${PORTSDIR}/devel/gettext
-. elif ${USE_GETTEXT:L} == "run"
-RUN_DEPENDS+= xgettext:${PORTSDIR}/devel/gettext
-. elif ${USE_GETTEXT:L} == "yes"
-LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext
-. else
-IGNORE= USE_GETTEXT can be only one of build, run, or yes
-. endif
-.endif
-
.if defined(USE_LINUX_PREFIX) && defined(USE_LDCONFIG)
# we need ${LINUXBASE}/sbin/ldconfig
USE_LINUX?= yes