diff options
| -rw-r--r-- | Mk/bsd.linux-rpm.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk index cdd118c3d4b0..3168636a0714 100644 --- a/Mk/bsd.linux-rpm.mk +++ b/Mk/bsd.linux-rpm.mk @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.3 2006-04-30 22:00:42 netchild Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.4 2006-05-02 10:06:54 netchild Exp $ # # Variables: @@ -82,7 +82,9 @@ PKGNAMEPREFIX?= linux- # is not true. DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} +BIN_DISTFILES:= ${DISTFILES} SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX} +EXTRACT_ONLY?= ${BIN_DISTFILES} . if defined(PACKAGE_BUILDING) DISTFILES+= ${SRC_DISTFILES} diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c8bee854975d..ddd0d389d4be 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1831,7 +1831,7 @@ USE_SUBMAKE= yes .if defined(USE_XLIB) . if defined(USE_LINUX) -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-xorg-libs . else LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} . endif @@ -1914,7 +1914,11 @@ MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB= .if ${OSVERSION} < 500016 PTHREAD_CFLAGS?= -D_THREAD_SAFE +. if ${CC} == "icc" +PTHREAD_LIBS?= -mt +. else PTHREAD_LIBS?= -pthread +. endif .elif ${OSVERSION} < 502102 PTHREAD_CFLAGS?= -D_THREAD_SAFE PTHREAD_LIBS?= -lc_r |