summaryrefslogtreecommitdiff
path: root/mail/dcc/patches
diff options
context:
space:
mode:
Diffstat (limited to 'mail/dcc/patches')
-rw-r--r--mail/dcc/patches/patch-Makefile.inc.in50
-rw-r--r--mail/dcc/patches/patch-Makefile.inc2.in16
-rw-r--r--mail/dcc/patches/patch-configure35
-rw-r--r--mail/dcc/patches/patch-homedir_Makefile.in10
4 files changed, 52 insertions, 59 deletions
diff --git a/mail/dcc/patches/patch-Makefile.inc.in b/mail/dcc/patches/patch-Makefile.inc.in
index b293de345ba..e6a9df4db39 100644
--- a/mail/dcc/patches/patch-Makefile.inc.in
+++ b/mail/dcc/patches/patch-Makefile.inc.in
@@ -1,14 +1,42 @@
-$NetBSD: patch-Makefile.inc.in,v 1.1 2015/06/05 13:43:20 gdt Exp $
+$NetBSD: patch-Makefile.inc.in,v 1.2 2017/05/28 11:50:07 maya Exp $
-NO_SYS_INSTALL shouldn't prevent man pages from being installed.
+make will otherwise try to exec ""
---- Makefile.inc.in.orig 2014-08-06 14:43:42.000000000 +0000
+--- Makefile.inc.in.orig 2017-02-04 19:18:07.000000000 +0000
+++ Makefile.inc.in
-@@ -124,7 +124,6 @@ MANOWN =$(DCC_OWN)
- MANMODE =444
-
- @MAKE_DOT@ifdef NO_SYS_INSTALL
--NOMAN =no
- SET_BINOWN=
- SET_MANOWN=
- SET_DCCOWN=
+@@ -52,7 +52,7 @@ clean cleandir:
+ # do not let clean be the default target
+ # and silence gmake "nothing to be done" noise
+ all:
+- @
++ @:
+ ###########################################################################
+ @endif@
+
+@@ -231,7 +231,7 @@ maninstall:
+ done
+ @endif@
+ @endif@
+- @
++ @:
+
+ $(MANDIR)8:
+ @ifndef@ NOMAN
+@@ -239,7 +239,7 @@ $(MANDIR)8:
+ $(INSTALL) -d $(SET_MANOWN) -m 755 $(MANDIR)8
+ @endif@
+ @endif@
+- @
++ @:
+
+
+ uninstall delete:deinstall
+@@ -252,7 +252,7 @@ progdelete:
+ @ifdef@ PROG
+ rm -f $(BINDIR)/$(PROG)
+ @endif@
+- @
++ @:
+
+ beforedelete:progdelete
+ @ifdef@ SUBDIR
diff --git a/mail/dcc/patches/patch-Makefile.inc2.in b/mail/dcc/patches/patch-Makefile.inc2.in
deleted file mode 100644
index 0f44b4f35a9..00000000000
--- a/mail/dcc/patches/patch-Makefile.inc2.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile.inc2.in,v 1.1 2015/06/05 13:43:20 gdt Exp $
-
-Prepending `depend' and `all' during the install stage will cause at
-least two ambiguous errors. Remove the whole dependency because it
-doesn't seem to have much use anyway.
-
---- Makefile.inc2.in.orig 2014-08-06 14:43:42.000000000 +0000
-+++ Makefile.inc2.in
-@@ -47,7 +47,6 @@ INSTALL =@DCCINSTALL@
- BININSTALL=$(INSTALL) -c $(SET_BINOWN) -m $(BINMODE)
-
- # create the DCC home directory before trying to install files
--beforeinstall:$(BINDIR) $(MANDIR)8 depend all
- $(BINDIR):
- $(INSTALL) -d $(SET_BINOWN) -m 755 $(BINDIR)
-
diff --git a/mail/dcc/patches/patch-configure b/mail/dcc/patches/patch-configure
index 889755b12cf..2e565c3dc06 100644
--- a/mail/dcc/patches/patch-configure
+++ b/mail/dcc/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.2 2015/07/11 23:44:21 sevan Exp $
+$NetBSD: patch-configure,v 1.3 2017/05/28 11:50:07 maya Exp $
Always install man-pages.
---- configure.orig 2014-08-06 14:43:42.000000000 +0000
+--- configure.orig 2015-05-22 18:00:33.000000000 +0000
+++ configure
-@@ -1920,93 +1920,10 @@ fi
+@@ -1925,76 +1922,8 @@ fi
# decide whether to install .8 or .0 files.
MANXFILE=
MAN0AS8='/`expr $$NM : "\(.*\)".0`.8'
@@ -12,29 +12,24 @@ Always install man-pages.
- Linux)
- # default to /usr/local/man/man8 and use roff files
- mancat=man
-- MANX='$(MAN8)'
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+- MANX='$(MANGZ)'
- ;;
- OpenBSD)
- # default to /usr/local/man/cat8 and .0 names
- mancat=cat
- MANX='$(MAN0)'
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- HP-UX)
-- # default to /usr/local/man/cat8 and use cleartext files and
-- # .8 names
+- # default to /usr/local/man/cat8 and use cleartext files and .8 names
- mancat=cat
- MANX='$(MAN0)'
- MANXFILE="$MAN8AS8"
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- IRIX*)
- # default to /usr/local/man/man8 and use cleartext files and .8 names
- mancat=man
- MANX='$(MAN0)'
- MANXFILE="$MAN8AS8"
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- SunOS)
- # default to /usr/local/man/cat8 and use cleartext files,
@@ -42,35 +37,27 @@ Always install man-pages.
- mancat=cat
- MANX='$(MAN0)'
- MANXFILE="$MAN8AS8"
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- FreeBSD|DragonFly)
-- # default to /usr/local/man/man8 and use nroff files, possibly
-- # compressed via /usr/share/mk
+- # default to /usr/local/man/man8 and use nroff files
- mancat=man
-- MANX='$(MAN8)'
-- USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
+- MANX='$(MANGZ)'
- ;;
- Darwin)
- # default to /usr/local/man/man8 and use nroff files
- mancat=man
- MANX='$(MAN8)'
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- NetBSD)
- # use text output to avoid running groff on every `man` command
- mancat=cat
- MANX='$(MAN0)'
-- # force NetBSD to install the man pages
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes\
--install:maninstall'
- ;;
- BSD/OS)
- # default to /usr/local/man/cat8 and use cleartext files, possibly
- # compressed via /usr/share/mk, and named .0
- mancat=cat
- MANX='$(MAN0)'
-- USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
- ;;
- AIX)
- # default to /usr/local/man/cat8, use our installation rule,
@@ -78,27 +65,21 @@ Always install man-pages.
- mancat=cat
- MANX='$(MAN0)'
- MANXFILE="$MAN8AS8"
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- OpenUNIX)
-- # default to /usr/local/man/cat8 and use cleartext files named
-- # .8
+- # default to /usr/local/man/cat8 and use cleartext files named .8
- mancat=cat
- MANX='$(MAN0)'
- MANXFILE="$MAN8AS8"
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- *)
- echo "warning: *** Cannot install man pages on unfamiliar systems ***" 1>&2
- mancat=fixme
- MANX=
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
-esac
-+# default to /usr/local/man/man8 and use nroff files
+mancat=man
+MANX='$(MAN8)'
-+USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
if test "$mandir" = '${prefix}/man'; then
if test "$DCC_MANDIR"SET != SET; then
mandir="$DCC_MANDIR"
diff --git a/mail/dcc/patches/patch-homedir_Makefile.in b/mail/dcc/patches/patch-homedir_Makefile.in
index 506e1bf5f4e..4bb357f79dd 100644
--- a/mail/dcc/patches/patch-homedir_Makefile.in
+++ b/mail/dcc/patches/patch-homedir_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-homedir_Makefile.in,v 1.1 2015/06/05 13:43:20 gdt Exp $
+$NetBSD: patch-homedir_Makefile.in,v 1.2 2017/05/28 11:50:07 maya Exp $
Install configuration files into PKGSRC_DCC_EGDIR.
@@ -8,7 +8,7 @@ end up in any of the installed files.
Also, skip make-dcc_conf (there is nothing to merge) and fix-map (moved
into rc-files as start_precmd check).
---- homedir/Makefile.in.orig 2014-08-06 14:43:42.000000000 +0000
+--- homedir/Makefile.in.orig 2017-01-16 06:22:01.000000000 +0000
+++ homedir/Makefile.in
@@ -39,7 +39,7 @@
DEPTH =..
@@ -19,9 +19,9 @@ into rc-files as start_precmd check).
MAP =$(HD)/map@configsuffix@
MAPTXT =$(HD)/map.txt@configsuffix@
IDS =$(HD)/ids@configsuffix@
-@@ -60,14 +60,12 @@ DCC_BINDIR=@installroot@@libexecdir@
- all:
- @:
+@@ -55,14 +55,12 @@ SSCRIPTS=fix-map
+ DCC_BINDIR=@installroot@@libexecdir@
+ @INCLUDE_INC@
-install:$(HD) $(HD)/log
+install:$(HD)
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 23:08:17 +0000