diff options
| author | oliver <oliver@FreeBSD.org> | 2004-02-20 04:23:49 +0800 |
|---|---|---|
| committer | oliver <oliver@FreeBSD.org> | 2004-02-20 04:23:49 +0800 |
| commit | 704a804839920d3320a5b47b715b93a4033a59f9 (patch) | |
| tree | 423e627021900f5b57ad8e7ccc0790ab5621fda6 /devel | |
| parent | 2c794d8c9f56f2228bfed0bae2163697f8a7e1e1 (diff) | |
| download | freebsd-ports-gnome-704a804839920d3320a5b47b715b93a4033a59f9.tar.gz freebsd-ports-gnome-704a804839920d3320a5b47b715b93a4033a59f9.tar.zst freebsd-ports-gnome-704a804839920d3320a5b47b715b93a4033a59f9.zip | |
Fix linking against -lc_r and -lpthread
Bump PORTREVISION
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libuta/Makefile | 12 | ||||
| -rw-r--r-- | devel/wftk/Makefile | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile index debc9fa32db1..afe03413983c 100644 --- a/devel/libuta/Makefile +++ b/devel/libuta/Makefile @@ -7,6 +7,7 @@ PORTNAME= libuta PORTVERSION= 0.4.4 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -35,10 +36,6 @@ SDL11_FILES= configure uta/color.h uta/event.h uta/keysym.h uta/mutex.h \ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502102 -FORBIDDEN= "Links against conflicting thread libraries" -.endif - .if exists(${LOCALBASE}/lib/libSDL_mixer.so.2) WITH_SDL_MIXER= yes .endif @@ -53,7 +50,10 @@ post-patch: .endfor pre-configure: - @${REINPLACE_CMD} -e 's|<freetype/freetype.h>|<freetype1/freetype/freetype.h>|g' \ - ${WRKSRC}/configure ${WRKSRC}/uta/font.h + @${REINPLACE_CMD} -e '\ + s|<freetype/freetype.h>|<freetype1/freetype/freetype.h>|g; \ + s|-lpthread||g; \ + s|-lc_r|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/configure ${WRKSRC}/uta/font.h .include <bsd.port.post.mk> diff --git a/devel/wftk/Makefile b/devel/wftk/Makefile index debc9fa32db1..afe03413983c 100644 --- a/devel/wftk/Makefile +++ b/devel/wftk/Makefile @@ -7,6 +7,7 @@ PORTNAME= libuta PORTVERSION= 0.4.4 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -35,10 +36,6 @@ SDL11_FILES= configure uta/color.h uta/event.h uta/keysym.h uta/mutex.h \ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502102 -FORBIDDEN= "Links against conflicting thread libraries" -.endif - .if exists(${LOCALBASE}/lib/libSDL_mixer.so.2) WITH_SDL_MIXER= yes .endif @@ -53,7 +50,10 @@ post-patch: .endfor pre-configure: - @${REINPLACE_CMD} -e 's|<freetype/freetype.h>|<freetype1/freetype/freetype.h>|g' \ - ${WRKSRC}/configure ${WRKSRC}/uta/font.h + @${REINPLACE_CMD} -e '\ + s|<freetype/freetype.h>|<freetype1/freetype/freetype.h>|g; \ + s|-lpthread||g; \ + s|-lc_r|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/configure ${WRKSRC}/uta/font.h .include <bsd.port.post.mk> |