aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2001-03-24 21:35:22 +0000
committerSatoshi Asami <asami@FreeBSD.org>2001-03-24 21:35:22 +0000
commitcb7dd7e8da1e8224096a3e96197a937b6a7477f5 (patch)
treebb6818c4b56948b24cc0fc339caea338003e67fb /Mk
parent3e22643a33e82d0609c23fa1ba3413b42ea11579 (diff)
downloadports-cb7dd7e8da1e8224096a3e96197a937b6a7477f5.tar.gz
ports-cb7dd7e8da1e8224096a3e96197a937b6a7477f5.zip
(1) Change maintainership of bsd.port.mk to portmgr@FreeBSD.org. This is
an alias of a small group of people who agreed to take care of this file. (2) USE_QT2 now depends on qt23, not qt22, which will be deleted shortly. (3) Add new variables PTHREAD_CFLAGS and PTHREAD_LIBS to help the transition with the new pthread linking scheme. Submitted by: sobomax (4) Add new categories science and ukrainian. PR: 23313 (ukrainian)
Notes
Notes: svn path=/head/; revision=40322
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk23
1 files changed, 15 insertions, 8 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 943a09d3d34a..4a1b18ee67ba 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -10,14 +10,13 @@
# Please view me with 4 column tabs!
# There are two different types of "maintainers" in the whole ports
-# framework concept. The maintainer of the bsd.port*.mk files
-# is listed below in the ${OPSYS}_MAINTAINER entries (this file
-# is used by multiple *BSD flavors). You should consult him
-# if you have any questions/suggestions regarding this file.
+# framework concept. The maintainer alias of the bsd.port.mk file is
+# listed below in the FreeBSD_MAINTAINER entry. You should consult
+# them if you have any questions/suggestions regarding this file.
#
# DO NOT COMMIT CHANGES TO THIS FILE BY YOURSELF!
-FreeBSD_MAINTAINER= asami@FreeBSD.org
+FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# For each port, the MAINTAINER variable is what you should consult for
# contact information on the person(s) to contact if you have questions/
@@ -771,7 +770,7 @@ USE_NEWGCC= yes
.endif
.if defined(USE_QT2)
-LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt22
+LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23
USE_NEWGCC= yes
.endif
@@ -948,6 +947,14 @@ MAKE_FLAGS?= -f
MAKEFILE?= Makefile
MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+.if ${OSVERSION} < 500016
+PTHREAD_CFLAGS= -D_THREAD_SAFE
+PTHREAD_LIBS= "-pthread"
+.else
+PTHREAD_CFLAGS= ""
+PTHREAD_LIBS= "-lc_r"
+.endif
+
.if exists(/usr/bin/fetch)
# avoid -A for 2.2 -- it's not ported to that branch
.if ${OSVERSION} < 300000
@@ -1224,10 +1231,10 @@ VALID_CATEGORIES+= afterstep archivers astro audio benchmarks biology \
hebrew ipv6 irc japanese java kde korean lang linux \
mail math mbone misc net news \
offix palm perl5 plan9 print python ruby russian \
- security shells sysutils \
+ science security shells sysutils \
tcl76 tcl80 tcl81 tcl82 tcl83 textproc \
tk42 tk80 tk82 tk83 tkstep80 \
- vietnamese windowmaker www \
+ ukrainian vietnamese windowmaker www \
x11 x11-clocks x11-fm x11-fonts x11-servers x11-toolkits x11-wm zope
check-categories:
.for cat in ${CATEGORIES}