- Update to version 20071024

PR:		133317
Submitted by:	ports fury

8 files changed, 199 insertions, 110 deletions

diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index 73e642ee8f09..2408538ebd0a 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -6,39 +6,85 @@
 #
 
 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
+
+.if ${OSVERSION} < 700000
+PLIST_SUB+=	DISABLED="@comment "
+.else
+PLIST_SUB+=	DISABLED=""
+.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
+	@${REINPLACE_CMD} -e \
+		's|arciver_|archiver_|g' ${WRKSRC}/plugins/archiver/rar/unrar.c
+.if ${OSVERSION} < 700000
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|effect|| ; \
+		 /^SUBDIRS/s|audiodecoder|| ; \
+		 /^SUBDIRS/s|videodecoder|| ; \
+		 /^SUBDIRS/s|demultiplexer||' ${WRKSRC}/plugins/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|tar||' ${WRKSRC}/plugins/archiver/Makefile.in
+.endif
 
 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 --git a/graphics/enfle/distinfo b/graphics/enfle/distinfo
index 369bafa6205e..623396e908b8 100644
--- a/graphics/enfle/distinfo
+++ b/graphics/enfle/distinfo
@@ -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 --git a/graphics/enfle/files/patch-browseaction.h b/graphics/enfle/files/patch-browseaction.h
deleted file mode 100644
index 039ff5a47220..000000000000
--- a/graphics/enfle/files/patch-browseaction.h
+++ /dev/null
@@ -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 --git a/graphics/enfle/files/patch-image.c b/graphics/enfle/files/patch-image.c
deleted file mode 100644
index 44b9cc50e1e7..000000000000
--- a/graphics/enfle/files/patch-image.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 --git a/graphics/enfle/files/patch-render.c b/graphics/enfle/files/patch-render.c
deleted file mode 100644
index c0ad7b93b897..000000000000
--- a/graphics/enfle/files/patch-render.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 --git a/graphics/enfle/pkg-descr b/graphics/enfle/pkg-descr
index ca89ff2e9a2d..9f7102d42496 100644
--- a/graphics/enfle/pkg-descr
+++ b/graphics/enfle/pkg-descr
@@ -1,20 +1,16 @@
-    This program aims to view many variously formated pictures
-easily. So far, it can treat below formats:
+This software aims to view many pictures just clicking.  You can view
+various formatted pictures and movies with several effects.
 
-  - archivers:
-      bz2 dri exe gz (libarc) misc one pak tar
-  - loaders:
-      ald bmp grp jpeg lfg mag (mng) p2 pic pms png pnm (ungif) xbm xpm
-  - savers:
-      jpeg pms png
+ Formats you can view:
+  BMP, GIF, JPEG, PCX, PNG, PNM, XBM, XPM, TGA, JPEG2000
+  spi(highly unstable, any formats which (some of) susie plugins support)
+  animated GIF
+  mng
+  mpeg (mpeg1, mpeg2)
+  avi,ogg,ogm(,asf,wmv) (codec supported by avcodec, vorbis, Windows DMO)
 
-    It has been implemented plug-in mechanism so that each user
-can choose each format support linked in main program or separated
-as plugin. Moreover, you can make your own plugins to extend
-supported formats.
+This software has plugin architecture.  You can write plugins to loader
+new formatted pictures and movies.  Also, you can read regular archive
+files, such as tar, gz, bz2, and so on.
 
 WWW: http://enfle.fennel.org/
-WWW: http://www3.big.or.jp/~sian/linux/products/enfle/
-
--- 
-Yuki Sawada <samy@goldmoon.org>
diff --git a/graphics/enfle/pkg-install b/graphics/enfle/pkg-install
new file mode 100644
index 000000000000..9d3e4fc3b6b0
--- /dev/null
+++ b/graphics/enfle/pkg-install
@@ -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 --git a/graphics/enfle/pkg-plist b/graphics/enfle/pkg-plist
index 1e7538adbd0f..e8f5fc195406 100644
--- a/graphics/enfle/pkg-plist
+++ b/graphics/enfle/pkg-plist
@@ -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_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/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
+%%DISABLED%%lib/enfle/plugins/archiver/archiver_tar.a
+%%DISABLED%%lib/enfle/plugins/archiver/archiver_tar.la
+%%DISABLED%%lib/enfle/plugins/archiver/archiver_tar.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
+%%DISABLED%%lib/enfle/plugins/audiodecoder/audiodecoder_mad.a
+%%DISABLED%%lib/enfle/plugins/audiodecoder/audiodecoder_mad.la
+%%DISABLED%%lib/enfle/plugins/audiodecoder/audiodecoder_mad.so
+%%DISABLED%%lib/enfle/plugins/audiodecoder/audiodecoder_mpglib.a
+%%DISABLED%%lib/enfle/plugins/audiodecoder/audiodecoder_mpglib.la
+%%DISABLED%%lib/enfle/plugins/audiodecoder/audiodecoder_mpglib.so
+%%DISABLED%%lib/enfle/plugins/audiodecoder/audiodecoder_vorbis.a
+%%DISABLED%%lib/enfle/plugins/audiodecoder/audiodecoder_vorbis.la
+%%DISABLED%%lib/enfle/plugins/audiodecoder/audiodecoder_vorbis.so
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_avi.a
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_avi.la
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_avi.so
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_mp3.a
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_mp3.la
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_mp3.so
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_mpeg.a
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_mpeg.la
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_mpeg.so
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_ogg.a
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_ogg.la
+%%DISABLED%%lib/enfle/plugins/demultiplexer/demultiplexer_ogg.so
+%%DISABLED%%lib/enfle/plugins/effect/effect_gamma.a
+%%DISABLED%%lib/enfle/plugins/effect/effect_gamma.la
+%%DISABLED%%lib/enfle/plugins/effect/effect_gamma.so
+%%DISABLED%%lib/enfle/plugins/effect/effect_rotate.a
+%%DISABLED%%lib/enfle/plugins/effect/effect_rotate.la
+%%DISABLED%%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
+%%DISABLED%%lib/enfle/plugins/videodecoder/videodecoder_libmpeg2.a
+%%DISABLED%%lib/enfle/plugins/videodecoder/videodecoder_libmpeg2.la
+%%DISABLED%%lib/enfle/plugins/videodecoder/videodecoder_libmpeg2.so
+%%DISABLED%%lib/enfle/plugins/videodecoder/videodecoder_raw.a
+%%DISABLED%%lib/enfle/plugins/videodecoder/videodecoder_raw.la
+%%DISABLED%%lib/enfle/plugins/videodecoder/videodecoder_raw.so
+%%DATADIR%%/enfle.rc
+@dirrm %%DATADIR%%
+%%DISABLED%%@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
+%%DISABLED%%@dirrm lib/enfle/plugins/effect
+%%DISABLED%%@dirrm lib/enfle/plugins/demultiplexer
+%%DISABLED%%@dirrm lib/enfle/plugins/audiodecoder
+@dirrm lib/enfle/plugins/audio
+@dirrm lib/enfle/plugins/archiver
 @dirrm lib/enfle/plugins
 @dirrm lib/enfle