6 files changed, 23 insertions, 12 deletions

diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index 800f97b15df2..376b7e1c44be 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	xnc
-PORTVERSION= 	4.2.1
+PORTVERSION= 	4.4.0
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.xnc.dubna.su/src/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/desktop
-DISTFILES=	${DISTNAME}.src.tar.gz
+DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	demon@FreeBSD.org
 
@@ -26,10 +26,12 @@ MAINTAINER=	demon@FreeBSD.org
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+INSTALLS_SHLIB=	yes
 
 MAN1=		es.1 ives.1 vs.1 xjpegroot.1 xnc.1 xnlaunch.1
 
diff --git a/x11-fm/xnc/distinfo b/x11-fm/xnc/distinfo
index e6a9303531bb..5152e8b932bc 100644
--- a/x11-fm/xnc/distinfo
+++ b/x11-fm/xnc/distinfo
@@ -1 +1 @@
-MD5 (xnc-4.2.1.src.tar.gz) = 0455bf1aacc2403beb2404a420312b8c
+MD5 (xnc-4.4.0.src.tar.gz) = cf3feffce6b562c6055aec4827615e3f
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..f1161280832e
--- /dev/null
+++ b/x11-fm/xnc/files/patch-Make.common.in
@@ -0,0 +1,11 @@
+--- Make.common.in.orig	Fri Jan  5 00:17:13 2001
++++ Make.common.in	Fri Jan  5 00:17:25 2001
+@@ -31,7 +31,7 @@
+ INSOWN=@INSTALL@
+ INSTDIR=@prefix@/bin
+ INSTMAN=@prefix@/man
+-INSTPLUG=@prefix@/lib/xnc
++INSTPLUG=@prefix@/lib
+ DEB=
+ STRIPPING=
+ XINC=@X_CFLAGS@
diff --git a/x11-fm/xnc/files/patch-ad b/x11-fm/xnc/files/patch-ad
index 39bfd50ec056..099d4de745e2 100644
--- a/x11-fm/xnc/files/patch-ad
+++ b/x11-fm/xnc/files/patch-ad
@@ -1,13 +1,11 @@
---- Makefile.in.orig	Wed Feb 16 16:16:31 2000
-+++ Makefile.in	Wed Feb 16 16:18:27 2000
-@@ -170,22 +170,22 @@
+--- Makefile.in.orig	Thu Jan  4 23:53:59 2001
++++ Makefile.in	Thu Jan  4 23:58:48 2001
+@@ -181,21 +181,21 @@
  
  install:
  	#Installing X Northern Captain...
--	$(INS) ./findslave.xnc $(INSTDIR)
 -	$(INS) ./users.xnc $(INSTDIR)
 -	$(INS) ./groups.xnc $(INSTDIR)
-+	$(INSTALL_PROGRAM) ./findslave.xnc $(INSTDIR)
 +	$(INSTALL_PROGRAM) ./users.xnc $(INSTDIR)
 +	$(INSTALL_PROGRAM) ./groups.xnc $(INSTDIR)
  	$(INS) ./rpm.xnc $(INSTDIR)
@@ -32,6 +30,6 @@
 +	$(INSTALL_PROGRAM) ./xjroot/xjpegroot $(INSTDIR)
 +	$(INSTALL_PROGRAM) ./launch/xnlaunch $(INSTDIR)
 +#	/bin/sh ./replace.script
+ 	mkdir -p $(INSTPLUG)
+ 	$(INS) ./plugins/five/libxncfive.so $(INSTPLUG)
  	echo "Don't foget run 'xncsetup' before starting XNC"
- 
- install-rpm:
diff --git a/x11-fm/xnc/pkg-descr b/x11-fm/xnc/pkg-descr
index d915977b5767..190cca00e5af 100644
--- a/x11-fm/xnc/pkg-descr
+++ b/x11-fm/xnc/pkg-descr
@@ -7,7 +7,7 @@ The IVES - file viewer and editor for X Window included, provides a
 comprehensive way to view and edit images in many different formats: GIF,
 JPEG, PCX, BMP, XBM, XPM, TIFF, TGA, PCD, PNG.
 
-WWW: http://www.xnc.dubna.su
+WWW: http://xnc.dubna.su
 
 --Dima
 dima@chg.ru
diff --git a/x11-fm/xnc/pkg-plist b/x11-fm/xnc/pkg-plist
index a58bd4505dd5..5779ccc14186 100644
--- a/x11-fm/xnc/pkg-plist
+++ b/x11-fm/xnc/pkg-plist
@@ -1,4 +1,3 @@
-bin/findslave.xnc
 bin/users.xnc
 bin/groups.xnc
 bin/rpm.xnc
@@ -12,6 +11,7 @@ bin/vs
 bin/xncsetup
 bin/xjpegroot
 bin/xnlaunch
+lib/libxncfive.so
 share/doc/xnc/index.html
 share/doc/xnc/doc1.html
 share/doc/xnc/doc2.html