diff options
| author | osa <osa@FreeBSD.org> | 2003-07-20 21:09:45 +0800 |
|---|---|---|
| committer | osa <osa@FreeBSD.org> | 2003-07-20 21:09:45 +0800 |
| commit | afcc3c7571d27cf8e561f5175d85b21f71b617ce (patch) | |
| tree | fcb312aa98e0926cd2506ff1742691d96b06dd09 /graphics/giram | |
| parent | fd1a448e706f16e0bbb40867bbd756ca6545e167 (diff) | |
| download | freebsd-ports-gnome-afcc3c7571d27cf8e561f5175d85b21f71b617ce.tar.gz freebsd-ports-gnome-afcc3c7571d27cf8e561f5175d85b21f71b617ce.tar.zst freebsd-ports-gnome-afcc3c7571d27cf8e561f5175d85b21f71b617ce.zip | |
Unbreak patch phase by resolve conflict between
pre-patch phase and patch-configure.
Spotted by: Simon Barner <barner@in.tum.de>
Diffstat (limited to 'graphics/giram')
| -rw-r--r-- | graphics/giram/Makefile | 4 | ||||
| -rw-r--r-- | graphics/giram/files/patch-configure | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 8f544ab7c72b..b4e6c1e74035 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -16,8 +16,6 @@ COMMENT= Giram is Really A Modeller RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray31 -BROKEN= "Fails to patch" - USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes @@ -39,7 +37,7 @@ PKGNAMESUFFIX= -gnome CONFIGURE_ARGS+=--disable-gnome .endif -pre-patch: +post-patch: @${REINPLACE_CMD} -e \ 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ diff --git a/graphics/giram/files/patch-configure b/graphics/giram/files/patch-configure index 327fc6f8f04c..4b9ea7718e11 100644 --- a/graphics/giram/files/patch-configure +++ b/graphics/giram/files/patch-configure @@ -1,12 +1,12 @@ ---- configure.orig Thu Jan 17 01:15:12 2002 -+++ configure Thu Jan 17 01:17:15 2002 +--- configure.orig Sun Jul 20 17:02:58 2003 ++++ configure Sun Jul 20 17:03:44 2003 @@ -4152,7 +4152,6 @@ # have_pthread=no mesa_requires_pthread=no - if test "$ac_have_mesa_gl" = yes; then - echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6 - echo "configure:4158: checking for pthread_create in -pthread" >&5 + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 + echo "configure:4158: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` @@ -4240,12 +4239,7 @@ LIBS="$ac_save_LIBS" @@ -23,7 +23,7 @@ LDFLAGS="$ac_save_LDFLAGS" @@ -4253,7 +4247,6 @@ if test "$mesa_requires_pthread" = yes; then - GL_LIBS="$GL_LIBS -pthread" + GL_LIBS="$GL_LIBS -lpthread" fi - fi # Check for OpenGL 1.1 features. |