summaryrefslogtreecommitdiff
path: root/net/arla/patches
diff options
context:
space:
mode:
Diffstat (limited to 'net/arla/patches')
-rw-r--r--net/arla/patches/patch-aa16
-rw-r--r--net/arla/patches/patch-ab16
-rw-r--r--net/arla/patches/patch-ac26
-rw-r--r--net/arla/patches/patch-ad18
-rw-r--r--net/arla/patches/patch-ae25
-rw-r--r--net/arla/patches/patch-af34
-rw-r--r--net/arla/patches/patch-ag34
-rw-r--r--net/arla/patches/patch-ah45
-rw-r--r--net/arla/patches/patch-ai14
-rw-r--r--net/arla/patches/patch-aj15
-rw-r--r--net/arla/patches/patch-ak17
11 files changed, 260 insertions, 0 deletions
diff --git a/net/arla/patches/patch-aa b/net/arla/patches/patch-aa
new file mode 100644
index 00000000000..6fba5e30880
--- /dev/null
+++ b/net/arla/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Do not add a path to the library search path (-L) to find libsl.a. This will
+find kth-krb4's sl library, which is the wrong one.
+
+--- appl/fs/Makefile.in.orig Mon May 29 19:09:12 2000
++++ appl/fs/Makefile.in Mon May 29 19:10:11 2000
+@@ -55,7 +55,7 @@
+ -L../../rx -lrx \
+ -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
+ -L../../lib/ko -lko -L../../util -lutil \
+- -L../../lib/sl -lsl \
++ ../../lib/sl/libsl.a \
+ -L../../lib/roken \
+ $(READLINE_lib) \
+ $(RXKAD_LIBS) \
diff --git a/net/arla/patches/patch-ab b/net/arla/patches/patch-ab
new file mode 100644
index 00000000000..7392d29fbdc
--- /dev/null
+++ b/net/arla/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Do not add a path to the library search path (-L) to find libsl.a. This will
+find kth-krb4's sl library, which is the wrong one.
+
+--- appl/vos/Makefile.in.orig Mon May 29 19:16:56 2000
++++ appl/vos/Makefile.in Mon May 29 19:17:40 2000
+@@ -55,7 +55,7 @@
+ -L../../rx -lrx \
+ -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
+ -L../../lib/ko -lko -L../../util -lutil \
+- -L../../lib/sl -lsl \
++ ../../lib/sl/libsl.a \
+ -L../../lib/roken \
+ $(READLINE_lib) \
+ $(RXKAD_LIBS) \
diff --git a/net/arla/patches/patch-ac b/net/arla/patches/patch-ac
new file mode 100644
index 00000000000..652acf64f04
--- /dev/null
+++ b/net/arla/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Do not install libsl.a and ss/ss.h. There is a conflict with the libsl.a from
+the kth-krb4 package.
+
+--- lib/sl/Makefile.in.orig Mon May 29 21:40:42 2000
++++ lib/sl/Makefile.in Mon May 29 21:50:14 2000
+@@ -58,18 +58,8 @@
+ $(CC) -c $(DEFS) -I../../include -I. -I$(srcdir) $(KRB4_INC_FLAGS) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
+
+ install: all
+- $(MKINSTALLDIRS) $(DESTDIR)$(includedir)/ss
+- $(INSTALL_DATA) $(srcdir)/ss.h $(DESTDIR)$(includedir)/ss/ss.h
+- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+- $(INSTALL) -m 555 $(sl_LIB) $(DESTDIR)$(libdir)/$(sl_LIB)
+- $(INSTALL) -m 555 $(sl_LIB) $(DESTDIR)$(libdir)/$(ss_LIB)
+- $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+- $(INSTALL) -m 0555 $(PROGS) $(DESTDIR)$(bindir)/$(PROGS)
+
+ uninstall:
+- rm -f $(DESTDIR)$(includedir)/ss/ss.h
+- rm -f $(DESTDIR)$(libdir)/$(sl_LIB) $(DESTDIR)$(libdir)/$(ss_LIB)
+- rm -f $(DESTDIR)$(bindir)/$(PROGS)
+
+ TAGS: $(SOURCES)
+ etags $(SOURCES)
diff --git a/net/arla/patches/patch-ad b/net/arla/patches/patch-ad
new file mode 100644
index 00000000000..32fe2ecfc21
--- /dev/null
+++ b/net/arla/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Do not install libacl.a. Conflicts with libacl.a from kth-krb4.
+
+--- lib/acl/Makefile.in.orig Mon May 29 21:52:48 2000
++++ lib/acl/Makefile.in Mon May 29 21:53:22 2000
+@@ -46,11 +46,8 @@
+ $(CC) -c $(DEFS) $(REALCFLAGS) $(PICFLAGS) $(CPPFLAGS) $<
+
+ install: all
+- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+- $(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB)
+
+ uninstall:
+- rm -f $(DESTDIR)$(libdir)/$(LIB)
+
+ TAGS: $(SOURCES)
+ etags $(SOURCES)
diff --git a/net/arla/patches/patch-ae b/net/arla/patches/patch-ae
new file mode 100644
index 00000000000..26038f9ba3c
--- /dev/null
+++ b/net/arla/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Do not install libutil.a and the header files bool.h, hash.h, heap.h, list.h,
+and log.h. There is a potential conflict with other libutils.
+
+--- util/Makefile.in.orig Tue May 30 18:49:46 2000
++++ util/Makefile.in Tue May 30 18:50:13 2000
+@@ -74,17 +74,8 @@
+ libutil_LIB: $(libutil_OBJS)
+
+ install: all
+- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+- $(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/$(LIB)
+- for i in $(HEADERS); do \
+- $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/$$i; \
+- done
+
+ uninstall:
+- rm -f $(DESTDIR)$(libdir)/$(LIB)
+- for i in $(HEADERS); do \
+- rm $(DESTDIR)$(includedir)/$$i; \
+- done
+
+ libutil.a: $(libutil_OBJS)
+ $(AR) cr $@ $(libutil_OBJS)
diff --git a/net/arla/patches/patch-af b/net/arla/patches/patch-af
new file mode 100644
index 00000000000..e4d0d1798c1
--- /dev/null
+++ b/net/arla/patches/patch-af
@@ -0,0 +1,34 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Do not attempt to install CellServDB, ThisCell, arla.conf. Only install
+the default files and tell the user to customize them. This avoids PLIST
+magic and assures that no customized files will be removed on pkg_delete.
+
+--- conf/Makefile.in.orig Tue May 30 22:42:05 2000
++++ conf/Makefile.in Tue May 30 22:45:45 2000
+@@ -26,24 +26,13 @@
+ for x in $$CONF_FILES; do \
+ echo $(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(sysconfdir)/$$x.default; \
+ $(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(sysconfdir)/$$x.default; \
+- if test -f $(DESTDIR)$(sysconfdir)/$$x; then \
+- echo "$@ will not overwrite $(DESTDIR)$(sysconfdir)/$$x"; \
+- else \
+- echo $(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(sysconfdir)/$$x; \
+- $(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(sysconfdir)/$$x; \
+- fi; \
+ done
+- if test -f $(DESTDIR)$(sysconfdir)/SuidCells; then \
+- echo "$@ will not overwrite $(DESTDIR)$(sysconfdir)/SuidCells"; \
+- else \
+- > $(DESTDIR)$(sysconfdir)/SuidCells; \
+- fi
++ > $(DESTDIR)$(sysconfdir)/SuidCells.default; \
+
+ uninstall:
+ CONF_FILES='$(CONF_FILES)'; \
+ for x in $$CONF_FILES; do \
+ rm -f $(DESTDIR)$(sysconfdir)/$$x.default; \
+- rm -f $(DESTDIR)$(sysconfdir)/$$x; \
+ done
+
+ clean :
diff --git a/net/arla/patches/patch-ag b/net/arla/patches/patch-ag
new file mode 100644
index 00000000000..fccbddc1b0c
--- /dev/null
+++ b/net/arla/patches/patch-ag
@@ -0,0 +1,34 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Install arlad into $(sbindir), not $(bindir).
+
+--- arlad/Makefile.in.orig Wed May 31 23:31:50 2000
++++ arlad/Makefile.in Wed May 31 23:33:34 2000
+@@ -15,6 +15,7 @@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ bindir = @bindir@
++sbindir = @sbindir@
+ sysconfdir = @sysconfdir@
+ transform = @program_transform_name@
+ ARLACACHEDIR = @ARLACACHEDIR@
+@@ -139,16 +140,16 @@
+ $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(REALCFLAGS) $<
+
+ install: all
+- $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+ PROG_BIN='$(ARLA_BIN)'; for x in $$PROG_BIN; do \
+ f=`echo $$x | sed '$(transform)'`; \
+- $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
++ $(INSTALL_PROGRAM) $$x $(DESTDIR)$(sbindir)/$$f; \
+ done
+
+ uninstall:
+ PROG_BIN='$(ARLA_BIN)'; for x in $$PROG_BIN; do \
+ f=`echo $$x | sed '$(transform)'`; \
+- rm -f $(DESTDIR)$(bindir)/$$f; \
++ rm -f $(DESTDIR)$(sbindir)/$$f; \
+ done
+
+ arlad: $(arlad_OBJS) $(LIBDEPENDS)
diff --git a/net/arla/patches/patch-ah b/net/arla/patches/patch-ah
new file mode 100644
index 00000000000..6b21dc9d764
--- /dev/null
+++ b/net/arla/patches/patch-ah
@@ -0,0 +1,45 @@
+$NetBSD: patch-ah,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Install xfs_mod.o into $(lkmdir), not $(bindir).
+Do not strip xfs_mod.o while installing it.
+
+--- xfs/bsd/Makefile.in.orig Wed May 31 23:38:35 2000
++++ xfs/bsd/Makefile.in Sat Jun 3 12:33:29 2000
+@@ -18,6 +18,7 @@
+
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_LKM = ${INSTALL_PROGRAM:C/-s//}
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
+
+@@ -26,6 +27,7 @@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ bindir = @bindir@
++lkmdir = $(exec_prefix)/lkm
+ transform = @program_transform_name@
+ EXECSUFFIX = @EXECSUFFIX@
+
+@@ -111,10 +113,10 @@
+ ./bin/umount_xfs /afs
+
+ install: all
+- $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(lkmdir)
+ PROG_BIN='$(XFS_BIN)'; for x in $$PROG_BIN; do \
+ f=`echo $$x | sed '$(transform)'`; \
+- $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
++ $(INSTALL_LKM) $$x $(DESTDIR)$(lkmdir)/$$f; \
+ done
+ for i in lkm subsys modules; do \
+ if test -d /$$i; then \
+@@ -126,7 +128,7 @@
+ uninstall:
+ PROG_BIN='$(XFS_BIN)'; for x in $$PROG_BIN; do \
+ f=`echo $$x | sed '$(transform)'`; \
+- rm -f $(DESTDIR)$(bindir)/$$f; \
++ rm -f $(DESTDIR)$(lkmdir)/$$f; \
+ done
+ cd bin && $(MAKE) $(MFLAGS) uninstall
+
diff --git a/net/arla/patches/patch-ai b/net/arla/patches/patch-ai
new file mode 100644
index 00000000000..7d2d183d5d3
--- /dev/null
+++ b/net/arla/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Use our own rx directory instead of the rx already installed.
+
+--- lib/bufdir/Makefile.in.orig Sat Jun 3 12:54:53 2000
++++ lib/bufdir/Makefile.in Sat Jun 3 12:55:39 2000
+@@ -18,6 +18,7 @@
+ MKINSTALLDIRS = @top_srcdir@/mkinstalldirs
+
+ INCLUDE=-I../../include -I$(srcdir) \
++ -I../../rx \
+ -I../../rxdef \
+ -I$(srcdir)/../roken \
+ @KRB4_INC_FLAGS@ \
diff --git a/net/arla/patches/patch-aj b/net/arla/patches/patch-aj
new file mode 100644
index 00000000000..1d9468926b3
--- /dev/null
+++ b/net/arla/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Also install rxgencon.h, since rx.h includes it.
+
+--- rx/Makefile.in.orig Sat Jun 3 12:59:05 2000
++++ rx/Makefile.in Sat Jun 3 12:59:28 2000
+@@ -29,7 +29,7 @@
+ LIB = librx.a
+ include_HEADERS = rx.h rx_clock.h rx_event.h rx_globs.h rx_mach.h rx_misc.h \
+ rx_multi.h rx_null.h rx_pkt.h rx_queue.h rx_trace.h \
+- rx_user.h
++ rx_user.h rxgencon.h
+
+ PROGS = test_rx_clock
+
diff --git a/net/arla/patches/patch-ak b/net/arla/patches/patch-ak
new file mode 100644
index 00000000000..fb289e00fab
--- /dev/null
+++ b/net/arla/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+
+Do not print a cryptic message after xfs_mod has been modloaded, say it
+in clear text.
+
+--- xfs/bsd/xfs_wrap-bsd.c.orig Thu Jun 8 13:28:58 2000
++++ xfs/bsd/xfs_wrap-bsd.c Thu Jun 8 13:35:12 2000
+@@ -310,8 +310,7 @@
+ ret = lkmdispatch(lkmtp, cmd);
+ if(cmd == LKM_E_LOAD) {
+ xfs_dev_major = _module.lkm_offset;
+- printf ("xfs: cdev: %d, syscall: %d\n",
+- xfs_dev_major, xfs_syscall_num);
++ printf("xfs_mod driver for arla loaded.\n");
+ }
+ return ret;
+ }
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 05:24:27 +0000