4 files changed, 64 insertions, 173 deletions

diff --git a/sysutils/nwclient602/Makefile b/sysutils/nwclient602/Makefile
index 0a0427c1415c..54fdd8531dd0 100644
--- a/sysutils/nwclient602/Makefile
+++ b/sysutils/nwclient602/Makefile
@@ -7,44 +7,82 @@
 
 PORTNAME=	nwclient
 PORTVERSION=	6.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.feral.com/pub/networker/freebsd/freebsd_40/
-ARCH!=		uname -m
 DISTNAME=	nwclient-${PORTVERSION}-freebsd-${ARCH}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
+.endif
+
 NO_BUILD=	yes
+ONLY_FOR_ARCHS=   alpha i386
+
+MAN1=		rapgen.1
+MAN3=		nsr_getdate.3
+MAN5=		mm_data.5 nsr.5 nsr_archive_request.5 nsr_client.5 nsr_data.5 \
+		nsr_device.5 nsr_directive.5 nsr_group.5 nsr_jukebox.5 \
+		nsr_label.5 nsr_layout.5 nsr_license.5 nsr_migration.5 \
+		nsr_notification.5 nsr_policy.5 nsr_pool.5 nsr_regexp.5 \
+		nsr_resource.5 nsr_schedule.5 nsr_service.5 nsr_stage.5 \
+		nsr_storage_node.5 resource.5
+MAN8=		ansrd.8 changers.8 dasadmin.8 EMASS_silo.8 emcdiscover.8 \
+		erase.8 hpflip.8 IBM_silo.8 ielem.8 inquire.8 jbconfig.8 \
+		jbexercise.8 jbinfo.8 ldunld.8 lgtolic.8 lgtolmd.8 libscsi.8 \
+		libsji.8 libstlemass.8 libstlibm.8 libstlstk.8 lrescan.8 \
+		lusbinfo.8 lusdebug.8 lusmode.8 mini_el.8 mminfo.8 mmlocate.8\
+		mmpool.8 mmrecov.8 msense.8 networker.8 nmi_config.8 nsr.8 \
+		nsr_crash.8 nsr_ize.8 nsr_shutdown.8 nsradmin.8 nsralist.8 \
+ 		nsrarchive.8 nsrcap.8 nsrcat.8 nsrck.8 nsrclone.8 nsrd.8 \
+		nsrdb2.8 nsrdbmi.8 nsrdocrc.8 nsrexec.8 nsrexecd.8 nsrhsmck.8 \
+		nsrhsmls.8 nsrib.8 nsriba.8 nsrim.8 nsrindexasm.8 nsrindexd.8 \
+		nsrinfo.8 nsrjb.8 nsrlic.8 nsrls.8 nsrmig.8 nsrmm.8 nsrmmd.8 \
+		nsrmmdbasm.8 nsrmmdbd.8 nsrmon.8 nsrndmp_recover.8 \
+		nsrndmp_save.8 nsrnmo.8 nsrnotesrc.8 nsrnotesv.8 nsrpmig.8 \
+		nsrports.8 nsrretrieve.8 nsrssc.8 nsrstage.8 nsrsyb.8 \
+		nsrsybcc.8 nsrsybrc.8 nsrsybsv.8 nsrtrap.8 nsrwatch.8  \
+		nwadmin.8 nwarchive.8 nwbackup.8 nwrecover.8 nwretrieve.8 \
+		oraemcasm.8 oraemcmap.8 pmode.8 preclntsave.8 pstclntsave.8 \
+		rap.8 rapcheck.8 rapd.8 rapxfer.8 recover.8 relem.8 \
+		sapclone.8 save.8 savefs.8 savegrp.8 savepnpc.8 scanner.8 \
+		sjidopen.8 sjiielm.8 sjiinq.8 sjirdp.8 sjirdtag.8 sjirelem.8 \
+		sjirjc.8 ssi.8 stk_eject.8 STK_silo.8 stli.8 tapeexercise.8 \
+		tur.8 uasm.8 writebuf.8
 
 post-patch:
-	@sed -e "s,^ROOTDIR.*$$,ROOTDIR=${PREFIX}," ${WRKSRC}/networker.sh >\
-		${WRKDIR}/NWCTMP && chmod +w ${WRKSRC}/networker.sh && \
-		cp ${WRKDIR}/NWCTMP ${WRKSRC}/networker.sh && \
-		chmod -w ${WRKSRC}/networker.sh
+	@${SED} -e "s,^ROOTDIR.*$$,ROOTDIR=${PREFIX}," ${WRKSRC}/networker.sh >\
+		${WRKDIR}/NWCTMP && ${CHMOD} +w ${WRKSRC}/networker.sh && \
+		${CP} ${WRKDIR}/NWCTMP ${WRKSRC}/networker.sh && \
+		${CHMOD} -w ${WRKSRC}/networker.sh
 
 do-install:
-	@mkdir -p /usr/local/nsr/bin /usr/local/man/man8 /usr/local/etc/rc.d
-	@cd ${WRKSRC} && tar cf - gls | \
-		(cd /usr/local/nsr && tar --unlink -xpf -)
-	@cd ${WRKSRC}/${ARCH} && tar cf - . | \
-		(cd /usr/local/nsr/bin && tar --unlink -xpf -)
-	@cd ${WRKSRC} && tar cf - networker.sh | \
-		(cd /usr/local/etc/rc.d  && tar --unlink -xpf -)
-	@cd ${WRKSRC}/catman && tar cf - *.1 | \
-		(cd /usr/local/man/cat1  && tar --unlink -xpf -)
-	@cd ${WRKSRC}/catman && tar cf - *.3 | \
-		(cd /usr/local/man/cat3  && tar --unlink -xpf -)
-	@cd ${WRKSRC}/catman && tar cf - *.5 | \
-		(cd /usr/local/man/cat5  && tar --unlink -xpf -)
-	@cd ${WRKSRC}/catman && tar cf - *.8 | \
-		(cd /usr/local/man/cat8  && tar --unlink -xpf -)
+	@${MKDIR} ${PREFIX}/nsr/bin ${PREFIX}/man/man8 ${PREFIX}/etc/rc.d
+	@cd ${WRKSRC} && ${TAR} cf - gls | \
+		(cd ${PREFIX}/nsr && ${TAR} --unlink -xpf -)
+	@cd ${WRKSRC}/${ARCH} && ${TAR} cf - . | \
+		(cd ${PREFIX}/nsr/bin && ${TAR} --unlink -xpf -)
+	@cd ${WRKSRC} && ${TAR} cf - networker.sh | \
+		(cd ${PREFIX}/etc/rc.d  && ${TAR} --unlink -xpf -)
+	@cd ${WRKSRC}/catman && ${TAR} cf - *.1 | \
+		(cd ${PREFIX}/man/man1  && ${TAR} --unlink -xpf -)
+	@cd ${WRKSRC}/catman && ${TAR} cf - *.3 | \
+		(cd ${PREFIX}/man/man3  && ${TAR} --unlink -xpf -)
+	@cd ${WRKSRC}/catman && ${TAR} cf - *.5 | \
+		(cd ${PREFIX}/man/man5  && ${TAR} --unlink -xpf -)
+	@cd ${WRKSRC}/catman && ${TAR} cf - *.8 | \
+		(cd ${PREFIX}/man/man8  && ${TAR} --unlink -xpf -)
 
 post-install:
-	@sed -e "s,ROOTDIR,${PREFIX}," < ${PKGMESSAGE}
-	@cd / && rm -f nsr && ln -s ${PREFIX}/nsr
+	@${SED} -e "s,ROOTDIR,${PREFIX}," < ${PKGMESSAGE}
+	@cd / && ${RM} -f nsr && ${LN} -s ${PREFIX}/nsr
 
 pre-deinstall:
-	rm -f /nsr
+	${RM} -f /nsr
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/nwclient602/pkg-comment b/sysutils/nwclient602/pkg-comment
index 2ea725a0a1b3..afce0033adf2 100644
--- a/sysutils/nwclient602/pkg-comment
+++ b/sysutils/nwclient602/pkg-comment
@@ -1 +1 @@
-network backup client to NetWorker servers
+Network backup client to NetWorker servers
diff --git a/sysutils/nwclient602/pkg-message b/sysutils/nwclient602/pkg-message
index 0df3272fbfce..e1054d9518c5 100644
--- a/sysutils/nwclient602/pkg-message
+++ b/sysutils/nwclient602/pkg-message
@@ -26,7 +26,6 @@ to restrict the access rights to servers you want to have access
 to this machine.
 
 This release is known to work under FreeBSD 4.4. It should work
-under FreeBSD-4.3. It should also work under under FreeBSD-5.0,
-but please be sure to install the 4.X compat libraries.
+under FreeBSD-4.3. It should also work under FreeBSD-5.0.
 
 -------------------------------------------------------------------------------
diff --git a/sysutils/nwclient602/pkg-plist b/sysutils/nwclient602/pkg-plist
index 18afd27b0247..569b0368d57b 100644
--- a/sysutils/nwclient602/pkg-plist
+++ b/sysutils/nwclient602/pkg-plist
@@ -31,152 +31,6 @@ nsr/bin/savepnpc
 nsr/bin/uasm
 nsr/gls/cm/registry
 nsr/gls/lc/os/portable/C
-man/cat8/ansrd.8
-man/cat8/changers.8
-man/cat8/dasadmin.8
-man/cat8/EMASS_silo.8
-man/cat8/emcdiscover.8
-man/cat8/erase.8
-man/cat8/hpflip.8
-man/cat8/IBM_silo.8
-man/cat8/ielem.8
-man/cat8/inquire.8
-man/cat8/jbconfig.8
-man/cat8/jbexercise.8
-man/cat8/jbinfo.8
-man/cat8/ldunld.8
-man/cat8/lgtolic.8
-man/cat8/lgtolmd.8
-man/cat8/libscsi.8
-man/cat8/libsji.8
-man/cat8/libstlemass.8
-man/cat8/libstlibm.8
-man/cat8/libstlstk.8
-man/cat8/lrescan.8
-man/cat8/lreset.8
-man/cat8/lusbinfo.8
-man/cat8/lusdebug.8
-man/cat8/lusmode.8
-man/cat8/mini_el.8
-man/cat8/mminfo.8
-man/cat8/mmlocate.8
-man/cat8/mmpool.8
-man/cat8/mmrecov.8
-man/cat8/msense.8
-man/cat8/networker.8
-man/cat8/nmi_config.8
-man/cat8/nsr.8
-man/cat8/nsr_crash.8
-man/cat8/nsr_ize.8
-man/cat8/nsr_shutdown.8
-man/cat8/nsradmin.8
-man/cat8/nsralist.8
-man/cat8/nsrarchive.8
-man/cat8/nsrcap.8
-man/cat8/nsrcat.8
-man/cat8/nsrck.8
-man/cat8/nsrclone.8
-man/cat8/nsrd.8
-man/cat8/nsrdb2.8
-man/cat8/nsrdbmi.8
-man/cat8/nsrdocrc.8
-man/cat8/nsrexec.8
-man/cat8/nsrexecd.8
-man/cat8/nsrhsmck.8
-man/cat8/nsrhsmls.8
-man/cat8/nsrib.8
-man/cat8/nsriba.8
-man/cat8/nsrim.8
-man/cat8/nsrindexasm.8
-man/cat8/nsrindexd.8
-man/cat8/nsrinfo.8
-man/cat8/nsrjb.8
-man/cat8/nsrlic.8
-man/cat8/nsrls.8
-man/cat8/nsrmig.8
-man/cat8/nsrmm.8
-man/cat8/nsrmmd.8
-man/cat8/nsrmmdbasm.8
-man/cat8/nsrmmdbd.8
-man/cat8/nsrmon.8
-man/cat8/nsrndmp_recover.8
-man/cat8/nsrndmp_save.8
-man/cat8/nsrnmo.8
-man/cat8/nsrnotesrc.8
-man/cat8/nsrnotesv.8
-man/cat8/nsrpmig.8
-man/cat8/nsrports.8
-man/cat8/nsrretrieve.8
-man/cat8/nsrssc.8
-man/cat8/nsrstage.8
-man/cat8/nsrsyb.8
-man/cat8/nsrsybcc.8
-man/cat8/nsrsybrc.8
-man/cat8/nsrsybsv.8
-man/cat8/nsrtrap.8
-man/cat8/nsrwatch.8
-man/cat8/nwadmin.8
-man/cat8/nwarchive.8
-man/cat8/nwbackup.8
-man/cat8/nwrecover.8
-man/cat8/nwretrieve.8
-man/cat8/oraemcasm.8
-man/cat8/oraemcmap.8
-man/cat8/pmode.8
-man/cat8/preclntsave.8
-man/cat8/pstclntsave.8
-man/cat8/rap.8
-man/cat8/rapcheck.8
-man/cat8/rapd.8
-man/cat8/rapxfer.8
-man/cat8/recover.8
-man/cat8/relem.8
-man/cat8/sapclone.8
-man/cat8/save.8
-man/cat8/savefs.8
-man/cat8/savegrp.8
-man/cat8/savepnpc.8
-man/cat8/scanner.8
-man/cat8/sjidopen.8
-man/cat8/sjiielm.8
-man/cat8/sjiinq.8
-man/cat8/sjirdp.8
-man/cat8/sjirdtag.8
-man/cat8/sjirelem.8
-man/cat8/sjirjc.8
-man/cat8/ssi.8
-man/cat8/stk_eject.8
-man/cat8/STK_silo.8
-man/cat8/stli.8
-man/cat8/tapeexercise.8
-man/cat8/tur.8
-man/cat8/uasm.8
-man/cat8/writebuf.8
-man/cat5/mm_data.5
-man/cat5/nsr.5
-man/cat5/nsr_archive_request.5
-man/cat5/nsr_client.5
-man/cat5/nsr_data.5
-man/cat5/nsr_device.5
-man/cat5/nsr_directive.5
-man/cat5/nsr_group.5
-man/cat5/nsr_jukebox.5
-man/cat5/nsr_label.5
-man/cat5/nsr_layout.5
-man/cat5/nsr_license.5
-man/cat5/nsr_migration.5
-man/cat5/nsr_notification.5
-man/cat5/nsr_policy.5
-man/cat5/nsr_pool.5
-man/cat5/nsr_regexp.5
-man/cat5/nsr_resource.5
-man/cat5/nsr_schedule.5
-man/cat5/nsr_service.5
-man/cat5/nsr_stage.5
-man/cat5/nsr_storage_node.5
-man/cat5/resource.5
-man/cat1/rapgen.1
-man/cat3/nsr_getdate.3
 @dirrm nsr/bin
 @dirrm nsr/gls/cm
 @dirrm nsr/gls/lc/os/portable