7 files changed, 52 insertions, 68 deletions

diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile
index 054868eb6662..be8647e76eac 100644
--- a/graphics/ida/Makefile
+++ b/graphics/ida/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	ida
-PORTVERSION=	0.21
-PORTREVISION=	6
+PORTVERSION=	2.07
 CATEGORIES=	graphics
 MASTER_SITES=	http://dl.bytesex.org/releases/fbida/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+DISTNAME=	fbida-${PORTVERSION}
 
 MAINTAINER=	anray@FreeBSD.org
 COMMENT=	Small and fast motif-based image viewer and editor
@@ -27,7 +26,7 @@ USE_PERL5_BUILD=yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 MAKEFILE=	${WRKSRC}/GNUmakefile
 
-MAN1=		ida.1
+MAN1=		exiftran.1 ida.1
 PORTDOCS=	README TODO INSTALL
 
 PLIST_FILES=	bin/exiftran bin/ida lib/X11/app-defaults/Ida
diff --git a/graphics/ida/distinfo b/graphics/ida/distinfo
index e1e3ee11cdec..41351962fc65 100644
--- a/graphics/ida/distinfo
+++ b/graphics/ida/distinfo
@@ -1,3 +1,3 @@
-MD5 (ida_0.21.tar.gz) = 7a6eeb587508a8b333a7102beeb9a544
-SHA256 (ida_0.21.tar.gz) = 57c82d4c3df90c4a261e4f1129c72717f141a325a8d89cf420409698fcf685ad
-SIZE (ida_0.21.tar.gz) = 178043
+MD5 (fbida-2.07.tar.gz) = 3e05910fb7c1d9b2bd3e272d96db069c
+SHA256 (fbida-2.07.tar.gz) = 6510dee7c4f45cb63094d540e66aa39d53215c59f46944b8bb050c26b71bdb44
+SIZE (fbida-2.07.tar.gz) = 213622
diff --git a/graphics/ida/files/patch-GNUmakefile b/graphics/ida/files/patch-GNUmakefile
index 95694de9af38..cae5c7832a3c 100644
--- a/graphics/ida/files/patch-GNUmakefile
+++ b/graphics/ida/files/patch-GNUmakefile
@@ -1,13 +1,13 @@
---- GNUmakefile.old	Fri Aug 20 18:02:55 2004
-+++ GNUmakefile	Fri Aug 20 18:03:28 2004
-@@ -11,8 +11,8 @@
- LDLIBS	+= -lm
+--- GNUmakefile.orig	2009-05-24 18:44:13.000000000 +0300
++++ GNUmakefile	2009-05-24 18:44:49.000000000 +0300
+@@ -130,8 +130,8 @@
+ OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS)
  
  # for X11 + Motif
--CFLAGS	+= -I/usr/X11R6/include
--LDFLAGS	+= -L/usr/X11R6/$(LIB)
-+CFLAGS	+= -I$(LOCALBASE)/include
-+LDFLAGS	+= -L$(LOCALBASE)/$(LIB)
- LDLIBS	+= -lXm -lXpm -lXt -lXext -lX11
+-ida : CFLAGS	+= -I/usr/X11R6/include
+-ida : LDFLAGS	+= -L/usr/X11R6/$(LIB)
++ida : CFLAGS	+= -I$(LOCALBASE)/include
++ida : LDFLAGS	+= -L$(LOCALBASE)/$(LIB)
+ ida : LDLIBS	+= -lXm -lXpm -lXt -lXext -lX11
  
- # RegEdit.c is good old K&R ...
+ # jpeg/exif libs
diff --git a/graphics/ida/files/patch-desktop.c b/graphics/ida/files/patch-desktop.c
new file mode 100644
index 000000000000..b5ac71395640
--- /dev/null
+++ b/graphics/ida/files/patch-desktop.c
@@ -0,0 +1,11 @@
+--- desktop.c.orig	2009-05-24 18:56:39.000000000 +0300
++++ desktop.c	2009-05-24 18:56:44.000000000 +0300
+@@ -26,7 +26,7 @@
+ /* desktop files are in utf-8                                                */
+ 
+ static int iconv_string(char *to, char *from,
+-			char *src, char *dst, size_t max)
++			const char *src, char *dst, size_t max)
+ {
+     size_t ilen = strlen(src);
+     size_t olen = max-1;
diff --git a/graphics/ida/files/patch-exiftran.c b/graphics/ida/files/patch-exiftran.c
deleted file mode 100644
index dff100845a8a..000000000000
--- a/graphics/ida/files/patch-exiftran.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- exiftran.c.orig	Tue Dec 23 19:40:41 2003
-+++ exiftran.c	Tue Aug  2 11:38:18 2005
-@@ -22,7 +22,8 @@
- #ifdef HAVE_LIBEXIF
- static void dump_exif(FILE *out, ExifData *ed)
- {
--    const char *title, *value;
-+    const char *title;
-+    char value[1024];
-     ExifEntry  *ee;
-     int tag,i;
- 
-@@ -35,7 +36,7 @@
- 	    ee = exif_content_get_entry (ed->ifd[i], tag);
- 	    if (NULL == ee)
- 		continue;
--	    value = exif_entry_get_value(ee);
-+	    exif_entry_get_value(ee, value, sizeof(value));
- 	    fprintf(out,"      0x%04x  %-30s %s\n", tag, title, value);
- 	}
-     }
diff --git a/graphics/ida/files/patch-mk::Autoconf.mk b/graphics/ida/files/patch-mk::Autoconf.mk
index ecf94ea14a10..7aaa5044d104 100644
--- a/graphics/ida/files/patch-mk::Autoconf.mk
+++ b/graphics/ida/files/patch-mk::Autoconf.mk
@@ -1,11 +1,15 @@
---- mk/Autoconf.mk.old	Fri Aug 20 21:07:52 2004
-+++ mk/Autoconf.mk	Fri Aug 20 21:08:23 2004
-@@ -107,7 +107,7 @@
- ac_resdir = $(shell \
+--- mk/Autoconf.mk.old	2009-05-24 18:47:11.000000000 +0300
++++ mk/Autoconf.mk	2009-05-24 18:49:32.000000000 +0300
+@@ -118,9 +118,9 @@
  	$(call ac_init,for X11 app-defaults prefix);\
- 	$(call ac_s_cmd, test -d /etc/X11/app-defaults &&\
--		echo "/etc/X11" || echo "/usr/X11R6/lib/X11");\
-+		echo "/etc/X11" || echo "$(PREFIX)/lib/X11");\
+ 	$(call ac_s_cmd, for dir in \
+ 		/etc/X11/app-defaults \
+-		/usr/X11R6/lib/X11/app-defaults \
+-		/usr/share/X11/app-defaults \
+-		/usr/lib/X11/app-defaults \
++		${PREFIX}/lib/X11/app-defaults \
++		${PREFIX}/share/X11/app-defaults \
++		${PREFIX}/lib/X11/app-defaults \
+ 		; do test -d "$$dir" || continue;\
+ 		dirname "$$dir"; break; done);\
  	$(call ac_fini))
- 
- 
diff --git a/graphics/ida/files/patch-mk::Variables.mk b/graphics/ida/files/patch-mk::Variables.mk
index 48d0e1fd970d..c956a80a2011 100644
--- a/graphics/ida/files/patch-mk::Variables.mk
+++ b/graphics/ida/files/patch-mk::Variables.mk
@@ -1,30 +1,21 @@
---- mk/Variables.mk.orig	Sun Feb 22 14:27:19 2004
-+++ mk/Variables.mk	Sat Oct 22 22:54:34 2005
-@@ -4,10 +4,10 @@
+--- mk/Variables.mk.orig	2008-06-09 17:56:36.000000000 +0300
++++ mk/Variables.mk	2009-05-24 19:03:04.000000000 +0300
+@@ -4,12 +4,12 @@
  # directories
  DESTDIR	=
  srcdir	?= .
 -prefix	?= /usr/local
 -bindir	=  $(DESTDIR)$(prefix)/bin
--mandir	=  $(DESTDIR)$(prefix)/share/man
--locdir  =  $(DESTDIR)$(prefix)/share/locale
+-sbindir	=  $(DESTDIR)$(prefix)/sbin
+-libdir  =  $(DESTDIR)$(prefix)/$(LIB)
+-shrdir  =  $(DESTDIR)$(prefix)/share
+-mandir	=  $(shrdir)/man
 +prefix	?= $(PREFIX)
 +bindir	=  $(DESTDIR)$(PREFIX)/bin
++sbindir	=  $(DESTDIR)$(PREFIX)/sbin
++libdir  =  $(DESTDIR)$(PREFIX)/$(LIB)
++shrdir  =  $(DESTDIR)$(PREFIX)/share
 +mandir	=  $(DESTDIR)$(PREFIX)/man
-+locdir  =  $(DESTDIR)$(PREFIX)/share/locale
+ locdir  =  $(shrdir)/locale
+ appdir  =  $(shrdir)/applications
  
- # package + version
- empty	:=
-@@ -34,9 +34,9 @@
- 	   -Wpointer-arith -Wunused
- 
- # add /usr/local to the search path if something is in there ...
--ifneq ($(wildcard /usr/local/include/*.h),)
--  CFLAGS  += -I/usr/local/include
--  LDFLAGS += -L/usr/local/$(LIB)
-+ifneq ($(wildcard $(LOCALBASE)/include/*.h),)
-+  CFLAGS  += -I$(LOCALBASE)/include
-+  LDFLAGS += -L$(LOCALBASE)/$(LIB)
- endif
- 
- # fixup include path for $(srcdir) != "."