3 files changed, 36 insertions, 59 deletions

diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index cb70ed2e4d13..44902316fb02 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -12,22 +12,26 @@ MASTER_SITES=	http://www-eleves.enst-bretagne.fr/~chavarri/xmps/sources/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	smpeg.0:${PORTSDIR}/graphics/smpeg \
-		gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	smpeg.0:${PORTSDIR}/graphics/smpeg
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
- 		GLIB_CONFIG="${GLIB_CONFIG}" \
+USE_X_PREFIX=	yes
+USE_GNOME=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		SDL_CONFIG="${SDL_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/multimedia/xmps/files/patch-aa b/multimedia/xmps/files/patch-aa
index 7ae2c2967701..a7d89a3e518e 100644
--- a/multimedia/xmps/files/patch-aa
+++ b/multimedia/xmps/files/patch-aa
@@ -16,33 +16,6 @@
   cat >> confdefs.h <<\EOF
  #define AS_STRETCHER 1
  EOF
-@@ -2979,14 +2981,14 @@
- { echo "configure: error: *** POSIX thread support not installed ***" 1>&2; exit 1; }
- fi
- 
--echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
--echo "configure:2984: checking for pthread_attr_init in -lpthread" >&5
-+echo $ac_n "checking for pthread_attr_init in -pthread""... $ac_c" 1>&6
-+echo "configure:2984: checking for pthread_attr_init in -pthread" >&5
- ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2992 "configure"
- #include "confdefs.h"
-@@ -3020,7 +3022,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="-pthread $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
 @@ -4060,16 +4062,16 @@
  { echo "configure: error: **** Cannot find stat.h ****" 1>&2; exit 1; }
  fi
diff --git a/multimedia/xmps/pkg-plist b/multimedia/xmps/pkg-plist
index a292fff4c220..836cb270fa9d 100644
--- a/multimedia/xmps/pkg-plist
+++ b/multimedia/xmps/pkg-plist
@@ -3,30 +3,30 @@ lib/xmps/Codecs/libsmpeg.so
 lib/xmps/Renderers/libSDL.so
 lib/xmps/Renderers/libX11.so
 share/gnome/apps/Multimedia/XMPS.desktop
+share/gnome/pixmaps/xmps.png
+share/gnome/xmps/skins/DarkDepth/buttons.xpm
+share/gnome/xmps/skins/DarkDepth/config
+share/gnome/xmps/skins/DarkDepth/controls.xpm
+share/gnome/xmps/skins/DarkDepth/digits.xpm
+share/gnome/xmps/skins/DarkDepth/main.xpm
+share/gnome/xmps/skins/DarkDepth/playlist.xpm
+share/gnome/xmps/skins/DarkDepth/titlebar.xpm
+share/gnome/xmps/skins/default/buttons.xpm
+share/gnome/xmps/skins/default/config
+share/gnome/xmps/skins/default/controls.xpm
+share/gnome/xmps/skins/default/digits.xpm
+share/gnome/xmps/skins/default/main.xpm
+share/gnome/xmps/skins/default/playlist.xpm
+share/gnome/xmps/skins/default/titlebar.xpm
+share/gnome/xmps/xmps_intro.xpm
 share/locale/fi/LC_MESSAGES/xmps.mo
 share/locale/fr/LC_MESSAGES/xmps.mo
 share/locale/pl/LC_MESSAGES/xmps.mo
 share/locale/sv/LC_MESSAGES/xmps.mo
-share/gnome/pixmaps/xmps.png
-share/xmps/skins/DarkDepth/buttons.xpm
-share/xmps/skins/DarkDepth/config
-share/xmps/skins/DarkDepth/controls.xpm
-share/xmps/skins/DarkDepth/digits.xpm
-share/xmps/skins/DarkDepth/main.xpm
-share/xmps/skins/DarkDepth/playlist.xpm
-share/xmps/skins/DarkDepth/titlebar.xpm
-share/xmps/skins/default/buttons.xpm
-share/xmps/skins/default/config
-share/xmps/skins/default/controls.xpm
-share/xmps/skins/default/digits.xpm
-share/xmps/skins/default/main.xpm
-share/xmps/skins/default/playlist.xpm
-share/xmps/skins/default/titlebar.xpm
-share/xmps/xmps_intro.xpm
-@dirrm share/xmps/skins/default
-@dirrm share/xmps/skins/DarkDepth
-@dirrm share/xmps/skins
-@dirrm share/xmps
+@dirrm share/gnome/xmps/skins/default
+@dirrm share/gnome/xmps/skins/DarkDepth
+@dirrm share/gnome/xmps/skins
+@dirrm share/gnome/xmps
 @dirrm lib/xmps/Renderers
 @dirrm lib/xmps/Codecs
 @dirrm lib/xmps