Date: Mon, 6 Mar 2000 13:42:39 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/17234: Update port: net/cnet to 1.5p2 (fix ports/17230) Message-ID: <200003062142.NAA30130@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 17234 >Category: ports >Synopsis: Update port: net/cnet to 1.5p2 (fix ports/17230) >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 Mar 6 13:50:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: >Organization: >Environment: >Description: - Update to version 1.5p2 New file: patches/patch-ae patches/patch-af patches/patch-ag Remove file: patches/patch-aa This PR supersedes ports/17230. >How-To-Repeat: >Fix: diff -urN /usr/ports/net/cnet/Makefile net/cnet/Makefile --- /usr/ports/net/cnet/Makefile Tue Aug 31 07:16:03 1999 +++ net/cnet/Makefile Tue Mar 7 06:28:45 2000 @@ -1,31 +1,45 @@ # New ports collection makefile for: cnet -# Version required: 1.4 +# Version required: 1.5p2 # Date created: Feb 8th, 1988 # Whom: jkh # # $FreeBSD: ports/net/cnet/Makefile,v 1.9 1999/08/30 14:22:20 peter Exp $ # -DISTNAME= cnet-1.4-4 -PKGNAME= cnet-1.4p4 -CATEGORIES= net -MASTER_SITES= http://www.cs.uwa.edu.au/pls/cnet/ +DISTNAME= cnet-1.5-2 +PKGNAME= cnet-1.5p2 +CATEGORIES= net tk82 +MASTER_SITES= http://www.cs.uwa.edu.au/cnet/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview \ +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ Xpm.4:${PORTSDIR}/graphics/xpm -WRKSRC= ${WRKDIR}/cnet-1.4 -ALL_TARGET= +USE_X_PREFIX= yes +USE_GMAKE= yes +ALL_TARGET= # empty MAN1= cnet.1 -pre-build: +post-extract: ${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/src - ${MKDIR} ${WRKSRC}/src/freebsd + @${MKDIR} ${WRKSRC}/src/freebsd ${CP} ${FILESDIR}/compile.c ${WRKSRC}/src/freebsd -pre-install: - ${MKDIR} ${PREFIX}/share/examples/cnet +post-patch: + @${PERL} -pi.in \ + -e "s|%%CC%%|${CC}|g;" \ + -e "s|%%PREFIX%%|${PREFIX}|g;" \ + ${WRKSRC}/src/config.h + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/cnet ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/src/cnet.h ${PREFIX}/include + ${INSTALL_MAN} ${WRKSRC}/DOC/cnet.man ${PREFIX}/man/man1/cnet.1 + @${MKDIR} ${PREFIX}/libdata/cnet + ${INSTALL_DATA} ${WRKSRC}/src/tcltk/cnet.tcl ${PREFIX}/libdata/cnet + ${INSTALL_DATA} ${WRKSRC}/src/tcltk/cnet_icon.bmp ${PREFIX}/libdata/cnet + @${MKDIR} ${PREFIX}/share/examples/cnet + ${INSTALL_DATA} ${WRKSRC}/EXAMPLES/* ${PREFIX}/share/examples/cnet .include <bsd.port.mk> diff -urN /usr/ports/net/cnet/files/Makefile.freebsd net/cnet/files/Makefile.freebsd --- /usr/ports/net/cnet/files/Makefile.freebsd Mon Feb 9 05:02:50 1998 +++ net/cnet/files/Makefile.freebsd Tue Mar 7 06:29:44 2000 @@ -1,54 +1,28 @@ # -# The following #defines are for Sun's SunOS, >= SunOS4.1.2 -# CC may be either cc or gcc +# The following #defines are for FreeBSD # +XINCLUDES = -I${X11BASE}/include +XLIBS = -lXpm -lX11 -lm -L${X11BASE}/lib +ANSICC = ${CC} +INCLUDES = -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/tcl8.2 \ + -I${LOCALBASE}/include/tk8.2 +CFLAGS += $(INCLUDES) $(XINCLUDES) -# Uncomment the following line if you wish Tcl/Tk windowing (see config.h) -# -#XINCLUDES = -#XLIBS = -ltcl -ltk -lXpm -lX11 -lm -# -# Uncomment the following line if you wish XView windowing (see config.h) -# -OPENWINHOME = ${X11BASE} -XINCLUDES = -I$(OPENWINHOME)/include -XLIBS = -L$(OPENWINHOME)/lib -lxview -lolgx -lXpm -lX11 -# -# Uncomment the following lines if you wish Motif windowing (see config.h) -# -#XINCLUDES = -I$(X11BASE)/include -#XLIBS = -L$(X11BASE)/lib -lXm -lXt -lXpm -lX11 - - -#CC = cc -CC = gcc -Wall -ansi - -INCLUDES = -CFLAGS = -O $(INCLUDES) $(XINCLUDES) - -#LD = cc -LD = gcc -LIBDIRS = -L/usr/local/lib -LIBS = -lm -lgnuregex +LD = ${CC} +LIBDIRS = -L${LOCALBASE}/lib +LIBS = -ltcl82 -ltk82 -lm -lgnuregex STRIP = strip -BINDIR = /usr/local/bin -MANDIR = /usr/local/man/man1 +BINDIR = ${PREFIX}/bin +MANDIR = ${PREFIX}/man/manl MANEXT = 1 -INCDIR = /usr/local/include +INCDIR = ${PREFIX}/include # ---------------------- No user-serviceable code below ----------------- include Makefile.common - -kultarr: $(NAME) - chmod 711 $(NAME) - rcp -p $(NAME) kultarr:/usr/kultarr/bin/$(NAME) - rcp -p $(NAME) kultarr:/usr/local/bin/$(NAME) - chmod 644 cnet.h DOC/cnet.man - rcp -p cnet.h kultarr:/usr/local/include/cnet.h - rcp -p DOC/cnet.man kultarr:/usr/local/man/manl/cnet.l diff -urN /usr/ports/net/cnet/files/compile.c net/cnet/files/compile.c --- /usr/ports/net/cnet/files/compile.c Mon Feb 9 05:02:50 1998 +++ net/cnet/files/compile.c Tue Mar 7 06:20:10 2000 @@ -1,27 +1,25 @@ #include <dlfcn.h> #include <nlist.h> -static int add_compile_args(ac, av, kflag) int ac; char *av[]; int kflag; +static int add_compile_args(int ac, char *av[], int kflag) { - av[ac++] = "-fPIC"; - av[ac++] = "-I/usr/local/include"; /* XXX GROSS - should use prefix */ + av[ac++] = "-fPIC"; return(ac); } -static int add_link_args(ac, av, kflag) int ac; char *av[]; int kflag; +static int add_link_args(int ac, char *av[], int kflag) { av[ac++] = findenv("CNETLD", CNETLD); - av[ac++] = "cc"; - av[ac++] = "-Bshareable"; + av[ac++] = "ld"; + av[ac++] = "-shared"; return(ac); } -static void data_segments(n, handle, so_filenm) - int n; void *handle; char *so_filenm; +static void data_segments(int n, void *handle, char *so_filenm) { - extern int nlist _PARAMS((const char *, struct nlist *)); + extern int nlist(const char *, struct nlist *); typedef struct _c { char *so_filenm; @@ -48,8 +46,8 @@ nls[2].n_name = (char *)NULL; if(nlist(so_filenm, nls) != 0) { - (void)fprintf(stderr,"%s: cannot load symbols from %s\n", - progname,so_filenm); + fprintf(stderr,"%s: cannot load symbols from %s\n", + argv0,so_filenm); ++nerrors; return; } @@ -59,12 +57,12 @@ cp->length_data = (nls[1].n_value - nls[0].n_value); cp->incore_data = (char *)((long)dlsym(handle,"end") - cp->length_data); cp->original_data = (char *)malloc(cp->length_data); - (void)memcpy(cp->original_data, cp->incore_data, cp->length_data); + memcpy(cp->original_data, cp->incore_data, cp->length_data); cp->next = chd; chd = cp; if(vflag) - (void)fprintf(stderr,"%s dataseg=0x%08lx len(dataseg)=%ld\n", + fprintf(stderr,"%s dataseg=0x%08lx len(dataseg)=%ld\n", so_filenm, (long)cp->incore_data, cp->length_data); found: @@ -73,5 +71,5 @@ np->original_data[0] = cp->original_data; np->private_data[0] = (char *)malloc(cp->length_data); - (void)memcpy(np->private_data[0], cp->original_data, cp->length_data); + memcpy(np->private_data[0], cp->original_data, cp->length_data); } diff -urN /usr/ports/net/cnet/files/md5 net/cnet/files/md5 --- /usr/ports/net/cnet/files/md5 Mon Mar 15 20:38:47 1999 +++ net/cnet/files/md5 Fri Mar 3 06:56:02 2000 @@ -1 +1 @@ -MD5 (cnet-1.4-4.tar.gz) = 939ad439acd8db17bf056616b607c53e +MD5 (cnet-1.5-2.tar.gz) = 746b317d0a86d0288d478dddc658c4f4 diff -urN /usr/ports/net/cnet/patches/patch-aa net/cnet/patches/patch-aa --- /usr/ports/net/cnet/patches/patch-aa Mon Mar 15 20:38:47 1999 +++ net/cnet/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,107 +0,0 @@ -diff -ur src/Makefile src/Makefile ---- src/Makefile Mon Jul 28 00:30:58 1997 -+++ src/Makefile Sun Feb 8 06:04:04 1998 -@@ -18,6 +18,8 @@ - make -f Makefile.decosf1 $(NAME) ; fi - @if uname -s -r | grep "IRIX 5" ; then \ - make -f Makefile.irix5 $(NAME) ; fi -+ @if uname -s -r | grep "FreeBSD" ; then \ -+ make -f Makefile.freebsd $(NAME) ; fi - - install: - @if uname -s | grep "Linux" ; then \ -@@ -33,6 +35,8 @@ - make -f Makefile.decosf1 install ; fi - @if uname -s -r | grep "IRIX 5" ; then \ - make -f Makefile.irix5 install ; fi -+ @if uname -s -r | grep "FreeBSD" ; then \ -+ make -f Makefile.freebsd install ; fi - - - # --------------------------------------------------------------------- -diff -ur src/Makefile.common src/Makefile.common ---- src/Makefile.common Sat Feb 8 19:16:28 1997 -+++ src/Makefile.common Sun Feb 8 07:02:09 1998 -@@ -35,13 +35,10 @@ - - - install: $(NAME) -- cp $(NAME) $(BINDIR)/$(NAME) -- @chmod 711 $(BINDIR)/$(NAME) -- cp $(NAME).h $(INCDIR)/$(NAME).h -- @chmod 644 $(INCDIR)/$(NAME).h -- cp ../DOC/$(NAME).man $(MANDIR)/$(NAME).$(MANEXT) -- @chmod 644 $(MANDIR)/$(NAME).$(MANEXT) -- -+ install -c -m 711 $(NAME) $(BINDIR) -+ install -c -m 644 $(NAME).h $(INCDIR) -+ install -c -m 6400 ../DOC/$(NAME).man $(MANDIR)/$(NAME).$(MANEXT) -+ cp -pr ../EXAMPLES/* ${PREFIX}/share/examples/cnet - - - address.o: $(ALLH) address.c -diff -ur src/config.h src/config.h ---- src/config.h Fri Aug 1 02:42:00 1997 -+++ src/config.h Sun Feb 8 07:05:25 1998 -@@ -27,6 +27,9 @@ - #elif defined(sgi) || defined(__sgi) || defined(__sgi__) - #define USE_IRIX5 - -+#elif defined(__FreeBSD__) -+#define USE_FREEBSD -+ - #elif defined(LINUX) || defined(linux) || defined(__linux__) - #if defined(ELF) || defined(__ELF__) - #define USE_LINUXELF -@@ -48,6 +51,7 @@ - */ - - #define USE_XVIEW -+/* #define USE_MOTIF */ - - - /* Next, define constants such as full pathnames of the C compiler -@@ -76,6 +80,13 @@ - #define CNETLD "/bin/ld" - #define CNETEXTRAOBJ "cnetextra.o" - -+#elif defined(USE_FREEBSD) -+#define OS_DEFINE "-DFREEBSD" -+#define CNETCPP "/usr/libexec/cpp" -+#define CNETCC "/bin/cc" -+#define CNETGCC "/usr/bin/gcc" -+#define CNETLD "/usr/bin/ld" -+ - #elif defined(USE_IRIX5) - #define OS_DEFINE "-DIRIX5" - #define CNETCPP "/usr/lib/cpp" -@@ -123,7 +134,7 @@ - CNETPATH must be defined. - */ - --#define CNETPATH "/home/kidna/include:/home/bison/staff/chris/include" -+#define CNETPATH "/usr/local/include" - - - /* When compiled for Tcl/Tk, the Tcl/Tk script file may be taken from -@@ -204,7 +215,7 @@ - they like the ability to vary these attributes. You decide. - */ - --#define MAY_VARY_LINKATTRS FALSE -+#define MAY_VARY_LINKATTRS TRUE - - - /* You may wish to limit the number of frames that may be "pending" -Only in src: freebsd -diff -ur src/link_windows.c src/link_windows.c ---- src/link_windows.c Thu Jul 24 07:41:01 1997 -+++ src/link_windows.c Sun Feb 8 06:13:35 1998 -@@ -13,6 +13,7 @@ - - #define N_P_LINK_CHOICES 4 - #define N_B_LINK_CHOICES 4 -+#define N_LINK_CHOICES 4 - - static struct { - char *title; diff -urN /usr/ports/net/cnet/patches/patch-ab net/cnet/patches/patch-ab --- /usr/ports/net/cnet/patches/patch-ab Mon Mar 15 20:38:47 1999 +++ net/cnet/patches/patch-ab Tue Mar 7 04:04:42 2000 @@ -5,7 +5,7 @@ #define LENDATA_EVER_0 FALSE +#elif defined(USE_FREEBSD) -+#define NDATASEGS 1 ++#define NDATASEGS 1 +#define LENDATA_EVER_0 FALSE + #elif defined(USE_SOLARIS2) diff -urN /usr/ports/net/cnet/patches/patch-ad net/cnet/patches/patch-ad --- /usr/ports/net/cnet/patches/patch-ad Mon Mar 15 11:03:38 1999 +++ net/cnet/patches/patch-ad Fri Mar 3 19:10:13 2000 @@ -1,6 +1,5 @@ -patch-ad: ---- src/compile.c.orig Sun Jan 26 03:42:23 1997 -+++ src/compile.c Sat Feb 13 02:29:14 1999 +--- src/compile.c.orig Wed Apr 21 23:26:23 1999 ++++ src/compile.c Fri Mar 3 07:16:22 2000 @@ -2,6 +2,7 @@ #include <fcntl.h> @@ -9,25 +8,17 @@ #if !defined(MAXPATHLEN) #define MAXPATHLEN 1024 -@@ -25,6 +26,9 @@ +@@ -26,6 +27,9 @@ #elif defined(USE_IRIX5) #include "irix5/compile.c" +#elif defined(USE_FREEBSD) +#include "freebsd/compile.c" + - #elif defined(USE_LINUXAOUT) - #include "linuxaout/compile.c" + #endif -@@ -263,7 +267,6 @@ - int kflag; char **Cflags, *o_file, *c_file; - { - extern int fork _PARAMS((void)); -- extern int execvp _PARAMS((const char *, char **)); - struct stat stat_c, stat_o; - -@@ -483,6 +486,10 @@ +@@ -141,6 +145,10 @@ { #define RECIEVE "[Rr][Ee][Cc][IiEe][Ee][Vv]" diff -urN /usr/ports/net/cnet/patches/patch-ae net/cnet/patches/patch-ae --- /usr/ports/net/cnet/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ net/cnet/patches/patch-ae Tue Mar 7 04:31:21 2000 @@ -0,0 +1,35 @@ +--- src/config.h.orig Tue Mar 7 04:05:53 2000 ++++ src/config.h Tue Mar 7 04:11:33 2000 +@@ -19,6 +19,9 @@ + #elif defined(sgi) || defined(__sgi) || defined(__sgi__) + #define USE_IRIX5 + ++#elif defined(__FreeBSD__) ++#define USE_FREEBSD ++ + #else + #error Could not determine the operating system in config.h + #endif +@@ -68,6 +71,13 @@ + #define CNETGCC "/usr/local/bin/gcc" + #define CNETLD "/bin/ld" + ++#elif defined(USE_FREEBSD) ++#define OS_DEFINE "-DFREEBSD" ++#define CNETCPP "/usr/libexec/cpp" ++#define CNETCC "%%CC%%" ++#define CNETGCC "%%CC%%" ++#define CNETLD "/usr/bin/ld" ++ + #endif + + +@@ -93,7 +103,7 @@ + CNETPATH must be defined. + */ + +-#define CNETPATH ".:/cslinux/cnetlib:/net/tahoe6/cs78/cnetlib" ++#define CNETPATH ".:%%PREFIX%%/libdata/cnet:%%PREFIX%%/include" + + /* When compiled for Tcl/Tk, the Tcl/Tk script file may be taken from + CNETTCLTK or provided with the -F command-line option. diff -urN /usr/ports/net/cnet/patches/patch-af net/cnet/patches/patch-af --- /usr/ports/net/cnet/patches/patch-af Thu Jan 1 09:00:00 1970 +++ net/cnet/patches/patch-af Fri Mar 3 19:18:16 2000 @@ -0,0 +1,20 @@ +--- src/Makefile.orig Thu Apr 22 00:42:28 1999 ++++ src/Makefile Fri Mar 3 07:06:53 2000 +@@ -14,6 +14,8 @@ + make -f Makefile.osf1 $(NAME) ; fi + @if uname -s -r | grep "IRIX" ; then \ + make -f Makefile.irix5 $(NAME) ; fi ++ @if uname -s -r | grep "FreeBSD" ; then \ ++ $(MAKE) -f Makefile.freebsd $(NAME) ; fi + + install: + @if uname -s -r | grep "Linux" ; then \ +@@ -26,6 +28,8 @@ + make -f Makefile.osf1 install ; fi + @if uname -s -r | grep "IRIX" ; then \ + make -f Makefile.irix5 install ; fi ++ @if uname -s -r | grep "FreeBSD" ; then \ ++ $(MAKE) -f Makefile.freebsd install ; fi + + # --------------------------------------------------------------------- + diff -urN /usr/ports/net/cnet/patches/patch-ag net/cnet/patches/patch-ag --- /usr/ports/net/cnet/patches/patch-ag Thu Jan 1 09:00:00 1970 +++ net/cnet/patches/patch-ag Tue Mar 7 03:25:24 2000 @@ -0,0 +1,9 @@ +--- src/tcltk/link_menu.c.orig Fri Apr 16 05:29:42 1999 ++++ src/tcltk/link_menu.c Tue Mar 7 03:20:25 2000 +@@ -1,5 +1,5 @@ + +-static void link_menu_select _PARAMS((int, int)); ++/* static void link_menu_select _PARAMS((int, int)); */ + + static int tk_link_menu_select(ClientData data, Tcl_Interp *interp, + int argc, char *argv[]) diff -urN /usr/ports/net/cnet/pkg/DESCR net/cnet/pkg/DESCR --- /usr/ports/net/cnet/pkg/DESCR Fri Feb 11 20:25:13 2000 +++ net/cnet/pkg/DESCR Tue Mar 7 04:39:03 2000 @@ -4,4 +4,4 @@ used in, undergraduate computer networking courses by thousands of students since 1991. -WWW: http://www.cs.uwa.edu.au/pls/cnet/ +WWW: http://www.cs.uwa.edu.au/cnet/ diff -urN /usr/ports/net/cnet/pkg/PLIST net/cnet/pkg/PLIST --- /usr/ports/net/cnet/pkg/PLIST Wed Aug 19 07:47:01 1998 +++ net/cnet/pkg/PLIST Tue Mar 7 04:33:39 2000 @@ -1,14 +1,17 @@ bin/cnet include/cnet.h +libdata/cnet/cnet.tcl +libdata/cnet/cnet_icon.bmp share/examples/cnet/AUSTRALIA.MAP share/examples/cnet/CLICK -share/examples/cnet/FAST +share/examples/cnet/EUROPE.MAP share/examples/cnet/FLOODING1 share/examples/cnet/FLOODING2 share/examples/cnet/FLOODING3 share/examples/cnet/KEYBOARD share/examples/cnet/LINKSTATE share/examples/cnet/Makefile +share/examples/cnet/README.flooding share/examples/cnet/STOPANDWAIT share/examples/cnet/T2 share/examples/cnet/TICKTOCK @@ -18,19 +21,14 @@ share/examples/cnet/WORLD share/examples/cnet/WORLD.MAP share/examples/cnet/click.c -share/examples/cnet/cnet.h -share/examples/cnet/cnet.tcl -share/examples/cnet/fast.c share/examples/cnet/flooding.gp share/examples/cnet/flooding1.c -share/examples/cnet/flooding1.dat share/examples/cnet/flooding2.c -share/examples/cnet/flooding2.dat share/examples/cnet/flooding3.c -share/examples/cnet/flooding3.dat share/examples/cnet/keyboard.c share/examples/cnet/linkstate.c share/examples/cnet/protocol.c share/examples/cnet/stopandwait.c share/examples/cnet/ticktock.c @dirrm share/examples/cnet +@dirrm libdata/cnet >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?200003062142.NAA30130>