From 2ad92eab941d8bd35f72240b5b91c4b980c9f370 Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Thu, 7 Feb 2013 12:37:48 +0000 Subject: - Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: www) Approved by: portmgr --- www/xombrero/Makefile | 4 +--- www/xombrero/files/patch-freebsd__Makefile | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'www/xombrero') diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile index e38ed04b9398..76c4f6cde549 100644 --- a/www/xombrero/Makefile +++ b/www/xombrero/Makefile @@ -22,9 +22,7 @@ USE_PERL5_BUILD=yes USE_GNOME= gtk20 INSTALLS_ICONS= yes -MAKE_ENV= GTK_VERSION="gtk2" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= GTK_VERSION="gtk2" MAN1= xombrero.1 PORTEXAMPLES= favorites playflash.sh xombrero.conf diff --git a/www/xombrero/files/patch-freebsd__Makefile b/www/xombrero/files/patch-freebsd__Makefile index 000c9c955659..94a7af03099a 100644 --- a/www/xombrero/files/patch-freebsd__Makefile +++ b/www/xombrero/files/patch-freebsd__Makefile @@ -1,13 +1,11 @@ ---- freebsd/Makefile.orig 2012-08-28 19:18:30.000000000 +0100 -+++ freebsd/Makefile 2012-08-31 13:57:54.000000000 +0100 -@@ -9,8 +9,8 @@ +--- freebsd/Makefile.orig 2012-12-11 14:25:00.000000000 +0100 ++++ freebsd/Makefile 2012-12-11 14:25:07.000000000 +0100 +@@ -9,7 +9,7 @@ LDADD= -lutil -lgcrypt GTK_CFLAGS!= pkg-config --cflags $(LIBS) GTK_LDFLAGS!= pkg-config --libs $(LIBS) -CFLAGS+= $(GTK_CFLAGS) -O2 -Wall -pthread -I. -I.. --LDFLAGS+= $(GTK_LDFLAGS) -pthread -+CFLAGS+= $(GTK_CFLAGS) -Wall ${PTHREAD_CFLAGS} -I. -I.. -+LDFLAGS+= $(GTK_LDFLAGS) ${PTHREAD_LIBS} ++CFLAGS+= $(GTK_CFLAGS) -Wall -I. -I.. + LDFLAGS+= $(GTK_LDFLAGS) -pthread PREFIX?= /usr/local - BINDIR?= $(PREFIX)/bin -- cgit v1.2.3