diff options
| author | John Marino <marino@FreeBSD.org> | 2015-03-24 19:37:43 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-03-24 19:37:43 +0000 |
| commit | 0ae327316befbab743485040abeca00aa9b31439 (patch) | |
| tree | a4ccf69d55299b5301757b9646b86e3cfed1e46e /x11 | |
| parent | 56f1e57768ed8960cb072dd7bd86991f08c7e7a7 (diff) | |
| download | ports-0ae327316befbab743485040abeca00aa9b31439.tar.gz ports-0ae327316befbab743485040abeca00aa9b31439.zip | |
3 ports categories: Remove $PTHREAD_LIBS
Categories: editors, x11, x11-toolkits
approved by: PTHREAD blanket
Notes
Notes:
svn path=/head/; revision=382163
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/erun/Makefile | 4 | ||||
| -rw-r--r-- | x11/gnome-menus/Makefile | 2 | ||||
| -rw-r--r-- | x11/gnome-menus/files/patch-util_Makefile.in | 2 | ||||
| -rw-r--r-- | x11/mate-applets/Makefile | 4 | ||||
| -rw-r--r-- | x11/xlockmore/Makefile | 2 | ||||
| -rw-r--r-- | x11/xscreensaver-gnome/Makefile | 3 | ||||
| -rw-r--r-- | x11/xstroke/Makefile | 4 |
7 files changed, 9 insertions, 12 deletions
diff --git a/x11/erun/Makefile b/x11/erun/Makefile index efa89c20eae0..b071b073b03b 100644 --- a/x11/erun/Makefile +++ b/x11/erun/Makefile @@ -19,8 +19,8 @@ PLIST_FILES= bin/E-Run.epplet WRKSRC= ${WRKDIR}/${PORTNAME} USE_GL= gl -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lepplet -lImlib2 -lGL do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \ diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 3c62e4d170b1..952ab736e4b7 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -23,8 +23,6 @@ INSTALL_TARGET= install-strip post-patch: @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory - @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ - ${WRKSRC}/util/Makefile.in post-install: @${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/xdg/menus/ diff --git a/x11/gnome-menus/files/patch-util_Makefile.in b/x11/gnome-menus/files/patch-util_Makefile.in index bd9515e01810..23b1aebbb3bd 100644 --- a/x11/gnome-menus/files/patch-util_Makefile.in +++ b/x11/gnome-menus/files/patch-util_Makefile.in @@ -4,7 +4,7 @@ test-menu-spec.c gnome_menu_spec_test_LDADD = \ -+ %%PTHREAD_LIBS%% \ ++ -lpthread \ $(GIO_UNIX_LIBS) \ ../libmenu/libgnome-menu-3.la diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile index 5c141b68af4e..cf557313ea4e 100644 --- a/x11/mate-applets/Makefile +++ b/x11/mate-applets/Makefile @@ -33,8 +33,8 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --disable-networkmanager CONFIGURE_ENV= OS_SYS="/usr/include" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.mate.panel.applet.charpick.gschema.xml \ diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 931e6cefe78c..e19974b9bb11 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -62,7 +62,7 @@ KRB5LIB= -L${KRB5_HOME}/lib .if ${PORT_OPTIONS:MMESAGL} CONFIGURE_ARGS+= --with-mesa -MESALIB=${PTHREAD_LIBS} +MESALIB= -lpthread USE_GL= yes CFLAGS+= -I${LOCALBASE}/include/FTGL .else diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index c315620ab7cc..f5c89ce39390 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -73,8 +73,7 @@ CFLAGS+= -O0 DOS2UNIX_FILES= hacks/glx/topblock.c post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|malloc.h|stdlib.h|g ; \ + @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g ; \ s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure .if ${PORT_OPTIONS:MPAM} diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile index 8f4f5554a620..53252c5dce60 100644 --- a/x11/xstroke/Makefile +++ b/x11/xstroke/Makefile @@ -19,8 +19,8 @@ USE_XORG= xft x11 xext xi xtst PLIST_FILES= bin/xstroke %%ETCDIR%%/alphabet man/man1/xstroke.1.gz CFLAGS+= -I. -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/etc/Imakefile |