svn commit: r311869 - in head/astro: celestia gpsd openuniverse viking xglobe xglobe/files

[Pietro Cerutti]

Author: gahr
Date: Thu Feb  7 15:37:15 2013
New Revision: 311869
URL: http://svnweb.freebsd.org/changeset/ports/311869

Log:
  - Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: astro)
  
  Approved by:	portmgr

Modified:
  head/astro/celestia/Makefile
  head/astro/gpsd/Makefile   (contents, props changed)
  head/astro/openuniverse/Makefile   (contents, props changed)
  head/astro/viking/Makefile   (contents, props changed)
  head/astro/xglobe/Makefile   (contents, props changed)
  head/astro/xglobe/files/patch-Makefile   (contents, props changed)

Modified: head/astro/celestia/Makefile
==============================================================================
--- head/astro/celestia/Makefile	Thu Feb  7 15:24:13 2013	(r311868)
+++ head/astro/celestia/Makefile	Thu Feb  7 15:37:15 2013	(r311869)
@@ -24,8 +24,8 @@ USE_LUA=	5.0+	# should be optional, but 
 WANT_GNOME=	yes
 
 CXXFLAGS+=	-fsigned-char	# fix text rendering (see Gentoo bug 316573)
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 UI_LIST=	glut gtk gnome kde
 CELESTIA_UI?=	glut

Modified: head/astro/gpsd/Makefile
==============================================================================
--- head/astro/gpsd/Makefile	Thu Feb  7 15:24:13 2013	(r311868)
+++ head/astro/gpsd/Makefile	Thu Feb  7 15:37:15 2013	(r311869)
@@ -273,9 +273,6 @@ PLIST_SUB+=	CURSES=""
 SCONS_ARGS+=	profiling=yes
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/Qgpsmm.pc.in
-
 # generates .py[co] files for installed modules
 # if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted
 # with these files when module is imported from root user

Modified: head/astro/openuniverse/Makefile
==============================================================================
--- head/astro/openuniverse/Makefile	Thu Feb  7 15:24:13 2013	(r311868)
+++ head/astro/openuniverse/Makefile	Thu Feb  7 15:37:15 2013	(r311869)
@@ -25,9 +25,8 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib" \
 
-CONFIGURE_ENV=	LIBS="-lcompat" PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	LIBS="-lcompat"
 CPPFLAGS+=	-I${LOCALBASE}/include/GL -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lm
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .include <bsd.port.mk>

Modified: head/astro/viking/Makefile
==============================================================================
--- head/astro/viking/Makefile	Thu Feb  7 15:24:13 2013	(r311868)
+++ head/astro/viking/Makefile	Thu Feb  7 15:37:15 2013	(r311869)
@@ -34,8 +34,8 @@ INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 

Modified: head/astro/xglobe/Makefile
==============================================================================
--- head/astro/xglobe/Makefile	Thu Feb  7 15:24:13 2013	(r311868)
+++ head/astro/xglobe/Makefile	Thu Feb  7 15:37:15 2013	(r311869)
@@ -17,7 +17,7 @@ COMMENT=	Displays a view of the Earth (l
 
 USE_QT4=	corelib gui qt3support moc_build
 USE_GMAKE=	yes
-MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} QT_PREFIX=${QT_PREFIX}
+MAKE_ENV=	QT_PREFIX=${QT_PREFIX}
 
 do-install:
 	@${MKDIR} ${DATADIR}

Modified: head/astro/xglobe/files/patch-Makefile
==============================================================================
--- head/astro/xglobe/files/patch-Makefile	Thu Feb  7 15:24:13 2013	(r311868)
+++ head/astro/xglobe/files/patch-Makefile	Thu Feb  7 15:37:15 2013	(r311869)
@@ -47,7 +47,7 @@
  LIB_DIRS     = -L$(QT_LIB_DIR) -L$(X11_LIB_DIR)
  
 -LIBS         = -lX11 -lqt -lm
-+LIBS         = -lX11 -lQt3Support -lQtGui  -lm ${PTHREAD_LIBS}
++LIBS         = -lX11 -lQt3Support -lQtGui  -lm -pthread
  # If you want to use the QImageIO lib (to support jpg and png maps) use the
  # next two lines and comment the one above
  #WITH_QIMGIO  = -DWITH_QIMAGEIO