6 files changed, 53 insertions, 36 deletions

diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index 74ab95774bcd..2589b49224f7 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -1,25 +1,28 @@
 # New ports collection makefile for:	enfle
 # Date created:		Tue Sep 28 02:25:17 JST 1999
-# Whom:			Yuuki SAWADA <yuuki@goldmoon.org>
+# Whom:			Yuki Sawada <samy@goldmoon.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	enfle
-PORTVERSION=	20000422
+PORTVERSION=	20000615
 CATEGORIES=	graphics
 MASTER_SITES=	http://enfle.fennel.org/ \
+		http://www3.big.or.jp/~sian/linux/products/enfle/ \
 		ftp://ftp.goldmoon.org/pub/FreeBSD/ports/distfiles/
 
-MAINTAINER=	yuuki@goldmoon.org
+MAINTAINER=	samy@goldmoon.org
 
 LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		bz2.1:${PORTSDIR}/archivers/bzip2 \
+		arc.1:${PORTSDIR}/archivers/libarc
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--enable-all-plugins \
 		--enable-plugins-dir \
 		--enable-archiver="-libarc" \
diff --git a/graphics/enfle/distinfo b/graphics/enfle/distinfo
index 057740a30de2..cc9948f096c2 100644
--- a/graphics/enfle/distinfo
+++ b/graphics/enfle/distinfo
@@ -1 +1 @@
-MD5 (enfle-20000422.tar.bz2) = 3887bd2b346ae72ebcc25289f32f5c17
+MD5 (enfle-20000615.tar.bz2) = 1f299eaf08ceded4ebeec4c0c2e371fe
diff --git a/graphics/enfle/files/patch-aa b/graphics/enfle/files/patch-aa
index fe40651fe3af..1e4afd9951f6 100644
--- a/graphics/enfle/files/patch-aa
+++ b/graphics/enfle/files/patch-aa
@@ -64,14 +64,25 @@
  libdir = @Plugins_archiver_dir@
  LIBS = 
  
---- plugins/archiver/libarc/Makefile.in.orig	Tue Jan 25 10:05:17 2000
-+++ plugins/archiver/libarc/Makefile.in	Wed Jan 26 11:15:57 2000
+--- plugins/archiver/libarc/Makefile.in.orig	Mon May 29 04:36:52 2000
++++ plugins/archiver/libarc/Makefile.in	Wed Jun  7 23:35:42 2000
 @@ -90,7 +90,7 @@
  saver_dirs = @saver_dirs@
  
- lib_LTLIBRARIES = libarc.la
--libarc_la_LDFLAGS = -module
-+libarc_la_LDFLAGS = -module -version-info 1:0:0
+ lib_LTLIBRARIES = archiver_libarc.la
+-archiver_libarc_la_LDFLAGS = -module
++archiver_libarc_la_LDFLAGS = -module -version-info 1:0:0
  libdir = @Plugins_archiver_dir@
  LIBS = -larc
  
+--- plugins/archiver/exe/Makefile.in.orig	Mon May 29 04:36:50 2000
++++ plugins/archiver/exe/Makefile.in	Wed Jun  7 23:40:37 2000
+@@ -90,7 +90,7 @@
+ saver_dirs = @saver_dirs@
+ 
+ lib_LTLIBRARIES = archiver_exe.la
+-archiver_exe_la_LDFLAGS = -module
++archiver_exe_la_LDFLAGS = -module -version-info 1:0:0
+ libdir = @Plugins_archiver_dir@
+ LIBS = 
+ 
diff --git a/graphics/enfle/files/patch-ab b/graphics/enfle/files/patch-ab
index c18f8075ebb7..22224bdffc0b 100644
--- a/graphics/enfle/files/patch-ab
+++ b/graphics/enfle/files/patch-ab
@@ -119,3 +119,14 @@
  libdir = @Plugins_loader_dir@
  LIBS = 
  
+--- plugins/loader/p2/Makefile.in.orig	Mon May 29 04:36:40 2000
++++ plugins/loader/p2/Makefile.in	Wed Jun  7 23:41:10 2000
+@@ -90,7 +90,7 @@
+ saver_dirs = @saver_dirs@
+ 
+ lib_LTLIBRARIES = loader_p2.la
+-loader_p2_la_LDFLAGS = -module
++loader_p2_la_LDFLAGS = -module -version-info 1:0:0
+ libdir = @Plugins_loader_dir@
+ LIBS = 
+ 
diff --git a/graphics/enfle/pkg-descr b/graphics/enfle/pkg-descr
index d95bd7d2e714..8e77a6962add 100644
--- a/graphics/enfle/pkg-descr
+++ b/graphics/enfle/pkg-descr
@@ -1,16 +1,19 @@
     This program aims to view many variously formated pictures
 easily. So far, it can treat below formats:
 
-    - Archiver: BZ2 DRI GZ LIBARC (requires libarc) MISC PAK TAR
-    - Loader: ALD BMP GRP JPEG LFG MAG PIC PNG PNM XMB XPM
-    - Saver: JPEG PMS PNG
-   
-    It has been implemented plugin mechanism so that each user
+  - archivers: bz2 exe dri gz libarc(*) misc pak tar
+  - loaders: ald bmp grp jpeg lfg mag pic p2 png pms pnm xmb xpm
+  - savers: jpeg pms png
+
+    (*) libarc plug-in requires libarc library, so default is no.
+
+    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.
 
 WWW: http://enfle.fennel.org/
+WWW: http://www3.big.or.jp/~sian/linux/products/enfle/
 
 -- 
-Yuuki SAWADA <yuuki@goldmoon.org>
+Yuki Sawada <samy@goldmoon.org>
diff --git a/graphics/enfle/pkg-plist b/graphics/enfle/pkg-plist
index 67ec655171b6..a7d5043f4908 100644
--- a/graphics/enfle/pkg-plist
+++ b/graphics/enfle/pkg-plist
@@ -1,59 +1,48 @@
 bin/enfle
-lib/enfle/plugins/archiver/archiver_dri.la
+lib/enfle/plugins/archiver/archiver_bz2.so
+lib/enfle/plugins/archiver/archiver_bz2.so.1
 lib/enfle/plugins/archiver/archiver_dri.so
 lib/enfle/plugins/archiver/archiver_dri.so.1
-lib/enfle/plugins/archiver/archiver_gz.la
+lib/enfle/plugins/archiver/archiver_exe.so
+lib/enfle/plugins/archiver/archiver_exe.so.1
 lib/enfle/plugins/archiver/archiver_gz.so
 lib/enfle/plugins/archiver/archiver_gz.so.1
-lib/enfle/plugins/archiver/archiver_misc.la
+lib/enfle/plugins/archiver/archiver_libarc.so
+lib/enfle/plugins/archiver/archiver_libarc.so.1
 lib/enfle/plugins/archiver/archiver_misc.so
 lib/enfle/plugins/archiver/archiver_misc.so.1
-lib/enfle/plugins/archiver/archiver_pak.la
 lib/enfle/plugins/archiver/archiver_pak.so
 lib/enfle/plugins/archiver/archiver_pak.so.1
-lib/enfle/plugins/archiver/archiver_tar.la
 lib/enfle/plugins/archiver/archiver_tar.so
 lib/enfle/plugins/archiver/archiver_tar.so.1
-lib/enfle/plugins/loader/loader_ald.la
 lib/enfle/plugins/loader/loader_ald.so
 lib/enfle/plugins/loader/loader_ald.so.1
-lib/enfle/plugins/loader/loader_bmp.la
 lib/enfle/plugins/loader/loader_bmp.so
 lib/enfle/plugins/loader/loader_bmp.so.1
-lib/enfle/plugins/loader/loader_grp.la
 lib/enfle/plugins/loader/loader_grp.so
 lib/enfle/plugins/loader/loader_grp.so.1
-lib/enfle/plugins/loader/loader_jpeg.la
 lib/enfle/plugins/loader/loader_jpeg.so
 lib/enfle/plugins/loader/loader_jpeg.so.1
-lib/enfle/plugins/loader/loader_lfg.la
 lib/enfle/plugins/loader/loader_lfg.so
 lib/enfle/plugins/loader/loader_lfg.so.1
-lib/enfle/plugins/loader/loader_mag.la
 lib/enfle/plugins/loader/loader_mag.so
 lib/enfle/plugins/loader/loader_mag.so.1
-lib/enfle/plugins/loader/loader_pic.la
+lib/enfle/plugins/loader/loader_p2.so
+lib/enfle/plugins/loader/loader_p2.so.1
 lib/enfle/plugins/loader/loader_pic.so
 lib/enfle/plugins/loader/loader_pic.so.1
-lib/enfle/plugins/loader/loader_png.la
 lib/enfle/plugins/loader/loader_png.so
 lib/enfle/plugins/loader/loader_png.so.1
-lib/enfle/plugins/loader/loader_pnm.la
 lib/enfle/plugins/loader/loader_pnm.so
 lib/enfle/plugins/loader/loader_pnm.so.1
-lib/enfle/plugins/loader/loader_xbm.la
 lib/enfle/plugins/loader/loader_xbm.so
 lib/enfle/plugins/loader/loader_xbm.so.1
-lib/enfle/plugins/loader/loader_xpm.la
 lib/enfle/plugins/loader/loader_xpm.so
 lib/enfle/plugins/loader/loader_xpm.so.1
-lib/enfle/plugins/saver/saver_jpeg.la
 lib/enfle/plugins/saver/saver_jpeg.so
 lib/enfle/plugins/saver/saver_jpeg.so.1
-lib/enfle/plugins/saver/saver_pms.la
 lib/enfle/plugins/saver/saver_pms.so
 lib/enfle/plugins/saver/saver_pms.so.1
-lib/enfle/plugins/saver/saver_png.la
 lib/enfle/plugins/saver/saver_png.so
 lib/enfle/plugins/saver/saver_png.so.1
 @dirrm lib/enfle/plugins/archiver