Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Sep 2000 13:36:08 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/21371: Update port: net/mars_nwe to 0.99.20
Message-ID:  <20000918203608.E0E6B37B423@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         21371
>Category:       ports
>Synopsis:       Update port: net/mars_nwe to 0.99.20
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 18 13:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.99.20

New file:
patches/patch-ab

Remove file:
scripts/configure

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/net/mars_nwe/Makefile net/mars_nwe/Makefile
--- /usr/ports/net/mars_nwe/Makefile	Fri Jul  7 21:23:57 2000
+++ net/mars_nwe/Makefile	Tue Sep 19 02:15:01 2000
@@ -6,44 +6,51 @@
 #
 
 PORTNAME=	mars_nwe
-PORTVERSION=	0.99.b19
+PORTVERSION=	0.99.20
 CATEGORIES=	net
-MASTER_SITES=	http://www.compu-art.de/download/ \
+MASTER_SITES=	ftp://www.compu-art.de/mars_nwe/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/ncpfs/mars_nwe/ \
 		ftp://ftp.butya.kz/pub/mars_nwe/
-DISTNAME=	mars_nwe-0.99.pl19
+DISTNAME=	${PORTNAME}-0.99.pl20
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	bp@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/mars_nwe
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-PLIST=	${WRKDIR}/PLIST.DYN
+MAKE_ENV=	MAKE="${MAKE}" CC="${CC}"
+
+PLIST=		${WRKDIR}/PLIST.DYN
 
 NDOCDIR=	${PREFIX}/share/doc/mars_nwe
 
-do-build:
-	@(cd ${WRKSRC} && ${MAKE} all)
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/examples/config.h
 
-do-install:
-	@(cd ${WRKSRC} && ./mk.li install)
-	@${INSTALL_DATA} ${WRKSRC}/examples/nw.ini ${PREFIX}/etc/nwserv.conf.example
-	@${ECHO} "Please read details in ${WORKDIR}/mars_nwe/doc directory."
+pre-build:
+.for file in config.h mk.li nw.ini
+	@${CP} -f ${WRKSRC}/examples/${file} ${WRKSRC}/${file}
+.endfor
 
 pre-install:
-	@cp ${PKGDIR}/PLIST ${WRKDIR}/PLIST.DYN
+	@${CP} ${PKGDIR}/PLIST ${WRKDIR}/PLIST.DYN
 .if !defined(NOPORSDOCS)
-	@cat ${PKGDIR}/PLIST.DOC >> ${WRKDIR}/PLIST.DYN
+	@${CAT} ${PKGDIR}/PLIST.DOC >> ${WRKDIR}/PLIST.DYN
 .endif
 
+do-install:
+.for file in ncpserv nwbind nwconn nwclient nwserv
+	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/sbin
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/examples/nw.ini ${PREFIX}/etc/nwserv.conf.example
+	@${ECHO_MSG} "Please read details in ${WRKDIR}/mars_nwe/doc directory."
+
 post-install:
-	@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" \
-		${FILESDIR}/nwserv.sh \
-		>${PREFIX}/etc/rc.d/nwserv.sh
-	@${CHMOD} 0755 ${PREFIX}/etc/rc.d/nwserv.sh
+	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \
+		${FILESDIR}/nwserv.sh > ${PREFIX}/etc/rc.d/nwserv.sh
+	@${CHMOD} 0751 ${PREFIX}/etc/rc.d/nwserv.sh
 .if !defined(NOPORTDOCS)
-	@if ! [ -d ${NDOCDIR} ]; then ${MKDIR} ${NDOCDIR}; fi
-	${RM} -f ${WRKSRC}/doc/*.orig
+	@${MKDIR} ${NDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${NDOCDIR}
 .endif
 	@${ECHO_MSG} "Look in ${NDOCDIR} for documentation."
diff -urN /usr/ports/net/mars_nwe/files/md5 net/mars_nwe/files/md5
--- /usr/ports/net/mars_nwe/files/md5	Fri Jul  7 21:23:58 2000
+++ net/mars_nwe/files/md5	Tue Sep 19 02:06:29 2000
@@ -1 +1 @@
-MD5 (mars_nwe-0.99.pl19.tgz) = 3811a245364538d476255e55f40d360b
+MD5 (mars_nwe-0.99.pl20.tgz) = 98b3bf022233035ce12a834c689605e5
diff -urN /usr/ports/net/mars_nwe/files/nwserv.sh net/mars_nwe/files/nwserv.sh
--- /usr/ports/net/mars_nwe/files/nwserv.sh	Tue May 16 16:45:36 2000
+++ net/mars_nwe/files/nwserv.sh	Tue Sep 19 02:15:33 2000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PREFIX=/usr/local
+PREFIX=%%PREFIX%%
 
 PROG=${PREFIX}/sbin/nwserv
 
diff -urN /usr/ports/net/mars_nwe/patches/patch-aa net/mars_nwe/patches/patch-aa
--- /usr/ports/net/mars_nwe/patches/patch-aa	Fri Jul  7 21:23:58 2000
+++ net/mars_nwe/patches/patch-aa	Fri Aug 11 03:17:38 2000
@@ -1,25 +1,3 @@
-Index: doc/README.FREEBSD
-===================================================================
-RCS file: /usr/local/cvsrp/mars/doc/README.FREEBSD,v
-retrieving revision 1.1.1.3
-retrieving revision 1.5
-diff -u -r1.1.1.3 -r1.5
---- doc/README.FREEBSD	1999/06/04 09:38:04	1.1.1.3
-+++ doc/README.FREEBSD	1999/06/04 09:42:09	1.5
-@@ -44,7 +44,6 @@
- with switch '-s'. Please use only patched version of IPXrouted if you 
- are run 2.2.8 or 3.x of FreeBSD.
- 
--
- 	4. Client configuration
- 	
- 	This port of Mars_nwe was tested with VLM, Client32 and
-Index: examples/config.h
-===================================================================
-RCS file: /usr/local/cvsrp/mars/examples/config.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
 --- examples/config.h	1999/01/28 06:21:38	1.1.1.1
 +++ examples/config.h	1999/01/28 06:23:09	1.2
 @@ -11,9 +11,9 @@
@@ -27,9 +5,9 @@
  # define PATHNAME_BINDERY "."        /* directory for bindery-files        */
  #else
 -# define FILENAME_NW_INI  "/etc/nwserv.conf"
-+# define FILENAME_NW_INI  "/usr/local/etc/nwserv.conf"
++# define FILENAME_NW_INI  "%%PREFIX%%/etc/nwserv.conf"
                                       /* full name of ini (conf) file       */
 -# define PATHNAME_PROGS   "/usr/sbin" /* where to find the executables     */
-+# define PATHNAME_PROGS   "/usr/local/sbin" /* where to find the executables     */
++# define PATHNAME_PROGS   "%%PREFIX%%/sbin" /* where to find the executables     */
  # define PATHNAME_BINDERY "/var/nwserv/db"  /* directory for bindery-files        */
  #endif
diff -urN /usr/ports/net/mars_nwe/patches/patch-ab net/mars_nwe/patches/patch-ab
--- /usr/ports/net/mars_nwe/patches/patch-ab	Thu Jan  1 09:00:00 1970
+++ net/mars_nwe/patches/patch-ab	Fri Aug 11 22:00:02 2000
@@ -0,0 +1,22 @@
+--- examples/mk.li.orig	Sat Jan 15 20:11:20 2000
++++ examples/mk.li	Fri Aug 11 21:59:51 2000
+@@ -97,8 +97,8 @@
+    freebsd)
+      V_VPATH=".."
+      OBJDIR="obj"
+-     CC=gcc
+-     CPP="gcc -E"
++     CC="$CC"
++     CPP="$CC -E"
+      if [ "x$CFLAGS" = "x" ]; then
+        CFLAGS="native"
+      fi
+@@ -108,7 +108,7 @@
+      CRYPTLIB="-lcrypt  -lipx"
+ 
+      NSLLIB=""
+-     MAKE=make
++     MAKE="$MAKE"
+      TMP="./"
+      INSTALL="install -c"
+      ;;
diff -urN /usr/ports/net/mars_nwe/pkg/PLIST net/mars_nwe/pkg/PLIST
--- /usr/ports/net/mars_nwe/pkg/PLIST	Wed May 17 03:39:13 2000
+++ net/mars_nwe/pkg/PLIST	Fri Aug 11 04:38:22 2000
@@ -1,7 +1,7 @@
 etc/nwserv.conf.example
 etc/rc.d/nwserv.sh
-sbin/nwserv
 sbin/ncpserv
 sbin/nwbind
 sbin/nwclient
 sbin/nwconn
+sbin/nwserv
diff -urN /usr/ports/net/mars_nwe/scripts/configure net/mars_nwe/scripts/configure
--- /usr/ports/net/mars_nwe/scripts/configure	Wed Jan 27 10:27:42 1999
+++ net/mars_nwe/scripts/configure	Thu Jan  1 09:00:00 1970
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cp ${WRKSRC}/examples/config.h ${WRKSRC}/config.h
-cp ${WRKSRC}/examples/nw.ini ${WRKSRC}/nw.ini
-cp ${WRKSRC}/examples/mk.li ${WRKSRC}/mk.li


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000918203608.E0E6B37B423>