Update XNC to version 5.0.4

Whats New from verion 5.0.2 (05-Feb-2003):
- Added 'create link' command for one file or group of selected files (Shift+F7)
- Added displaing key shotcuts in menu
- Fixed bugs with long file names and file names with special characters
- Fixed bug with switching between terminal and FM window

Whats New from verion 5.0.0 (01-Jan-2003):
- Added quick 'cd' command - Ctrl-x. You can use Tab expantion there.
- Added hot keys to panel sort methods and modes.
- Added visual terminal/fm switch.
- Fixes for status bar display items.
- Fixes for edit/view files with spaces with external editor/viewer
- Fixes for deletion files named with '-alala-'
- Fixes for selection on right/bottom panels.
- Added Spanish, Czech and Serbian translation (thanks people)
- Added partly translated Hungarian messages

16 files changed, 70 insertions, 327 deletions

diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index ff62554e9c7..572b0b0a951 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:26:16 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/22 22:29:22 jschauma Exp $
 
-DISTNAME=	xnc-4.4.7.src
-PKGNAME=	xnc-4.4.7
-PKGREVISION=	3
+DISTNAME=	xnc-5.0.4.src
+PKGNAME=	xnc-5.0.4
 CATEGORIES=	sysutils x11
-MASTER_SITES=	http://www.xnc.dubna.su/src/
+MASTER_SITES=	http://www.xnc.dubna.su/src-5/
 
 MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://xnc.dubna.su/
@@ -16,17 +15,6 @@ USE_X11=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xnc
-	${INSTALL_DATA} ${WRKSRC}/Docs/* ${PREFIX}/share/doc/xnc
-	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
-	for f in ives.1 xjpegroot.1 xnc.1 xnlaunch.1; \
-	do \
-		${INSTALL_MAN} ${WRKSRC}/yo-man/$$f ${PREFIX}/man/man1/; \
-	done
-	${INSTALL_MAN} ${WRKSRC}/yo-man/es.1 ${PREFIX}/man/man1/iedit.1
-	${INSTALL_MAN} ${WRKSRC}/yo-man/vs.1 ${PREFIX}/man/man1/iview.1
-
 .include "../../graphics/tiff/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/sysutils/xnc/PLIST b/sysutils/xnc/PLIST
index de2caa69715..64ca574f2fa 100644
--- a/sysutils/xnc/PLIST
+++ b/sysutils/xnc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/22 05:26:53 dillo Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/22 22:29:22 jschauma Exp $
 bin/bzip.xnc
 bin/groups.xnc
 bin/gzip.xnc
@@ -7,17 +7,16 @@ bin/iedit
 bin/iview
 bin/rpm.xnc
 bin/users.xnc
+bin/view.xnc
 bin/xjpegroot
 bin/xnc
+bin/xnc-en
+bin/xncsetup-en
 bin/xncloader
 bin/xncsetup
 bin/xnlaunch
 bin/zips.xnc
-lib/xnc/libxncaqua.a
-lib/xnc/libxncaqua.la
 lib/xnc/libxncaqua.so
-lib/xnc/libxncfive.a
-lib/xnc/libxncfive.la
 lib/xnc/libxncfive.so
 man/man1/iedit.1
 man/man1/ives.1
@@ -25,14 +24,28 @@ man/man1/iview.1
 man/man1/xjpegroot.1
 man/man1/xnc.1
 man/man1/xnlaunch.1
-share/doc/xnc/doc1.html
-share/doc/xnc/doc2.html
-share/doc/xnc/doc3.html
-share/doc/xnc/doc4.html
-share/doc/xnc/doc5.html
-share/doc/xnc/doc6.html
-share/doc/xnc/doc7.html
-share/doc/xnc/doc8.html
-share/doc/xnc/index.html
-@dirrm share/doc/xnc
+share/doc/xnc-5.0.4/doc1.html
+share/doc/xnc-5.0.4/doc2.html
+share/doc/xnc-5.0.4/doc3.html
+share/doc/xnc-5.0.4/doc4.html
+share/doc/xnc-5.0.4/doc5.html
+share/doc/xnc-5.0.4/doc6.html
+share/doc/xnc-5.0.4/doc7.html
+share/doc/xnc-5.0.4/doc8.html
+share/doc/xnc-5.0.4/index.html
+share/locale/cs/LC_MESSAGES/xnc.mo
+share/locale/es/LC_MESSAGES/xnc.mo
+share/locale/fr/LC_MESSAGES/xnc.mo
+share/locale/hu/LC_MESSAGES/xnc.mo
+share/locale/it/LC_MESSAGES/xnc.mo
+share/locale/nl/LC_MESSAGES/xnc.mo
+share/locale/pl/LC_MESSAGES/xnc.mo
+share/locale/pt/LC_MESSAGES/xnc.mo
+share/locale/ro/LC_MESSAGES/xnc.mo
+share/locale/ru/LC_MESSAGES/xnc.mo
+share/locale/sp/LC_MESSAGES/xnc.mo
+share/locale/sr/LC_MESSAGES/xnc.mo
+share/pixmaps/xnc.xpm
+share/pixmaps/xnc.png
+@dirrm share/doc/xnc-5.0.4
 @dirrm lib/xnc
diff --git a/sysutils/xnc/distinfo b/sysutils/xnc/distinfo
index 0e2a4e3b782..0718a4232ce 100644
--- a/sysutils/xnc/distinfo
+++ b/sysutils/xnc/distinfo
@@ -1,16 +1,7 @@
-$NetBSD: distinfo,v 1.4 2004/01/02 17:21:00 cjep Exp $
+$NetBSD: distinfo,v 1.5 2004/02/22 22:29:22 jschauma Exp $
 
-SHA1 (xnc-4.4.7.src.tar.gz) = f66a0cb754a555d11df8e831d3d38af9b0b27563
-Size (xnc-4.4.7.src.tar.gz) = 1647931 bytes
-SHA1 (patch-aa) = 1bdbb1a794048ba72c406dc2fc88dd943bae8bc9
-SHA1 (patch-ab) = 4ab216cd0edf1e37391bf426fdfb451f9510a961
-SHA1 (patch-ac) = f8548211d9ce05a68e55d3b7e6e80e961c423669
-SHA1 (patch-ad) = 651217c540fb4331cf3f5481789ec567eb66402b
-SHA1 (patch-ae) = f6185cabeb30ea23c6d5facaa970ed01386953e6
-SHA1 (patch-af) = d218a7ba6056d567500a38a4e337b85bf4a4292c
-SHA1 (patch-ag) = 849744a065c0ddc695f67900840e677aa6be53fb
-SHA1 (patch-ah) = ce30a05caf42a4defc38c9b430cc11d72ea44537
-SHA1 (patch-ai) = 569438fe88fbdaa1817566d2f52e9413b7cb8028
-SHA1 (patch-aj) = d20b0b6b595b12981a4042f04c09f168c66bde66
-SHA1 (patch-ak) = 030751d9634c7d8dab3f4ea85edf5123597cca32
-SHA1 (patch-al) = 32127f4108f9ec1d1ff2491638438f9c0ffc5aab
+SHA1 (xnc-5.0.4.src.tar.gz) = 4673ba128f4df88342bfd4968a2427e894f6f3cb
+Size (xnc-5.0.4.src.tar.gz) = 2130633 bytes
+SHA1 (patch-aa) = 2da27a17e9b5c114b9ff930c38f8ec04b7221abc
+SHA1 (patch-ak) = 8174f9791016fbaa179efbefa4971423677f7652
+SHA1 (patch-am) = 5522a4a41bf5e0512f38017c28300cc9529c9c23
diff --git a/sysutils/xnc/patches/patch-aa b/sysutils/xnc/patches/patch-aa
index f6ecea6f5c1..90dea6feee0 100644
--- a/sysutils/xnc/patches/patch-aa
+++ b/sysutils/xnc/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/22 22:29:22 jschauma Exp $
 
---- filedir/makefile.in.orig	Wed Apr 25 20:11:20 2001
-+++ filedir/makefile.in	Wed Apr 25 20:11:28 2001
-@@ -34,7 +34,7 @@
- @MCOMMON@
+--- src/lib/filedir/makefile.in.orig	2002-09-19 10:36:35.000000000 -0400
++++ src/lib/filedir/makefile.in	2004-02-22 16:28:11.000000000 -0500
+@@ -33,7 +33,7 @@
+            PROGRAM = $(MYLIBDIR)/libxncfiledir.a
  
- VERSION	= 3.20.1
--MAGIC	= /usr/share/magic
-+MAGIC	= /usr/share/misc/magic
- #MAGIC	= /usr/local/etc/magic
+ VERSION = 3.20.1
+-MAGIC   = /usr/share/magic
++MAGIC   = /usr/share/misc/magic
+ 
+ CINCLUDES=-DMAGIC='"$(MAGIC)"' -DMAGIC_FOR_XNC $(DEFS) $(DEB) $(STRIPPING)
  
- MAGDEFS	= -DMAGIC='"$(MAGIC)"' -DMAGIC_FOR_XNC $(DEFS)# -Dvoid=int
diff --git a/sysutils/xnc/patches/patch-ab b/sysutils/xnc/patches/patch-ab
deleted file mode 100644
index f828f1ae5c4..00000000000
--- a/sysutils/xnc/patches/patch-ab
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/07/08 14:25:05 jschauma Exp $
-
---- Makefile.in.orig	Sun Jul  7 12:45:58 2002
-+++ Makefile.in	Sun Jul  7 12:50:17 2002
-@@ -256,31 +256,33 @@
- 
- install: install-$(PLUGINS)
- 	#Installing X Northern Captain...
--	$(INSD) $(INSTDIR)
--	$(INS) ./users.xnc $(INSTDIR)
--	$(INS) ./groups.xnc $(INSTDIR)
--	$(INS) ./rpm.xnc $(INSTDIR)
--	$(INS) ./zips.xnc $(INSTDIR)
--	$(INS) ./gzip.xnc $(INSTDIR)
--	$(INS) ./bzip.xnc $(INSTDIR)
--	$(INS) ./nc $(INSTDIR)/xnc
--	$(INSD) $(INSTMAN)
--	$(INSM) ./yo-man/*.1 $(INSTMAN)/man1
--	$(INS) ./ives/ives $(INSTDIR)
--	$(INS) ./ives/iedit $(INSTDIR)
--	$(INS) ./ives/iview $(INSTDIR)
--	$(INS) ./xsetup/xncsetup $(INSTDIR)
--	$(INS) ./xjroot/xjpegroot $(INSTDIR)
--	$(INS) ./launch/xnlaunch $(INSTDIR)
--	$(INS) ./resloader/xncloader $(INSTDIR)
--	/bin/sh ./replace.script
-+	#$(INSD) $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./users.xnc $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./groups.xnc $(INSTDIR)
-+	$(INSTALL_SCRIPT) ./rpm.xnc $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./zips.xnc $(INSTDIR)
-+	$(INSTALL_SCRIPT) ./gzip.xnc $(INSTDIR)
-+	$(INSTALL_SCRIPT) ./bzip.xnc $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./nc $(INSTDIR)/xnc
-+	#$(INSD) $(INSTMAN)
-+	#$(INSM) ./yo-man/*.1 $(INSTMAN)/man1
-+	$(INSTALL_PROGRAM) ./ives/ives $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./ives/iedit $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./ives/iview $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./xsetup/xncsetup $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./xjroot/xjpegroot $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./launch/xnlaunch $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./resloader/xncloader $(INSTDIR)
-+	#/bin/sh ./replace.script
- 	@echo "Don't foget run 'xncsetup' before starting XNC"
- 
- 
- install-plugins:
- 	mkdir -p $(INSTPLUG)
--	$(INS) ./plugins/five/libxncfive.so $(INSTPLUG)
--	$(INS) ./plugins/aqua/libxncaqua.so $(INSTPLUG)
-+	#$(INS) ./plugins/five/libxncfive.so $(INSTPLUG)
-+	#$(INS) ./plugins/aqua/libxncaqua.so $(INSTPLUG)
-+	cd ./plugins/five/ && make install
-+	cd ./plugins/aqua/ && make install
- 
- install-:
- 	@echo "Skipping..."
diff --git a/sysutils/xnc/patches/patch-ac b/sysutils/xnc/patches/patch-ac
deleted file mode 100644
index 0792bd3549d..00000000000
--- a/sysutils/xnc/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/09/23 23:35:49 jlam Exp $
-
---- ives/makefile.in.orig	Sun Jul  7 12:57:19 2002
-+++ ives/makefile.in	Sun Jul  7 12:57:59 2002
-@@ -31,7 +31,7 @@
-            STYLE=-DOLD_STYLE
- 
-            CXXOPT=-DIVES $(NO_ALT) $(STYLE) $(DEB) $(DEFS) $(CFLAGS)
--           LOCAL_LIBRARIES=$(TLIB) $(XLIBS) -L/usr/lib $(PNGLIB) $(ZLIB) $(LIBS)
-+           LOCAL_LIBRARIES=$(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
- 
-  PROGRAM =ives iedit iview $(IMAGEOBJS) $(JDEP)
- 
diff --git a/sysutils/xnc/patches/patch-ad b/sysutils/xnc/patches/patch-ad
deleted file mode 100644
index 1581ba900db..00000000000
--- a/sysutils/xnc/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/07/08 14:25:05 jschauma Exp $
-
---- xsetup/makefile.in.orig	Sun Jul  7 12:59:01 2002
-+++ xsetup/makefile.in	Sun Jul  7 12:59:34 2002
-@@ -45,7 +45,7 @@
- 
-            CXXINCLUDES=$(XINC) -I../image2 -I../xbitmaps
-            CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
--           LOCAL_LIBRARIES=$(IMAGEOBJS) $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS)
-+           LOCAL_LIBRARIES=$(IMAGEOBJS) $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
- 
-  PROGRAM =xncsetup
- 
diff --git a/sysutils/xnc/patches/patch-ae b/sysutils/xnc/patches/patch-ae
deleted file mode 100644
index 5a3ae0da8f1..00000000000
--- a/sysutils/xnc/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/07/08 14:25:05 jschauma Exp $
-
---- xjroot/makefile.in.orig	Sun Jul  7 13:00:26 2002
-+++ xjroot/makefile.in	Sun Jul  7 13:00:51 2002
-@@ -20,7 +20,7 @@
-            IOBJS =xjpegroot.o
-            CXXINCLUDES=$(XINC) $(JINC)
-            CXXOPT=$(DEFS) $(CFLAGS)
--           LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS)
-+           LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
- 
-  PROGRAM =xjpegroot $(IMAGENGINE)
- 
diff --git a/sysutils/xnc/patches/patch-af b/sysutils/xnc/patches/patch-af
deleted file mode 100644
index 56dd23255a0..00000000000
--- a/sysutils/xnc/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/07/08 14:25:06 jschauma Exp $
-
---- launch/makefile.in.orig	Sun Jul  7 13:01:34 2002
-+++ launch/makefile.in	Sun Jul  7 13:01:49 2002
-@@ -28,7 +28,7 @@
-            STYLE=-DOLD_STYLE
- 
-            CXXOPT=$(DEFS) $(CFLAGS)
--           LOCAL_LIBRARIES=$(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS)
-+           LOCAL_LIBRARIES=$(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
- 
-  PROGRAM =xnlaunch $(IMAGEOBJS) $(JDEP)
- 
diff --git a/sysutils/xnc/patches/patch-ag b/sysutils/xnc/patches/patch-ag
deleted file mode 100644
index aa5a17c28b0..00000000000
--- a/sysutils/xnc/patches/patch-ag
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2002/07/08 14:25:06 jschauma Exp $
-
---- plugins/five/makefile.in.orig	Sun Jul  7 12:50:31 2002
-+++ plugins/five/makefile.in	Sun Jul  7 12:55:45 2002
-@@ -18,6 +18,11 @@
- 
- @MCOMMON@
- 
-+CXX = $(LIBTOOL) --mode=compile $(CC)
-+
-+.c.o:
-+	$(CXX) -c $(CXXINCLUDES) $(INCLUDES) $(CXXOPT) $<
-+
- PLUGINFLAGS=$(SHAREFLAGS)
- 
-            IOBJS =fiveplugin.o fivegeom.o fivefuncs.o fiveskin.o fivegui.o \
-@@ -26,9 +31,13 @@
- 	-I../common -I../../ftplib -I../../resloader 
-            CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
- 
--PROGRAM =libxncfive.so
-+#PROGRAM =libxncfive.so
-+PROGRAM =libxncfive.a
- 
--all:: $(PROGRAM)
-+#all:: $(PROGRAM)
-+all: $(IOBJS)
-+	 $(LIBTOOL) $(CC) -module -avoid-version -o $(PROGRAM:.a=.la) \
-+		$(IOBJS:.o=.lo) -rpath $(INSTPLUG)
- 
- 
- ../gui.o: ../gui.cxx
-@@ -88,7 +97,8 @@
- 
- 
- install:
--	./xncsetup
-+#	./xncsetup
-+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(PROGRAM:.a=.la) $(INSTPLUG)
- 
- uninstall:
- 	#Uninstalling IVES..
diff --git a/sysutils/xnc/patches/patch-ah b/sysutils/xnc/patches/patch-ah
deleted file mode 100644
index 3b0c612face..00000000000
--- a/sysutils/xnc/patches/patch-ah
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2002/07/08 14:25:06 jschauma Exp $
-
---- plugins/aqua/makefile.in.orig	Sun Jul  7 12:53:26 2002
-+++ plugins/aqua/makefile.in	Sun Jul  7 12:55:14 2002
-@@ -18,6 +18,12 @@
- 
- @MCOMMON@
- 
-+CXX = $(LIBTOOL) --mode=compile $(CC)
-+
-+.c.o:
-+	$(CXX) -c $(CXXINCLUDES) $(INCLUDES) $(CXXOPT) $<
-+
-+
- PLUGINFLAGS=$(SHAREFLAGS)
- 
-            IOBJS =aquaplugin.o aquagui.o aquafuncs.o aquageom.o aquapanel.o\
-@@ -26,9 +32,13 @@
- 	-I../common -I../../ftplib -I../../resloader 
-            CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
- 
--PROGRAM =libxncaqua.so
-+#PROGRAM =libxncaqua.so
-+PROGRAM =libxncaqua.a
- 
--all:: $(PROGRAM)
-+#all:: $(PROGRAM)
-+all: $(IOBJS)
-+	$(LIBTOOL) $(CC) -module -avoid-version -o $(PROGRAM:.a=.la) \
-+		$(IOBJS:.o=.lo) -rpath $(INSTPLUG)
- 
- 
- ../gui.o: ../gui.cxx
-@@ -87,7 +97,8 @@
- 
- 
- install:
--	./xncsetup
-+#	./xncsetup
-+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(PROGRAM:.a=.la) $(INSTPLUG)
- 
- uninstall:
- 	$(RM) -f $(PROGRAM)
diff --git a/sysutils/xnc/patches/patch-ai b/sysutils/xnc/patches/patch-ai
deleted file mode 100644
index be7b7ae6aee..00000000000
--- a/sysutils/xnc/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
-
---- plugins/common/makefile.in.orig	Thu Aug 30 21:30:56 2001
-+++ plugins/common/makefile.in
-@@ -18,6 +18,11 @@
- 
- @MCOMMON@
- 
-+CXX = $(LIBTOOL) --mode=compile $(CC)
-+
-+.c.o:
-+	$(CXX) -c $(CXXINCLUDES) $(INCLUDES) $(CXXOPT) $<
-+
-            CXXINCLUDES=$(XINC) -I../xbitmaps
-            CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
- 
diff --git a/sysutils/xnc/patches/patch-aj b/sysutils/xnc/patches/patch-aj
deleted file mode 100644
index efad35447ba..00000000000
--- a/sysutils/xnc/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/07/08 14:25:06 jschauma Exp $
-
---- resloader/makefile.in.orig	Sun Jul  7 12:56:04 2002
-+++ resloader/makefile.in	Sun Jul  7 12:56:33 2002
-@@ -21,7 +21,7 @@
- 	   ../plugins/aqua/aquaskin.o ../plugins/five/fiveskin.o
-            CXXINCLUDES=$(XINC) $(JINC)
-            CXXOPT=$(DEFS) $(CFLAGS)
--           LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS)
-+           LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
- 
-  PROGRAM =xncloader $(IMAGENGINE)
- 
diff --git a/sysutils/xnc/patches/patch-ak b/sysutils/xnc/patches/patch-ak
index e3507fb8797..b93229fc846 100644
--- a/sysutils/xnc/patches/patch-ak
+++ b/sysutils/xnc/patches/patch-ak
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.1 2002/07/08 14:25:07 jschauma Exp $
+$NetBSD: patch-ak,v 1.2 2004/02/22 22:29:22 jschauma Exp $
 
---- Make.common.in.orig	Sun Jul  7 14:34:06 2002
-+++ Make.common.in	Sun Jul  7 14:34:27 2002
-@@ -26,6 +26,7 @@
+--- Make.common.in.orig	2002-12-30 06:25:55.000000000 -0500
++++ Make.common.in	2004-02-22 16:43:56.000000000 -0500
+@@ -38,6 +38,7 @@
  INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL@ -s -m 755
+ INSTALL_PROGRAM = @INSTALL@ -m 755
  INSTALL_DATA = @INSTALL@ -m 644
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INS=@INSTALL@ -m 755
- INSM=@INSTALL@  -m 644
- INSD=@INSTALL@ -d -m 755
+ INSTALL_DIR=@INSTALL@ -d -m 755
+ MKINSTALLDIRS=$(srcdir)/mkinstalldirs
+ 
diff --git a/sysutils/xnc/patches/patch-al b/sysutils/xnc/patches/patch-al
deleted file mode 100644
index 5d7e4d05bee..00000000000
--- a/sysutils/xnc/patches/patch-al
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/01/02 17:21:00 cjep Exp $
---- rxvt2/grkelot.c.orig	2002-02-27 14:05:56.000000000 +0000
-+++ rxvt2/grkelot.c	2004-01-02 17:01:06.000000000 +0000
-@@ -111,27 +111,19 @@
-  * more flexibly.
-  */
- /* elot 928 xlations */
--static char elot_xlat_plain[] =	"65-122:193,194,216,196,197,214,195,199,201,206,202,203,204,205,207,208,81,209,211,212,200,217,87,215,213,198,91,92,93,94,95,96,225,226,248,228,229,246,227,231,233,238,234,235,236,237,239,240,113,241,243,244,232,249,2
--42,247,245,230";
-+static char elot_xlat_plain[] =	"65-122:193,194,216,196,197,214,195,199,201,206,202,203,204,205,207,208,81,209,211,212,200,217,87,215,213,198,91,92,93,94,95,96,225,226,248,228,229,246,227,231,233,238,234,235,236,237,239,240,113,241,243,244,232,249,242,247,245,230";
- /* c and s give copyright and section sign */
--static char elot_xlat_acc[] = "65-122:182,194,216,196,184,214,195,185,186,206,202,203,204,205,188,208,81,209,211,212,200,191,87,215,190,198,91,92,93,94,95,96,220,226,"/*248*/"169,228,221,246,227,222,223,238,234,235,236,237,252,240,113,241,"/*243*/"1
--67,244,232,254,242,247,253,230";
-+static char elot_xlat_acc[] = "65-122:182,194,216,196,184,214,195,185,186,206,202,203,204,205,188,208,81,209,211,212,200,191,87,215,190,198,91,92,93,94,95,96,220,226,"/*248*/"169,228,221,246,227,222,223,238,234,235,236,237,252,240,113,241,"/*243*/"167,244,232,254,242,247,253,230";
- static char elot_xlat_acc_xtra[] = "46-62:183,47,48,49,50,51,52,53,54,55,56,57,58,59,171,61,187";		/* anw teleia, quotes */
--static char elot_xlat_uml[] =	"65-122:193,194,216,196,197,214,195,199,218,206,202,203,204,205,207,208,81,209,211,212,200,217,87,215,219,198,91,92,93,94,95,96,225,226,248,228,229,246,227,231,250,238,234,235,236,237,239,240,113,241,243,244,232,249,242
--,247,251,230";
--static char elot_xlat_umacc[] =	"65-122:193,194,216,196,197,214,195,199,201,206,202,203,204,205,207,208,81,209,211,212,200,217,87,215,213,198,91,92,93,94,95,96,225,226,248,228,229,246,227,231,192,238,234,235,236,237,239,240,113,241,243,244,232,249,2
--42,247,224,230";
-+static char elot_xlat_uml[] =	"65-122:193,194,216,196,197,214,195,199,218,206,202,203,204,205,207,208,81,209,211,212,200,217,87,215,219,198,91,92,93,94,95,96,225,226,248,228,229,246,227,231,250,238,234,235,236,237,239,240,113,241,243,244,232,249,242,247,251,230";
-+static char elot_xlat_umacc[] =	"65-122:193,194,216,196,197,214,195,199,201,206,202,203,204,205,207,208,81,209,211,212,200,217,87,215,213,198,91,92,93,94,95,96,225,226,248,228,229,246,227,231,192,238,234,235,236,237,239,240,113,241,243,244,232,249,242,247,224,230";
- 
- /* ibm 437 xlations */
--static char i437_xlat_plain[] =	"65-122:128,129,150,131,132,148,130,134,136,141,137,138,139,140,142,143,81,144,145,146,135,151,87,149,147,133,91,92,93,94,95,96,152,153,175,155,156,173,154,158,160,165,161,162,163,164,166,167,113,168,169,171,159,224,1
--70,174,172,157";
--static char i437_xlat_acc[] = 	"65-122:234,129,150,131,235,148,130,236,237,141,137,138,139,140,238,143,81,144,145,146,135,240,87,149,239,133,91,92,93,94,95,96,225,153,175,155,226,173,154,227,229,165,161,162,163,164,230,167,113,168,169,171,159,233,17
--0,174,231,157";
-+static char i437_xlat_plain[] =	"65-122:128,129,150,131,132,148,130,134,136,141,137,138,139,140,142,143,81,144,145,146,135,151,87,149,147,133,91,92,93,94,95,96,152,153,175,155,156,173,154,158,160,165,161,162,163,164,166,167,113,168,169,171,159,224,170,174,172,157";
-+static char i437_xlat_acc[] = 	"65-122:234,129,150,131,235,148,130,236,237,141,137,138,139,140,238,143,81,144,145,146,135,240,87,149,239,133,91,92,93,94,95,96,225,153,175,155,226,173,154,227,229,165,161,162,163,164,230,167,113,168,169,171,159,233,170,174,231,157";
- static char i437_xlat_acc_xtra[] = "46-46:250";		/* anw teleia */
--static char i437_xlat_uml[] =	"65-122:128,129,150,131,132,148,130,134,136,141,137,138,139,140,142,143,81,144,145,146,135,151,87,149,147,133,91,92,93,94,95,96,152,153,175,155,156,173,154,158,228,165,161,162,163,164,166,167,113,168,169,171,159,224,170
--,174,232,157";
--static char i437_xlat_umacc[] =	"65-122:128,129,150,131,132,148,130,134,136,141,137,138,139,140,142,143,81,144,145,146,135,151,87,149,147,133,91,92,93,94,95,96,152,153,175,155,156,173,154,158,42,165,161,162,163,164,166,167,113,168,169,171,159,224,17
--0,174,42,157";
-+static char i437_xlat_uml[] =	"65-122:128,129,150,131,132,148,130,134,136,141,137,138,139,140,142,143,81,144,145,146,135,151,87,149,147,133,91,92,93,94,95,96,152,153,175,155,156,173,154,158,228,165,161,162,163,164,166,167,113,168,169,171,159,224,170,174,232,157";
-+static char i437_xlat_umacc[] =	"65-122:128,129,150,131,132,148,130,134,136,141,137,138,139,140,142,143,81,144,145,146,135,151,87,149,147,133,91,92,93,94,95,96,152,153,175,155,156,173,154,158,42,165,161,162,163,164,166,167,113,168,169,171,159,224,170,174,42,157";
- 
- /*
-  * currently ELOT928 and IBM437 are supported; easy to include others
diff --git a/sysutils/xnc/patches/patch-am b/sysutils/xnc/patches/patch-am
new file mode 100644
index 00000000000..8bc8b9e9734
--- /dev/null
+++ b/sysutils/xnc/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.1 2004/02/22 22:29:22 jschauma Exp $
+
+--- Makefile.in.orig	2004-02-22 17:15:26.000000000 -0500
++++ Makefile.in	2004-02-22 17:16:07.000000000 -0500
+@@ -74,9 +74,6 @@
+ 	$(INSTALL_DATA) ./desktop/xnc.xpm $(DESTDIR)$(INSTICONDIR)
+ 	$(INSTALL_DATA) ./desktop/xnc.png $(DESTDIR)$(INSTICONDIR)
+ 	$(INSTALL_DATA) ./desktop/xnc.xpm $(DESTDIR)$(INSTICONDIR)
+-	$(INSTALL_DATA) ./desktop/xnc.desktop $(DESTDIR)$(INSTDESKDIR1)
+-	$(INSTALL_DATA) ./desktop/X_Northern_Captain.desktop $(DESTDIR)$(INSTDESKDIR2)
+-	$(INSTALL_DATA) ./desktop/xnc-gnome2.desktop $(DESTDIR)$(INSTDESKDIR3)
+ 	make install-$(PO_MAKE_DIR)
+ 	@echo "Don't foget run 'xncsetup' before starting XNC"
+ 	@echo "And add $(DESTDIR)$(INSTDIR) into your PATH environment variable"