[Midnightbsd-cvs] mports [18404] trunk/graphics: goom should use USES

[laffer1 at midnightbsd.org]

Revision: 18404
          http://svnweb.midnightbsd.org/mports/?rev=18404
Author:   laffer1
Date:     2015-03-28 05:48:44 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
goom should use USES

Modified Paths:
--------------
    trunk/graphics/gdk-pixbuf2/Makefile
    trunk/graphics/goom/Makefile
    trunk/graphics/goom/distinfo
    trunk/graphics/goom/pkg-plist

Added Paths:
-----------
    trunk/graphics/goom/files/
    trunk/graphics/goom/files/patch-src-mmx.h

Modified: trunk/graphics/gdk-pixbuf2/Makefile
===================================================================
--- trunk/graphics/gdk-pixbuf2/Makefile	2015-03-28 09:48:30 UTC (rev 18403)
+++ trunk/graphics/gdk-pixbuf2/Makefile	2015-03-28 09:48:44 UTC (rev 18404)
@@ -26,6 +26,14 @@
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	JASPER JPEG PNG TIFF
 OPTIONS_DEFAULT=JASPER JPEG PNG TIFF
+JASPER_CONFIGURE_WITH=	libjasper
+JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
+JPEG_CONFIGURE_WITPNGH=	libjpeg
+JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+PNG_CONFIGURE_WITH=	libpng
+PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+TIFF_CONFIGURE_WITH=	libtiff
+TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
 .include <bsd.mport.options.mk>
 
@@ -37,38 +45,6 @@
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MJASPER}
-LIB_DEPENDS+=	libjasper.so:${PORTSDIR}/graphics/jasper
-CONFIGURE_ARGS+=--with-libjasper
-PLIST_SUB+=	JP2=""
-.else
-PLIST_SUB+=	JP2="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-PLIST_SUB+=	JPEG=""
-.else
-CONFIGURE_ARGS+=--without-libjpeg
-PLIST_SUB+=	JPEG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
-PLIST_SUB+=	PNG=""
-.else
-CONFIGURE_ARGS+=--without-libpng
-PLIST_SUB+=	PNG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
-PLIST_SUB+=	TIFF=""
-.else
-CONFIGURE_ARGS+=--without-libtiff
-PLIST_SUB+=	TIFF="@comment "
-.endif
-
 post-install:
 	@cd ${WRKSRC}/docs/reference/gdk-pixbuf && gmake ${FAKE_MAKEARGS} install-man1
 

Modified: trunk/graphics/goom/Makefile
===================================================================
--- trunk/graphics/goom/Makefile	2015-03-28 09:48:30 UTC (rev 18403)
+++ trunk/graphics/goom/Makefile	2015-03-28 09:48:44 UTC (rev 18404)
@@ -2,7 +2,7 @@
 
 PORTNAME=	goom
 PORTVERSION=	2k4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}2k4/0
 DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|-|}-src
@@ -12,16 +12,16 @@
 LICENSE=	lgpl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S|.|-|}
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack 
+USES=		pathfix libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-sdltest --enable-static
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .if exists(${X11R6}/bin/xmms) || defined(WITH_XMMS)
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+=	libxmms.so:${PORTSDIR}/multimedia/xmms
 PLIST_SUB+=	XMMS=""
 .else
 PLIST_SUB+=	XMMS="@comment "

Modified: trunk/graphics/goom/distinfo
===================================================================
--- trunk/graphics/goom/distinfo	2015-03-28 09:48:30 UTC (rev 18403)
+++ trunk/graphics/goom/distinfo	2015-03-28 09:48:44 UTC (rev 18404)
@@ -1,4 +1,2 @@
-MD5 (goom-2k4-0-src.tar.gz) = 8100dd07e0c6784fdf079eeaa53a5c7f
 SHA256 (goom-2k4-0-src.tar.gz) = d993c904c05faba87fd7f159291fa1cb7aadcff2edd28454d8e967880a8a0c85
-RMD160 (goom-2k4-0-src.tar.gz) = 280c0db57f437b072a49ff80f5bf85d57892af8e
 SIZE (goom-2k4-0-src.tar.gz) = 757058

Added: trunk/graphics/goom/files/patch-src-mmx.h
===================================================================
--- trunk/graphics/goom/files/patch-src-mmx.h	                        (rev 0)
+++ trunk/graphics/goom/files/patch-src-mmx.h	2015-03-28 09:48:44 UTC (rev 18404)
@@ -0,0 +1,18 @@
+--- src/mmx.h.orig
++++ src/mmx.h
+@@ -715,13 +715,13 @@ void zoom_filter_xmmx (int prevX, int pr
+ 	{ \
+ 		printf("emms()\n"); \
+ 		__asm__ __volatile__ ("emms" \
+-                        "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \
++                        "st","st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"); \
+ 	}
+ 
+ #else
+ 
+ #define	emms() __asm__ __volatile__ ("emms"::: \
+-                      "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
++                      "st","st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)")
+ 
+ #endif
+ 


Property changes on: trunk/graphics/goom/files/patch-src-mmx.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/goom/pkg-plist
===================================================================
--- trunk/graphics/goom/pkg-plist	2015-03-28 09:48:30 UTC (rev 18403)
+++ trunk/graphics/goom/pkg-plist	2015-03-28 09:48:44 UTC (rev 18404)
@@ -11,10 +11,8 @@
 include/goom/goomsl_hash.h
 include/goom/goomsl_heap.h
 lib/libgoom2.a
-lib/libgoom2.la
 lib/libgoom2.so
 lib/libgoom2.so.0
+lib/libgoom2.so.0.0.0
 libdata/pkgconfig/libgoom2.pc
-%%XMMS%%@cwd %%X11BASE%%
 %%XMMS%%lib/xmms/Visualization/libxmmsgoom2.so
- at dirrm include/goom