6 files changed, 67 insertions, 43 deletions

diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index 0ef3d25dd228..458e76d647d0 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -1,60 +1,40 @@
 # New ports collection makefile for:	xnc
-# Version required:	4.0.8
+# Version required:	4.2.1
 # Date created:		5 February 1999
 # Whom:			Dima Sivachenko	<dima@chg.ru>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xnc-4.0.8.src
-PKGNAME=	xnc-4.0.8
+DISTNAME=	xnc-4.2.1.src
+PKGNAME=	xnc-4.2.1
 CATEGORIES=	x11-fm
-MASTER_SITES=	ftp://ftp.chg.ru/pub/Linux/sunsite/X11/desktop/	\
+MASTER_SITES=	http://www.xnc.dubna.su/src/ \
+		ftp://ftp.chg.ru/pub/Linux/sunsite/X11/desktop/	\
 		ftp://sunsite.unx.edu/pub/Linux/X11/desktop/
 
-MAINTAINER=	dima@chg.ru
+MAINTAINER=	dima@Chg.RU
 
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip		\
-		unzip:${PORTSDIR}/archivers/unzip	\
-		rpm:${PORTSDIR}/misc/rpm		\
-		rar:${PORTSDIR}/archivers/rar		\
-		unarj:${PORTSDIR}/archivers/unarj	\
-		lha:${PORTSDIR}/archivers/lha		\
-		bzip2:${PORTSDIR}/archivers/bzip2
+# xnc will use the following programs if you have them installed.
+#RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip		\
+#		unzip:${PORTSDIR}/archivers/unzip	\
+#		rpm:${PORTSDIR}/misc/rpm		\
+#		rar:${PORTSDIR}/archivers/rar		\
+#		unarj:${PORTSDIR}/archivers/unarj	\
+#		lha:${PORTSDIR}/archivers/lha		\
+#		bzip2:${PORTSDIR}/archivers/bzip2
 
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME}
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 
-do-install:
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/findslave.xnc ${PREFIX}/bin
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/users.xnc ${PREFIX}/bin
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/groups.xnc ${PREFIX}/bin
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/rpm.xnc ${PREFIX}/bin
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/zips.xnc ${PREFIX}/bin
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/gzip.xnc ${PREFIX}/bin
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/bzip.xnc ${PREFIX}/bin
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/nc ${PREFIX}/bin/xnc
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/ives/ives ${PREFIX}/bin
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/ives/es ${PREFIX}/bin
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/ives/vs ${PREFIX}/bin
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/xsetup/xncsetup ${PREFIX}/bin
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/xjroot/xjpegroot ${PREFIX}/bin
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/launch/xnlaunch ${PREFIX}/bin
-		@ ${INSTALL_MAN} ${WRKSRC}/xnc.1 ${MAN1PREFIX}/man/cat1
-		@ ${GZIP_CMD} ${MAN1PREFIX}/man/cat1/xnc.1
-		@ ${INSTALL_MAN} ${WRKSRC}/ives/ives.1 ${MAN1PREFIX}/man/cat1
-		@ ${GZIP_CMD} ${MAN1PREFIX}/man/cat1/ives.1
-		@ ${INSTALL_MAN} ${WRKSRC}/xjroot/xjpegroot.1 ${MAN1PREFIX}/man/cat1
-		@ ${GZIP_CMD} ${MAN1PREFIX}/man/cat1/xjpegroot.1
-		@ ${INSTALL_MAN} ${WRKSRC}/launch/xnlaunch.1 ${MAN1PREFIX}/man/cat1
-		@ ${GZIP_CMD} ${MAN1PREFIX}/man/cat1/xnlaunch.1
+MAN1=		es.1 ives.1 vs.1 xjpegroot.1 xnc.1 xnlaunch.1
 
 post-install:
 .if !defined(NOPORTDOCS)
 		${MKDIR} ${PREFIX}/share/doc/xnc
 		${INSTALL_DATA} ${WRKSRC}/Docs/* ${PREFIX}/share/doc/xnc
 .endif
+		@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-fm/xnc/distinfo b/x11-fm/xnc/distinfo
index 21e8e06d69a5..e6a9303531bb 100644
--- a/x11-fm/xnc/distinfo
+++ b/x11-fm/xnc/distinfo
@@ -1 +1 @@
-MD5 (xnc-4.0.8.src.tar.gz) = fbadf952e02e486c02800001421d5d8e
+MD5 (xnc-4.2.1.src.tar.gz) = 0455bf1aacc2403beb2404a420312b8c
diff --git a/x11-fm/xnc/files/patch-ac b/x11-fm/xnc/files/patch-ac
new file mode 100644
index 000000000000..f79d78a6f6a0
--- /dev/null
+++ b/x11-fm/xnc/files/patch-ac
@@ -0,0 +1,11 @@
+--- filedir/makefile.in.orig	Wed Feb 16 15:38:53 2000
++++ filedir/makefile.in	Wed Feb 16 15:39:08 2000
+@@ -34,7 +34,7 @@
+ @MCOMMON@
+ 
+ VERSION	= 3.20.1
+-MAGIC	= /usr/share/magic
++MAGIC	= /usr/share/misc/magic
+ #MAGIC	= /usr/local/etc/magic
+ 
+ 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
new file mode 100644
index 000000000000..39bfd50ec056
--- /dev/null
+++ b/x11-fm/xnc/files/patch-ad
@@ -0,0 +1,37 @@
+--- Makefile.in.orig	Wed Feb 16 16:16:31 2000
++++ Makefile.in	Wed Feb 16 16:18:27 2000
+@@ -170,22 +170,22 @@
+ 
+ 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)
+-	$(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
+ 	$(INSM) ./yo-man/*.1 $(INSTMAN)/man1
+-	$(INS) ./ives/ives $(INSTDIR)
+-	$(INS) ./ives/es $(INSTDIR)
+-	$(INS) ./ives/vs $(INSTDIR)
+-	$(INS) ./xsetup/xncsetup $(INSTDIR)
+-	$(INS) ./xjroot/xjpegroot $(INSTDIR)
+-	$(INS) ./launch/xnlaunch $(INSTDIR)
+-	/bin/sh ./replace.script
++	$(INSTALL_PROGRAM) ./ives/ives $(INSTDIR)
++	$(INSTALL_PROGRAM) ./ives/es $(INSTDIR)
++	$(INSTALL_PROGRAM) ./ives/vs $(INSTDIR)
++	$(INSTALL_PROGRAM) ./xsetup/xncsetup $(INSTDIR)
++	$(INSTALL_PROGRAM) ./xjroot/xjpegroot $(INSTDIR)
++	$(INSTALL_PROGRAM) ./launch/xnlaunch $(INSTDIR)
++#	/bin/sh ./replace.script
+ 	echo "Don't foget run 'xncsetup' before starting XNC"
+ 
+ install-rpm:
diff --git a/x11-fm/xnc/pkg-message b/x11-fm/xnc/pkg-message
index dfd481dc5fa6..8bb07c2ccfcb 100644
--- a/x11-fm/xnc/pkg-message
+++ b/x11-fm/xnc/pkg-message
@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
-Attention! EVERY user who wants to use xnc should first execute 'xncsetup'
-from X-Window to configure his/her own profile.
+| Attention! EVERY user who wants to use xnc should first execute 'xncsetup'  |
+| from X-Window to configure his/her own profile.                             |
 -------------------------------------------------------------------------------
diff --git a/x11-fm/xnc/pkg-plist b/x11-fm/xnc/pkg-plist
index a5aeaf6e90d3..a58bd4505dd5 100644
--- a/x11-fm/xnc/pkg-plist
+++ b/x11-fm/xnc/pkg-plist
@@ -22,7 +22,3 @@ share/doc/xnc/doc6.html
 share/doc/xnc/doc7.html
 share/doc/xnc/doc8.html
 @dirrm share/doc/xnc
-man/cat1/xnc.1.gz
-man/cat1/ives.1.gz
-man/cat1/xjpegroot.1.gz
-man/cat1/xnlaunch.1.gz