Attachment 95029 Details for Bug 133317 – file.diff

[patch] file.diff

file.diff (text/plain), 13.15 KB, created by tkato432 on 2009-04-02 19:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2009-04-02 19:10:04 UTC

Size: 13.15 KB

patch

obsolete

>diff -urN /usr/ports/graphics/enfle/Makefile graphics/enfle/Makefile
>--- /usr/ports/graphics/enfle/Makefile	2008-04-20 10:14:59.000000000 +0900
>+++ graphics/enfle/Makefile	2009-03-29 03:40:48.000000000 +0900
>@@ -6,39 +6,68 @@
> #
> 
> PORTNAME=	enfle
>-PORTVERSION=	20010130
>-PORTREVISION=	4
>+PORTVERSION=	20071024
> CATEGORIES=	graphics
> MASTER_SITES=	http://enfle.fennel.org/files/stable/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Simple plugin-based graphics viewer
> 
>-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
>+BUILD_DEPENDS=	${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb
>+LIB_DEPENDS=	arc.1:${PORTSDIR}/archivers/libarc \
>+		jasper.4:${PORTSDIR}/graphics/jasper \
> 		jpeg.9:${PORTSDIR}/graphics/jpeg \
> 		mng.1:${PORTSDIR}/graphics/libmng \
> 		ungif.5:${PORTSDIR}/graphics/libungif \
>-		arc.1:${PORTSDIR}/archivers/libarc
>+		png.5:${PORTSDIR}/graphics/png \
>+		theora.0:${PORTSDIR}/multimedia/libtheora
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
>+
>+OPTIONS=	SIMD "Enable x86 SIMD (MMX/SSE)" off
> 
>-USE_XORG=	x11 xext
> USE_BZIP2=	yes
>-GNU_CONFIGURE=	yes
>-USE_PERL5_BUILD=yes
>-CONFIGURE_ARGS=	--enable-all-plugins \
>-		--enable-plugins-dir \
>-		--enable-loader=ungif \
>-		--disable-static
>+USE_XORG=	ice x11 xext xv
>+USE_GNOME=	esound
>+USE_ICONV=	yes
>+USE_GMAKE=	yes
>+USE_AUTOTOOLS=	libtool:15
>+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
>+		ac_cv_header_mpeg_h=no \
>+		ac_cv_header_libmpeg3_h=no \
>+		ac_cv_header_decore_h=no \
>+		ac_cv_header_avifile_h=no
>+CONFIGURE_ARGS=	--with-ungif --disable-avcodec
>+
>+PKGDEINSTALL=	${PKGINSTALL}
> 
>-MAN1=		enfle.1
>+CPPFLAGS=	-I${LOCALBASE}/include
>+LDFLAGS=	-L${LOCALBASE}/lib
> 
> .include <bsd.port.pre.mk>
> 
>+.if ${ARCH} == "i386"
>+CONFIGURE_ARGS+=	--enable-spi --enable-dmo
>+.if !defined(WITH_SIMD)
>+CONFIGURE_ARGS+=	--disable-mmx --disable-sse
>+.endif
>+.endif
>+
> post-patch:
>-	${PERL} -pi -e 's/^(.*_la_LDFLAGS = -module)$$/\1 -avoid-version/' \
>-		${WRKSRC}/plugins/*/*/Makefile.in
>-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/ltconfig
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/local/|${LOCALBASE}/|g ; \
>+		 s|/usr/X11R6/|${LOCALBASE}/|g ; \
>+		 /LIB/s|-lpthread|${PTHREAD_LIBS}|g ; \
>+		 /LIB/s|-lc_r|${PTHREAD_LIBS}|g ; \
>+		 /CFLAGS/s|-pthread|${PTHREAD_CFLAGS}|g ; \
>+		 /LIB/s|-ldl||g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		'/enfle -N/s|^|#|g' ${WRKSRC}/src/Makefile.in
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/share/X11|${LOCALBASE}/lib/X11|g ; \
>+		 /X11R6/d' ${WRKSRC}/plugins/loader/xpm/xpm.c
> 
> post-install:
>-	${INSTALL_MAN} ${WRKSRC}/enfle.1 ${PREFIX}/man/man1
>+	@${SETENV} PKG_PREFIX="${PREFIX}" \
>+		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/graphics/enfle/distinfo graphics/enfle/distinfo
>--- /usr/ports/graphics/enfle/distinfo	2006-01-22 22:05:17.000000000 +0900
>+++ graphics/enfle/distinfo	2009-03-28 14:58:45.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (enfle-20010130.tar.bz2) = b9095756d7d7e7294686750c47d334ed
>-SHA256 (enfle-20010130.tar.bz2) = f353dc35815cb529ead832ebb0e8f364b339e2cc218f34dd520d195df00735c2
>-SIZE (enfle-20010130.tar.bz2) = 240290
>+MD5 (enfle-20071024.tar.bz2) = 947de0d1dcc143e8f19ccace8ecfff0e
>+SHA256 (enfle-20071024.tar.bz2) = 093381d78bb1c9551ec74c5aba954e215babadb99a7247d86c7af05f5cfb1207
>+SIZE (enfle-20071024.tar.bz2) = 2284883
>diff -urN /usr/ports/graphics/enfle/files/patch-browseaction.h graphics/enfle/files/patch-browseaction.h
>--- /usr/ports/graphics/enfle/files/patch-browseaction.h	2003-12-05 15:39:12.000000000 +0900
>+++ graphics/enfle/files/patch-browseaction.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- browseaction.h.orig	Wed Jun 28 03:19:49 2000
>-+++ browseaction.h	Fri Dec  5 15:35:56 2003
>-@@ -29,7 +29,7 @@
>- 
>- int browseaction_initialize(Hash *);
>- 
>--#define DECLARE_BROWSEACTION(name) Event browseaction_ ## name ## (Info *, Binfo *, Image *, Dlist_data *)
>-+#define DECLARE_BROWSEACTION(name) Event browseaction_ ## name (Info *, Binfo *, Image *, Dlist_data *)
>- DECLARE_BROWSEACTION(delete);
>- DECLARE_BROWSEACTION(quit);
>- DECLARE_BROWSEACTION(flip_vertical);
>diff -urN /usr/ports/graphics/enfle/files/patch-image.c graphics/enfle/files/patch-image.c
>--- /usr/ports/graphics/enfle/files/patch-image.c	2004-08-22 22:33:50.000000000 +0900
>+++ graphics/enfle/files/patch-image.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,14 +0,0 @@
>-
>-$FreeBSD: ports/graphics/enfle/files/patch-image.c,v 1.1 2004/08/22 13:33:50 krion Exp $
>-
>---- image.c.orig	Sun Aug 22 15:26:48 2004
>-+++ image.c	Sun Aug 22 15:26:58 2004
>-@@ -292,7 +292,7 @@
>-     default:
>-       fprintf(stderr, "Unimplemented method: %d to %d\n", p->type, to);
>-     }
>--  default:
>-+  default: break;
>-     /* ignored */
>-   }
>- 
>diff -urN /usr/ports/graphics/enfle/files/patch-render.c graphics/enfle/files/patch-render.c
>--- /usr/ports/graphics/enfle/files/patch-render.c	2004-08-22 22:33:50.000000000 +0900
>+++ graphics/enfle/files/patch-render.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,14 +0,0 @@
>-
>-$FreeBSD: ports/graphics/enfle/files/patch-render.c,v 1.1 2004/08/22 13:33:50 krion Exp $
>-
>---- render.c.orig	Sun Aug 22 15:27:18 2004
>-+++ render.c	Sun Aug 22 15:27:28 2004
>-@@ -148,7 +148,7 @@
>- 	exit(1);
>-       }
>-       break;
>--    default:
>-+    default: break;
>-     }
>-   } else {
>-     if (p->ncolors > 256) {
>diff -urN /usr/ports/graphics/enfle/pkg-descr graphics/enfle/pkg-descr
>--- /usr/ports/graphics/enfle/pkg-descr	2000-12-11 12:08:18.000000000 +0900
>+++ graphics/enfle/pkg-descr	2009-03-29 01:35:34.000000000 +0900
>@@ -14,7 +14,6 @@
> supported formats.
> 
> WWW: http://enfle.fennel.org/
>-WWW: http://www3.big.or.jp/~sian/linux/products/enfle/
> 
> -- 
> Yuki Sawada <samy@goldmoon.org>
>diff -urN /usr/ports/graphics/enfle/pkg-install graphics/enfle/pkg-install
>--- /usr/ports/graphics/enfle/pkg-install	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/enfle/pkg-install	2009-03-28 21:19:25.000000000 +0900
>@@ -0,0 +1,7 @@
>+#!/bin/sh
>+
>+if [ "$2" = "POST-INSTALL" ]; then
>+  ENFLE_PLUGINDIR=${PKG_PREFIX}/lib/enfle/plugins ${PKG_PREFIX}/bin/enfle -N
>+elif [ "$2" = "DEINSTALL" ]; then
>+  rm -f ${PKG_PREFIX}/lib/enfle/plugins/.cache
>+fi
>diff -urN /usr/ports/graphics/enfle/pkg-plist graphics/enfle/pkg-plist
>--- /usr/ports/graphics/enfle/pkg-plist	2006-02-24 00:39:29.000000000 +0900
>+++ graphics/enfle/pkg-plist	2009-03-28 21:13:29.000000000 +0900
>@@ -1,58 +1,137 @@
> bin/enfle
>-lib/enfle/plugins/archiver/archiver_bz2.la
>-lib/enfle/plugins/archiver/archiver_bz2.so
>-lib/enfle/plugins/archiver/archiver_dri.la
>-lib/enfle/plugins/archiver/archiver_dri.so
>-lib/enfle/plugins/archiver/archiver_exe.la
>-lib/enfle/plugins/archiver/archiver_exe.so
>-lib/enfle/plugins/archiver/archiver_gz.la
>-lib/enfle/plugins/archiver/archiver_gz.so
>-lib/enfle/plugins/archiver/archiver_libarc.la
>-lib/enfle/plugins/archiver/archiver_libarc.so
>-lib/enfle/plugins/archiver/archiver_misc.la
>-lib/enfle/plugins/archiver/archiver_misc.so
>-lib/enfle/plugins/archiver/archiver_one.la
>-lib/enfle/plugins/archiver/archiver_one.so
>-lib/enfle/plugins/archiver/archiver_pak.la
>-lib/enfle/plugins/archiver/archiver_pak.so
>+lib/enfle/plugins/archiver/archiver_arc.a
>+lib/enfle/plugins/archiver/archiver_arc.la
>+lib/enfle/plugins/archiver/archiver_arc.so
>+lib/enfle/plugins/archiver/archiver_rar.a
>+lib/enfle/plugins/archiver/archiver_rar.la
>+lib/enfle/plugins/archiver/archiver_rar.so
>+lib/enfle/plugins/archiver/archiver_tar.a
> lib/enfle/plugins/archiver/archiver_tar.la
> lib/enfle/plugins/archiver/archiver_tar.so
>-lib/enfle/plugins/loader/loader_ald.la
>-lib/enfle/plugins/loader/loader_ald.so
>+lib/enfle/plugins/audio/audio_esd.a
>+lib/enfle/plugins/audio/audio_esd.la
>+lib/enfle/plugins/audio/audio_esd.so
>+lib/enfle/plugins/audio/audio_oss.a
>+lib/enfle/plugins/audio/audio_oss.la
>+lib/enfle/plugins/audio/audio_oss.so
>+lib/enfle/plugins/audiodecoder/audiodecoder_mad.a
>+lib/enfle/plugins/audiodecoder/audiodecoder_mad.la
>+lib/enfle/plugins/audiodecoder/audiodecoder_mad.so
>+lib/enfle/plugins/audiodecoder/audiodecoder_mpglib.a
>+lib/enfle/plugins/audiodecoder/audiodecoder_mpglib.la
>+lib/enfle/plugins/audiodecoder/audiodecoder_mpglib.so
>+lib/enfle/plugins/audiodecoder/audiodecoder_vorbis.a
>+lib/enfle/plugins/audiodecoder/audiodecoder_vorbis.la
>+lib/enfle/plugins/audiodecoder/audiodecoder_vorbis.so
>+lib/enfle/plugins/demultiplexer/demultiplexer_avi.a
>+lib/enfle/plugins/demultiplexer/demultiplexer_avi.la
>+lib/enfle/plugins/demultiplexer/demultiplexer_avi.so
>+lib/enfle/plugins/demultiplexer/demultiplexer_mp3.a
>+lib/enfle/plugins/demultiplexer/demultiplexer_mp3.la
>+lib/enfle/plugins/demultiplexer/demultiplexer_mp3.so
>+lib/enfle/plugins/demultiplexer/demultiplexer_mpeg.a
>+lib/enfle/plugins/demultiplexer/demultiplexer_mpeg.la
>+lib/enfle/plugins/demultiplexer/demultiplexer_mpeg.so
>+lib/enfle/plugins/demultiplexer/demultiplexer_ogg.a
>+lib/enfle/plugins/demultiplexer/demultiplexer_ogg.la
>+lib/enfle/plugins/demultiplexer/demultiplexer_ogg.so
>+lib/enfle/plugins/effect/effect_gamma.a
>+lib/enfle/plugins/effect/effect_gamma.la
>+lib/enfle/plugins/effect/effect_gamma.so
>+lib/enfle/plugins/effect/effect_rotate.a
>+lib/enfle/plugins/effect/effect_rotate.la
>+lib/enfle/plugins/effect/effect_rotate.so
>+lib/enfle/plugins/loader/loader_bmp.a
> lib/enfle/plugins/loader/loader_bmp.la
> lib/enfle/plugins/loader/loader_bmp.so
>-lib/enfle/plugins/loader/loader_grp.la
>-lib/enfle/plugins/loader/loader_grp.so
>+lib/enfle/plugins/loader/loader_gif.a
>+lib/enfle/plugins/loader/loader_gif.la
>+lib/enfle/plugins/loader/loader_gif.so
>+lib/enfle/plugins/loader/loader_j2k.a
>+lib/enfle/plugins/loader/loader_j2k.la
>+lib/enfle/plugins/loader/loader_j2k.so
>+lib/enfle/plugins/loader/loader_jasper.a
>+lib/enfle/plugins/loader/loader_jasper.la
>+lib/enfle/plugins/loader/loader_jasper.so
>+lib/enfle/plugins/loader/loader_jpeg.a
> lib/enfle/plugins/loader/loader_jpeg.la
> lib/enfle/plugins/loader/loader_jpeg.so
>-lib/enfle/plugins/loader/loader_lfg.la
>-lib/enfle/plugins/loader/loader_lfg.so
>-lib/enfle/plugins/loader/loader_mag.la
>-lib/enfle/plugins/loader/loader_mag.so
>-lib/enfle/plugins/loader/loader_mng.la
>-lib/enfle/plugins/loader/loader_mng.so
>-lib/enfle/plugins/loader/loader_p2.la
>-lib/enfle/plugins/loader/loader_p2.so
>-lib/enfle/plugins/loader/loader_pic.la
>-lib/enfle/plugins/loader/loader_pic.so
>+lib/enfle/plugins/loader/loader_pcx.a
>+lib/enfle/plugins/loader/loader_pcx.la
>+lib/enfle/plugins/loader/loader_pcx.so
>+lib/enfle/plugins/loader/loader_png.a
> lib/enfle/plugins/loader/loader_png.la
> lib/enfle/plugins/loader/loader_png.so
>+lib/enfle/plugins/loader/loader_pnm.a
> lib/enfle/plugins/loader/loader_pnm.la
> lib/enfle/plugins/loader/loader_pnm.so
>+lib/enfle/plugins/loader/loader_tga.a
>+lib/enfle/plugins/loader/loader_tga.la
>+lib/enfle/plugins/loader/loader_tga.so
>+lib/enfle/plugins/loader/loader_ungif.a
> lib/enfle/plugins/loader/loader_ungif.la
> lib/enfle/plugins/loader/loader_ungif.so
>+lib/enfle/plugins/loader/loader_xbm.a
> lib/enfle/plugins/loader/loader_xbm.la
> lib/enfle/plugins/loader/loader_xbm.so
>+lib/enfle/plugins/loader/loader_xpm.a
> lib/enfle/plugins/loader/loader_xpm.la
> lib/enfle/plugins/loader/loader_xpm.so
>+lib/enfle/plugins/player/player_generic.a
>+lib/enfle/plugins/player/player_generic.la
>+lib/enfle/plugins/player/player_generic.so
>+lib/enfle/plugins/player/player_mng.a
>+lib/enfle/plugins/player/player_mng.la
>+lib/enfle/plugins/player/player_mng.so
>+lib/enfle/plugins/player/player_mpglib.a
>+lib/enfle/plugins/player/player_mpglib.la
>+lib/enfle/plugins/player/player_mpglib.so
>+lib/enfle/plugins/player/player_ungif.a
>+lib/enfle/plugins/player/player_ungif.la
>+lib/enfle/plugins/player/player_ungif.so
>+lib/enfle/plugins/saver/saver_jpeg.a
> lib/enfle/plugins/saver/saver_jpeg.la
> lib/enfle/plugins/saver/saver_jpeg.so
>-lib/enfle/plugins/saver/saver_pms.la
>-lib/enfle/plugins/saver/saver_pms.so
>+lib/enfle/plugins/saver/saver_png.a
> lib/enfle/plugins/saver/saver_png.la
> lib/enfle/plugins/saver/saver_png.so
>-@dirrm lib/enfle/plugins/archiver
>-@dirrm lib/enfle/plugins/loader
>+lib/enfle/plugins/streamer/streamer_bz2.a
>+lib/enfle/plugins/streamer/streamer_bz2.la
>+lib/enfle/plugins/streamer/streamer_bz2.so
>+lib/enfle/plugins/streamer/streamer_gz.a
>+lib/enfle/plugins/streamer/streamer_gz.la
>+lib/enfle/plugins/streamer/streamer_gz.so
>+lib/enfle/plugins/ui/ui_convert.a
>+lib/enfle/plugins/ui/ui_convert.la
>+lib/enfle/plugins/ui/ui_convert.so
>+lib/enfle/plugins/ui/ui_normal.a
>+lib/enfle/plugins/ui/ui_normal.la
>+lib/enfle/plugins/ui/ui_normal.so
>+lib/enfle/plugins/ui/ui_wallpaper.a
>+lib/enfle/plugins/ui/ui_wallpaper.la
>+lib/enfle/plugins/ui/ui_wallpaper.so
>+lib/enfle/plugins/video/video_Xlib.a
>+lib/enfle/plugins/video/video_Xlib.la
>+lib/enfle/plugins/video/video_Xlib.so
>+lib/enfle/plugins/videodecoder/videodecoder_libmpeg2.a
>+lib/enfle/plugins/videodecoder/videodecoder_libmpeg2.la
>+lib/enfle/plugins/videodecoder/videodecoder_libmpeg2.so
>+lib/enfle/plugins/videodecoder/videodecoder_raw.a
>+lib/enfle/plugins/videodecoder/videodecoder_raw.la
>+lib/enfle/plugins/videodecoder/videodecoder_raw.so
>+%%DATADIR%%/enfle.rc
>+@dirrm %%DATADIR%%
>+@dirrm lib/enfle/plugins/videodecoder
>+@dirrm lib/enfle/plugins/video
>+@dirrm lib/enfle/plugins/ui
>+@dirrm lib/enfle/plugins/streamer
> @dirrm lib/enfle/plugins/saver
>+@dirrm lib/enfle/plugins/player
>+@dirrm lib/enfle/plugins/loader
>+@dirrm lib/enfle/plugins/effect
>+@dirrm lib/enfle/plugins/demultiplexer
>+@dirrm lib/enfle/plugins/audiodecoder
>+@dirrm lib/enfle/plugins/audio
>+@dirrm lib/enfle/plugins/archiver
> @dirrm lib/enfle/plugins
> @dirrm lib/enfle

Actions: View | Diff

Attachments on bug 133317: 95029