* Enable MMX option for i386 arch.

* Don't build the opengl/gtk player, make them options, by default off
(I just wanted to install the library not the useless players).

Bump PKGREVISION because PLIST has been modified.

5 files changed, 50 insertions, 14 deletions

diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 5391fd4868c..668947d55d4 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/08/10 04:03:07 grant Exp $
+# $NetBSD: Makefile,v 1.12 2005/09/04 05:20:05 xtraeme Exp $
 #
 
 DISTNAME=	smpeg-0.4.4
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	devel multimedia
 MASTER_SITES=	ftp://sunsite.auc.dk/pub/os/linux/loki/open-source/smpeg/ \
 		ftp://ftp.linuxgames.com/loki/open-source/smpeg/
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c c++
+USE_LANGUAGES+=	c++
 USE_LIBTOOL=	yes
 
 CPPFLAGS+=	-Dunix=1
@@ -29,7 +29,10 @@ post-wrapper:
 			> ${BUILDLINK_DIR}/include/malloc.h;		\
 	fi
 
+.if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS+=	--enable-mmx
+.endif
+
+.include "options.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/smpeg/PLIST b/multimedia/smpeg/PLIST
index 5fadff5fec7..588184d07a0 100644
--- a/multimedia/smpeg/PLIST
+++ b/multimedia/smpeg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:46 jlam Exp $
-bin/glmovie
-bin/gtv
+@comment $NetBSD: PLIST,v 1.3 2005/09/04 05:20:05 xtraeme Exp $
+${OPENGL_PLAYER}bin/glmovie
+${GTK_PLAYER}bin/gtv
 bin/plaympeg
 bin/smpeg-config
 include/smpeg/MPEG.h
@@ -15,7 +15,7 @@ include/smpeg/MPEGsystem.h
 include/smpeg/MPEGvideo.h
 include/smpeg/smpeg.h
 lib/libsmpeg.la
-man/man1/gtv.1
+${GTK_PLAYER}man/man1/gtv.1
 man/man1/plaympeg.1
 share/aclocal/smpeg.m4
 @dirrm include/smpeg
diff --git a/multimedia/smpeg/distinfo b/multimedia/smpeg/distinfo
index c662cef421a..a5bdf55f364 100644
--- a/multimedia/smpeg/distinfo
+++ b/multimedia/smpeg/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/04/27 11:06:39 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/09/04 05:20:05 xtraeme Exp $
 
 SHA1 (smpeg-0.4.4.tar.gz) = 6d7f4449472e6270ab435b2224f3fad951c35259
 RMD160 (smpeg-0.4.4.tar.gz) = d55249ad53417fa0df3d925aed0e83d2204e28b7
 Size (smpeg-0.4.4.tar.gz) = 315054 bytes
 SHA1 (patch-aa) = 0a691663e1966dbd5d37225b11b6f5f6d9ad0bf0
-SHA1 (patch-ab) = dd6517226c672ce24aded66dd07e8e54ab7e0bb3
+SHA1 (patch-ab) = f0c168dc631149f14c92d2cd6cb5462af9869461
 SHA1 (patch-ac) = 60a8cd16216f4d2ec64b2727fa020d18dda7bec7
 SHA1 (patch-ad) = 021ffc5024723173c8a6cda04ae6f70add974faa
diff --git a/multimedia/smpeg/options.mk b/multimedia/smpeg/options.mk
new file mode 100644
index 00000000000..70dc3e3cc0f
--- /dev/null
+++ b/multimedia/smpeg/options.mk
@@ -0,0 +1,24 @@
+# $NetBSD: options.mk,v 1.1 2005/09/04 05:20:05 xtraeme Exp $
+
+PKG_OPTIONS_VAR=	smpeg
+PKG_SUPPORTED_OPTIONS=	gtk-player opengl-player
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk-player)
+PLIST_SUBST+=		GTK_PLAYER=
+CONFIGURE_ARGS+=	--enable-gtk-player
+.  include "../../x11/gtk/buildlink3.mk"
+.else
+PLIST_SUBST+=		GTK_PLAYER="@comment "
+CONFIGURE_ARGS+=	--disable-gtk-player --disable-gtk-test
+.endif
+
+.if !empty(PKG_OPTIONS:Mopengl-player)
+PLIST_SUBST+=		OPENGL_PLAYER=
+CONFIGURE_ARGS+=	--enable-opengl-player
+.  include "../../graphics/glu/buildlink3.mk"
+.else
+PLIST_SUBST+=		OPENGL_PLAYER="@comment "
+CONFIGURE_ARGS+=	--disable-opengl-player
+.endif
diff --git a/multimedia/smpeg/patches/patch-ab b/multimedia/smpeg/patches/patch-ab
index 62e187b2201..7d5a0fd5c2e 100644
--- a/multimedia/smpeg/patches/patch-ab
+++ b/multimedia/smpeg/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2004/06/26 09:16:10 grant Exp $
+$NetBSD: patch-ab,v 1.2 2005/09/04 05:20:05 xtraeme Exp $
 
 --- Makefile.in.orig	2001-06-18 22:59:14.000000000 +0200
-+++ Makefile.in
-@@ -310,15 +310,15 @@ uninstall-binPROGRAMS:
++++ Makefile.in	2005-09-04 07:16:04.000000000 +0200
+@@ -120,7 +120,7 @@
+ bin_PROGRAMS = plaympeg $(GTK_PLAYER) $(OPENGL_PLAYER)
+ 
+ # Sources for plaympeg
+-man_MANS = plaympeg.1 gtv.1
++man_MANS = plaympeg.1 @HAVE_GTK_TRUE@gtv.1
+ plaympeg_SOURCES = plaympeg.c
+ plaympeg_LDADD = libsmpeg.la
+ 
+@@ -310,15 +310,15 @@
  
  plaympeg: $(plaympeg_OBJECTS) $(plaympeg_DEPENDENCIES)
  	@rm -f plaympeg