diff options
| author | John Marino <marino@FreeBSD.org> | 2015-03-24 17:09:58 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-03-24 17:09:58 +0000 |
| commit | 28ca5b96a23102bc508dd441fedf3cdf3eef313f (patch) | |
| tree | 8bff0e951ded629b0a9a867dfad08db840b0458a /x11-clocks | |
| parent | Deorbit PTHREAD_{CFLAGS,LIBS} from Perl, and use -lpthread. (diff) | |
5 ports categories: Remove $PTHREAD_LIBS
Categories: irc, x11-clocks, benchmarks, misc, textproc
approved by: PTHREAD blanket
Notes
Notes:
svn path=/head/; revision=382126
Diffstat (limited to 'x11-clocks')
| -rw-r--r-- | x11-clocks/alltraxclock/Makefile | 2 | ||||
| -rw-r--r-- | x11-clocks/osdclock/Makefile | 5 | ||||
| -rw-r--r-- | x11-clocks/wmtimer/Makefile | 6 | ||||
| -rw-r--r-- | x11-clocks/wmtimer/files/patch-wmtimer__Makefile | 13 |
4 files changed, 12 insertions, 14 deletions
diff --git a/x11-clocks/alltraxclock/Makefile b/x11-clocks/alltraxclock/Makefile index e5cf5e75b396..4bc7697bc463 100644 --- a/x11-clocks/alltraxclock/Makefile +++ b/x11-clocks/alltraxclock/Makefile @@ -22,7 +22,7 @@ PLIST_FILES= libexec/gkrellm2/plugins/alltraxclock.so WRKSRC= ${WRKDIR}/${PORTNAME}2_0.2/ post-patch: - @${REINPLACE_CMD} -e 's|gcc|${CC}|;s|-O2||;s|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|gcc|${CC}|;s|-O2||' ${WRKSRC}/Makefile do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins/ diff --git a/x11-clocks/osdclock/Makefile b/x11-clocks/osdclock/Makefile index 9b5be8a88907..2759146d49cf 100644 --- a/x11-clocks/osdclock/Makefile +++ b/x11-clocks/osdclock/Makefile @@ -15,8 +15,9 @@ COMMENT= Small clock which uses libxosd to render text to the root window LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lpthread +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ PREFIX="${PREFIX}" PLIST_FILES= bin/osd_clock man/man1/osd_clock.1.gz diff --git a/x11-clocks/wmtimer/Makefile b/x11-clocks/wmtimer/Makefile index 12535ea068cd..33407e8bc752 100644 --- a/x11-clocks/wmtimer/Makefile +++ b/x11-clocks/wmtimer/Makefile @@ -20,14 +20,12 @@ USE_CSTD= gnu89 USE_XORG= x11 xau xcomposite xcursor xdamage xdmcp xext xfixes xi \ xinerama xpm xrandr xrender USE_GNOME= gtk20 -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" OPTIONS_DEFINE= DOCS do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/wmtimer ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/wmtimer ${STAGEDIR}${PREFIX}/bin @${INSTALL} -d ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/x11-clocks/wmtimer/files/patch-wmtimer__Makefile b/x11-clocks/wmtimer/files/patch-wmtimer__Makefile index 1da0510384d8..620ce3bf9d8e 100644 --- a/x11-clocks/wmtimer/files/patch-wmtimer__Makefile +++ b/x11-clocks/wmtimer/files/patch-wmtimer__Makefile @@ -1,17 +1,16 @@ ---- Makefile.orig Sat Nov 20 18:19:07 2004 -+++ Makefile Sat Nov 20 18:22:11 2004 +--- Makefile.orig 2004-01-05 00:30:50 UTC ++++ Makefile @@ -1,7 +1,6 @@ -CC = gcc -LIBDIR = -L/usr/X11R6/lib -L/usr/lib --LIBS = -lXpm -lXext -lX11 -lpthread `pkg-config --libs gtk+-2.0` --CFLAGS = `pkg-config --cflags gtk+-2.0` +LIBDIR = -L${LOCALBASE}/lib -+LIBS = -lXpm -lXext -lX11 `pkg-config --libs gtk+-2.0` ${PTHREAD_LIBS} -+CFLAGS += `pkg-config --cflags gtk+-2.0` ${PTHREAD_CFLAGS} + LIBS = -lXpm -lXext -lX11 -lpthread `pkg-config --libs gtk+-2.0` +-CFLAGS = `pkg-config --cflags gtk+-2.0` ++CFLAGS += `pkg-config --cflags gtk+-2.0` OBJS = wmtimer.o \ ../wmgeneral/wmgeneral.o \ -@@ -10,10 +9,10 @@ +@@ -10,10 +9,10 @@ OBJS = wmtimer.o \ all: wmtimer .c.o: |