cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict with net/nsd.

Browse Source 
ok pvalchev@
This commit is contained in:
margarida 2003-03-31 00:53:58 +00:00
parent 3b7efae794
commit 0210869f4f
9 changed files with 135 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
devel/mico/patches/patch-man_Makefile
View File

@ -1,14 +1,22 @@
--- man/Makefile.orig Thu Jun 28 03:02:08 2001
+++ man/Makefile Thu Jun 28 03:02:40 2001
@@ -26,9 +26,9 @@ DIRS = man1 man5 man8
$OpenBSD: patch-man_Makefile,v 1.2 2003/03/31 00:53:58 margarida Exp $
--- man/Makefile.orig Wed Aug 26 16:25:45 1998
+++ man/Makefile Wed Mar 12 03:23:54 2003
@@ -26,10 +26,15 @@ DIRS = man1 man5 man8
install:
for i in $(DIRS); do \
- $(IDIRCMD) $(SHARED_INSTDIR)/man/$$i; \
+ $(IDIRCMD) $(INSTDIR)/man/$$i; \
for j in $$i/*.[1-9]; do $(IMANCMD) $$j \
- for j in $$i/*.[1-9]; do $(IMANCMD) $$j \
- $(SHARED_INSTDIR)/man/$$i/; done; \
+ $(INSTDIR)/man/$$i/; done; \
+ if [ "$$i" != "man8" ]; then $(IDIRCMD) $(INSTDIR)/man/$$i; fi; \
+ for j in $$i/*.[1-9]; \
+ do if [ "$$i" = "man8" ]; \
+ then k="`echo $$j | sed -e 's/\\.8$$/.1/g; s/man8/man1/g'`"; \
+ else k=$$j; fi; \
+ $(IMANCMD) $$j \
+ $(INSTDIR)/man/$$k; done; \
done
+
install-cd: install

14
devel/mico/patches/patch-man_man1_idl_1 Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-man_man1_idl_1,v 1.1 2003/03/31 00:53:58 margarida Exp $
--- man/man1/idl.1.orig Wed Mar 12 03:34:51 2003
+++ man/man1/idl.1 Wed Mar 12 03:35:45 2003
@@ -224,8 +224,8 @@ operations and attributes inherited from
.SH FILES
~/.micorc
.SH "SEE ALSO"
-.IR "MICO Reference Manual" ", " rsh(1) ", " micod(8) ", " imr(1) ", "
-.IR ird(8) ", " micorc(5)
+.IR "MICO Reference Manual" ", " rsh(1) ", " micod(1) ", " imr(1) ", "
+.IR ird(1) ", " micorc(5)
.SH COPYRIGHT
Copyright (C) 1997, Kay Roemer & Arno Puder
.SH AUTHOR

14
devel/mico/patches/patch-man_man1_imr_1 Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-man_man1_imr_1,v 1.1 2003/03/31 00:53:58 margarida Exp $
--- man/man1/imr.1.orig Wed Mar 12 03:36:47 2003
+++ man/man1/imr.1 Wed Mar 12 03:37:18 2003
@@ -85,8 +85,8 @@ will force activation of the implementat
.SH FILES
~/.micorc
.SH "SEE ALSO"
-.IR "MICO Reference Manual" ", " rsh(1) ", " micod(8) ", " imr(1) ", "
-.IR ird(8) ", " micorc(5) ", " idl(1)
+.IR "MICO Reference Manual" ", " rsh(1) ", " micod(1) ", " imr(1) ", "
+.IR ird(1) ", " micorc(5) ", " idl(1)
.SH COPYRIGHT
Copyright (C) 1997, Kay Roemer & Arno Puder
.SH AUTHOR

14
devel/mico/patches/patch-man_man1_nsadmin_1 Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-man_man1_nsadmin_1,v 1.1 2003/03/31 00:53:58 margarida Exp $
--- man/man1/nsadmin.1.orig Wed Mar 12 03:37:44 2003
+++ man/man1/nsadmin.1 Wed Mar 12 03:38:10 2003
@@ -78,8 +78,8 @@ Quit
.SH FILES
~/.micorc
.SH "SEE ALSO"
-.IR "MICO Reference Manual" ", " rsh(1) ", " micod(8) ", " imr(1) ", "
-.IR ird(8) ", " micorc(5) ", " idl(1) ", " nsd(8)
+.IR "MICO Reference Manual" ", " rsh(1) ", " micod(1) ", " imr(1) ", "
+.IR ird(1) ", " micorc(5) ", " idl(1) ", " nsd(1)
.SH COPYRIGHT
Copyright (C) 1997, Kai-Uwe Sattler
.SH AUTHOR

12
devel/mico/patches/patch-man_man5_micorc_5 Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-man_man5_micorc_5,v 1.1 2003/03/31 00:53:58 margarida Exp $
--- man/man5/micorc.5.orig Wed Mar 12 03:38:59 2003
+++ man/man5/micorc.5 Wed Mar 12 03:39:39 2003
@@ -162,7 +162,7 @@ This option tells an object implementati
You should use this option only when starting persistent servers that
should register with the BOA daemon.
.SH "SEE ALSO"
-.IR "MICO Reference Manual" ", " rsh(1) ", " micod(8) ", " imr(1) ", "
+.IR "MICO Reference Manual" ", " rsh(1) ", " micod(1) ", " imr(1) ", "
.IR imr(1) ", " micorc(5) ", " idl(1)
.SH COPYRIGHT
Copyright (C) 1997, Kay Roemer & Arno Puder

21
devel/mico/patches/patch-man_man8_ird_8 Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-man_man8_ird_8,v 1.1 2003/03/31 00:53:58 margarida Exp $
--- man/man8/ird.8.orig Wed Mar 12 03:40:07 2003
+++ man/man8/ird.8 Wed Mar 12 03:41:19 2003
@@ -19,7 +19,7 @@
.\" Send comments and/or bug reports to:
.\" mico@informatik.uni-frankfurt.de
.\"
-.TH IRD 8 "April 8 1997"
+.TH IRD 1 "April 8 1997"
.SH NAME
ird \- MICO interface repository server
.SH SYNOPSIS
@@ -62,7 +62,7 @@ is used as ior-file, the IOR is written
.SH FILES
~/.micorc
.SH "SEE ALSO"
-.IR "MICO Reference Manual" ", " rsh(1) ", " micod(8) ", " imr(1) ", "
+.IR "MICO Reference Manual" ", " rsh(1) ", " micod(1) ", " imr(1) ", "
.IR micorc(5) ", " idl(1)
.SH COPYRIGHT
Copyright (C) 1997, Kay Roemer & Arno Puder

21
devel/mico/patches/patch-man_man8_micod_8 Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-man_man8_micod_8,v 1.1 2003/03/31 00:53:58 margarida Exp $
--- man/man8/micod.8.orig Wed Mar 12 03:41:42 2003
+++ man/man8/micod.8 Wed Mar 12 03:42:04 2003
@@ -19,7 +19,7 @@
.\" Send comments and/or bug reports to:
.\" mico@informatik.uni-frankfurt.de
.\"
-.TH MICOD 8 "April 8 1997"
+.TH MICOD 1 "April 8 1997"
.SH NAME
micod \- MICO object adapter daemon
.SH SYNOPSIS
@@ -67,7 +67,7 @@ repository.
.SH FILES
~/.micorc
.SH "SEE ALSO"
-.IR "MICO Reference Manual" ", " rsh(1) ", " micod(8) ", " imr(1) ", "
+.IR "MICO Reference Manual" ", " rsh(1) ", " micod(1) ", " imr(1) ", "
.IR micorc(5) ", " idl(1)
.SH COPYRIGHT
Copyright (C) 1997, Kay Roemer & Arno Puder

21
devel/mico/patches/patch-man_man8_nsd_8 Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-man_man8_nsd_8,v 1.1 2003/03/31 00:53:58 margarida Exp $
--- man/man8/nsd.8.orig Wed Mar 12 03:42:18 2003
+++ man/man8/nsd.8 Wed Mar 12 03:42:42 2003
@@ -19,7 +19,7 @@
.\" Send comments and/or bug reports to:
.\" mico@informatik.uni-frankfurt.de
.\"
-.TH NSD 8 "April 8 1997"
+.TH NSD 1 "April 8 1997"
.SH NAME
nsd \- MICO name service server
.SH SYNOPSIS
@@ -41,7 +41,7 @@ Only standard ORB options.
.SH FILES
~/.micorc
.SH "SEE ALSO"
-.IR "MICO Reference Manual" ", " rsh(1) ", " micod(8) ", " imr(1) ", "
+.IR "MICO Reference Manual" ", " rsh(1) ", " micod(1) ", " imr(1) ", "
.IR micorc(5) ", " idl(1) ", " nsadmin(1)
.SH COPYRIGHT
Copyright (C) 1997, Kai-Uwe Sattler

8
devel/mico/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2001/11/10 16:56:33 shell Exp $
@comment $OpenBSD: PLIST,v 1.3 2003/03/31 00:53:58 margarida Exp $
bin/containmentd
bin/eventd
bin/idl
@ -243,11 +243,11 @@ lib/mico-setup.csh
lib/mico-setup.sh
man/man1/idl.1
man/man1/imr.1
man/man1/ird.1
man/man1/micod.1
man/man1/nsadmin.1
man/man1/nsd.1
man/man5/micorc.5
man/man8/ird.8
man/man8/micod.8
man/man8/nsd.8
share/doc/mico/examples/MakeVars
share/doc/mico/examples/README
share/doc/mico/examples/bench/Makefile