Update to 5.0.0.

6 files changed, 47 insertions, 73 deletions

diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index d9a5ea257c34..4078bdc86f75 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	xnc
-PORTVERSION=	4.4.7
+PORTVERSION=	5.0.0
 CATEGORIES=	x11-fm
-MASTER_SITES=	http://www.xnc.dubna.su/src/
+MASTER_SITES=	http://www.xnc.dubna.su/src-5/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	demon@FreeBSD.org
@@ -20,30 +20,21 @@ MAINTAINER=	demon@FreeBSD.org
 #		rar:${PORTSDIR}/archivers/rar		\
 #		unarj:${PORTSDIR}/archivers/unarj	\
 #		lha:${PORTSDIR}/archivers/lha
-#.if !exists(/usr/bin/bzip2)
-#RUN_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
-#.endif
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		intl.4:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-pty=BSD
+CONFIGURE_ARGS+=--with-pty=BSD --with-libintl-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		es.1 ives.1 vs.1 xjpegroot.1 xnc.1 xnlaunch.1
-
-pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/image2/picinfo.h
+MAN1=		ives.1 xjpegroot.1 xnc.1 xnlaunch.1 iedit.1 iview.1
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Docs/* ${DOCSDIR}
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-fm/xnc/distinfo b/x11-fm/xnc/distinfo
index 15bccda426a9..427731070f50 100644
--- a/x11-fm/xnc/distinfo
+++ b/x11-fm/xnc/distinfo
@@ -1 +1 @@
-MD5 (xnc-4.4.7.src.tar.gz) = 5f6a6a95aa83c35268c2d339bbd3ef83
+MD5 (xnc-5.0.0.src.tar.gz) = 5a13c391b9dff86942289a64fbc3d2e4
diff --git a/x11-fm/xnc/files/patch-Make.common.in b/x11-fm/xnc/files/patch-Make.common.in
new file mode 100644
index 000000000000..8099918d351b
--- /dev/null
+++ b/x11-fm/xnc/files/patch-Make.common.in
@@ -0,0 +1,11 @@
+--- Make.common.in.orig	Thu Jan  9 13:02:52 2003
++++ Make.common.in	Thu Jan  9 13:03:11 2003
+@@ -44,7 +44,7 @@
+ INSTDIR=$(bindir)
+ INSTMAN=$(mandir)/man$(manext)
+ INSTPLUG=$(libdir)/xnc
+-INSTDOCDIR = ${prefix}/share/doc/xnc-$(XNCVERSION)
++INSTDOCDIR = ${prefix}/share/doc/xnc
+ INSTICONDIR = $(datadir)/pixmaps
+ INSTDESKDIR1= $(datadir)/gnome/apps/Applications
+ INSTDESKDIR2= $(datadir)/applnk/System
diff --git a/x11-fm/xnc/files/patch-ac b/x11-fm/xnc/files/patch-ac
index 97cff3fa394c..b64bdbb6eb3e 100644
--- a/x11-fm/xnc/files/patch-ac
+++ b/x11-fm/xnc/files/patch-ac
@@ -1,11 +1,11 @@
---- 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	Thu Jan  9 12:17:27 2003
++++ src/lib/filedir/makefile.in	Thu Jan  9 12:17:45 2003
+@@ -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/x11-fm/xnc/files/patch-ad b/x11-fm/xnc/files/patch-ad
deleted file mode 100644
index bca25f17e58c..000000000000
--- a/x11-fm/xnc/files/patch-ad
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.in.orig	Sat Jun 29 11:57:34 2002
-+++ Makefile.in	Sat Jun 29 12:00:28 2002
-@@ -257,23 +257,23 @@
- install: install-$(PLUGINS)
- 	#Installing X Northern Captain...
- 	$(INSD) $(INSTDIR)
--	$(INS) ./users.xnc $(INSTDIR)
--	$(INS) ./groups.xnc $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./users.xnc $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./groups.xnc $(INSTDIR)
- 	$(INS) ./rpm.xnc $(INSTDIR)
--	$(INS) ./zips.xnc $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./zips.xnc $(INSTDIR)
- 	$(INS) ./gzip.xnc $(INSTDIR)
- 	$(INS) ./bzip.xnc $(INSTDIR)
--	$(INS) ./nc $(INSTDIR)/xnc
-+	$(INSTALL_PROGRAM) ./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
-+	$(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"
- 
- 
diff --git a/x11-fm/xnc/pkg-plist b/x11-fm/xnc/pkg-plist
index 6709f9a37afa..59f9cc3b175b 100644
--- a/x11-fm/xnc/pkg-plist
+++ b/x11-fm/xnc/pkg-plist
@@ -6,6 +6,7 @@ bin/iedit
 bin/iview
 bin/rpm.xnc
 bin/users.xnc
+bin/view.xnc
 bin/xjpegroot
 bin/xnc
 bin/xncloader
@@ -14,14 +15,23 @@ bin/xnlaunch
 bin/zips.xnc
 lib/xnc/libxncaqua.so
 lib/xnc/libxncfive.so
-%%PORTDOCS%%share/doc/xnc/doc1.html
-%%PORTDOCS%%share/doc/xnc/doc2.html
-%%PORTDOCS%%share/doc/xnc/doc3.html
-%%PORTDOCS%%share/doc/xnc/doc4.html
-%%PORTDOCS%%share/doc/xnc/doc5.html
-%%PORTDOCS%%share/doc/xnc/doc6.html
-%%PORTDOCS%%share/doc/xnc/doc7.html
-%%PORTDOCS%%share/doc/xnc/doc8.html
-%%PORTDOCS%%share/doc/xnc/index.html
-%%PORTDOCS%%@dirrm share/doc/xnc
+share/locale/fr/LC_MESSAGES/xnc.mo
+share/locale/pl/LC_MESSAGES/xnc.mo
+share/locale/pt/LC_MESSAGES/xnc.mo
+share/locale/ru/LC_MESSAGES/xnc.mo
+share/pixmaps/xnc.png
+share/pixmaps/xnc.xpm
+share/gnome/apps/Applications/xnc.desktop
+share/applnk/System/X_Northern_Captain.desktop
+share/applications/xnc-gnome2.desktop
+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
 @dirrm lib/xnc