Date: Tue, 25 Jan 2000 22:06:09 +0100 (CET) From: assar@stacken.kth.se To: FreeBSD-gnats-submit@freebsd.org Cc: assar@stacken.kth.se, thepish@freebsd.org, obrien@freebsd.org Subject: ports/16355: update for arla port to 0.30 Message-ID: <200001252106.WAA47163@hunahpu.sics.se>
next in thread | raw e-mail | index | archive | help
>Number: 16355 >Category: ports >Synopsis: update for arla port to 0.30 >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Jan 25 13:10:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Assar Westerlund >Release: FreeBSD 4.0-CURRENT i386 >Organization: none >Environment: stable and current >Description: Here's an update to the arla port to arla 0.30. It builds (when I test it) on stable and current. >How-To-Repeat: >Fix: diff -N -ruw arla.orig/Makefile arla/Makefile --- arla.orig/Makefile Fri Dec 10 20:27:08 1999 +++ arla/Makefile Tue Jan 25 21:36:12 2000 @@ -6,7 +6,7 @@ # $FreeBSD: ports/net/arla/Makefile,v 1.8 1999/12/10 19:27:08 obrien Exp $ # -DISTNAME= arla-0.28 +DISTNAME= arla-0.30 CATEGORIES= net MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/ diff -N -ruw arla.orig/files/md5 arla/files/md5 --- arla.orig/files/md5 Fri Dec 10 20:27:09 1999 +++ arla/files/md5 Tue Jan 25 21:06:37 2000 @@ -1 +1 @@ -MD5 (arla-0.28.tar.gz) = 49de77ef617ab0caebee2f5401fec4f3 +MD5 (arla-0.30.tar.gz) = 4c2867dcf59a6ece7e9547579069aeac diff -N -ruw arla.orig/patches/patch-ab arla/patches/patch-ab --- arla.orig/patches/patch-ab Wed Sep 9 07:51:30 1998 +++ arla/patches/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,40 +0,0 @@ ---- xfs/bsd/bin/Makefile.in.orig Fri Jul 31 10:07:17 1998 -+++ xfs/bsd/bin/Makefile.in Wed Sep 9 14:32:36 1998 -@@ -10,6 +10,7 @@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @top_srcdir@/mkinstalldirs - -@@ -21,7 +22,7 @@ - transform = @program_transform_name@ - ARLACACHEDIR = @ARLACACHEDIR@ - --XFS_BIN = $(MOUNT_PROG) $(UMOUNT_PROG) @OSF1_FALSE@ startarla -+XFS_BIN = $(MOUNT_PROG) $(UMOUNT_PROG) @OSF1_FALSE@ - - DEFS = @DEFS@ -DDEBUG - CFLAGS = @CFLAGS@ -@@ -37,7 +38,7 @@ - - PROGS = $(MOUNT_PROG) $(UMOUNT_PROG) - --all: $(XFS_BIN) -+all: $(XFS_BIN) startarla - - .c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) -I../../../include -I$(srcdir)/../../../include $< -@@ -65,7 +66,10 @@ - f=`echo $$x | sed '$(transform)'`; \ - $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \ - done -- $(INSTALL_PROGRAM) $(srcdir)/xfs_makedev $(DESTDIR)$(bindir)/xfs_makedev -+ for x in $(srcdir)/xfs_makedev startarla; do \ -+ f=`echo $$x | sed '$(transform)'`; \ -+ $(INSTALL_SCRIPT) $$x $(DESTDIR)$(bindir)/$$f; \ -+ done - - uninstall: - PROG_BIN='$(XFS_BIN)'; for x in $$PROG_BIN; do \ diff -N -ruw arla.orig/patches/patch-ad arla/patches/patch-ad --- arla.orig/patches/patch-ad Fri Dec 10 20:27:10 1999 +++ arla/patches/patch-ad Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- xfs/bsd/xfs_wrap-bsd.c.orig Tue Nov 16 15:29:00 1999 -+++ xfs/bsd/xfs_wrap-bsd.c Fri Dec 10 10:48:27 1999 -@@ -182,7 +182,11 @@ - - #define XFS_DEV_NO 128 - -+#if defined(__FreeBSD__) && __FreeBSD__ >= 4 -+DEV_MODULE(xfsdev, xfs_load, NULL); -+#else - DEV_MODULE(xfsdev, XFS_DEV_NO, NOMAJ, xfs_dev, xfs_load, NULL); -+#endif - - #else /* DEV_MODULE */ - diff -N -ruw arla.orig/patches/patch-ae arla/patches/patch-ae --- arla.orig/patches/patch-ae Fri Dec 10 20:27:11 1999 +++ arla/patches/patch-ae Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ ---- xfs/bsd/Makefile.in.orig Thu Feb 4 13:08:42 1999 -+++ xfs/bsd/Makefile.in Fri Dec 10 11:03:57 1999 -@@ -115,6 +115,9 @@ - f=`echo $$x | sed '$(transform)'`; \ - $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \ - done -+ if test -d /modules; then \ -+ $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)/modules/$(MODULE); \ -+ fi - if test -d /lkm; then \ - $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)/lkm/$(MODULE); \ - fi diff -N -ruw arla.orig/patches/patch-af arla/patches/patch-af --- arla.orig/patches/patch-af Thu Jan 1 01:00:00 1970 +++ arla/patches/patch-af Tue Jan 25 21:32:46 2000 @@ -0,0 +1,15 @@ +--- cf/check-kernel-var.m4 1999/05/15 22:45:22 1.1 ++++ cf/check-kernel-var.m4 2000/01/25 20:31:24 1.2 +@@ -1,10 +1,10 @@ + dnl +-dnl $Id: check-kernel-var.m4,v 1.1 1999/05/15 22:45:22 assar Exp $ ++dnl $Id: check-kernel-var.m4,v 1.2 2000/01/25 20:31:24 assar Exp $ + dnl + + dnl AC_CHECK_KERNEL_VAR(var, type, [includes]) + AC_DEFUN(AC_CHECK_KERNEL_VAR, +-AC_CHECK_KERNEL($1, ac_cv_kernel_var_$1, [extern $2 $1; $2 foo = $1], $4) ++AC_CHECK_KERNEL($1, ac_cv_kernel_var_$1, [extern $2 $1; return $1], $4) + : << END + @@@funcs="$funcs kernel_$1"@@@ + END diff -N -ruw arla.orig/patches/patch-ag arla/patches/patch-ag --- arla.orig/patches/patch-ag Thu Jan 1 01:00:00 1970 +++ arla/patches/patch-ag Tue Jan 25 21:43:39 2000 @@ -0,0 +1,20 @@ +--- configure.orig Tue Jan 25 21:42:08 2000 ++++ configure Tue Jan 25 21:42:42 2000 +@@ -8664,7 +8664,7 @@ + return foo(); + } + int foo() { +-extern int doforce; int foo = doforce; ++extern int doforce; return doforce; + return 0; } + EOF + save_CFLAGS="$CFLAGS" +@@ -8707,7 +8707,7 @@ + return foo(); + } + int foo() { +-extern struct sysent* aout_sysent; struct sysent* foo = aout_sysent; ++extern struct sysent* aout_sysent; return aout_sysent; + return 0; } + EOF + save_CFLAGS="$CFLAGS" >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?200001252106.WAA47163>