components/network/vpnc/patches/03-man8-to-man1m.patch

   1 +++ ./makeman.pl        2016-11-17 23:47:04.153725109 +0100
   2 @@ -9,8 +9,8 @@
   3  # Version 0.2
   4
   5  # Command-line options: none
   6 -# Files needed        : ./vpnc ./vpnc.8.template ./VERSION
   7 -# Files created       : ./vpnc.8
   8 +# Files needed        : ./vpnc ./vpnc.1m.template ./VERSION
   9 +# Files created       : ./vpnc.1m
  10  # Exit status         : errno-values or 255 (Magic string not found)
  11
  12  # Distributed under the same licence as vpnc.
  13 @@ -98,8 +98,8 @@
  14  close $VERSION;
  15  chomp $vpnc_version;
  16
  17 -open my $TEMPLATE, '<', './vpnc.8.template';
  18 -open my $MANPAGE , '>', './vpnc.8';
  19 +open my $TEMPLATE, '<', './vpnc.1m.template';
  20 +open my $MANPAGE , '>', './vpnc.1m';
  21  my $magic_found;
  22  my $MAGIC_FOR_HEADER  = qq(.\\" ###makeman.pl: Replace header here!\n);
  23  my $MAGIC_FOR_OPTIONS = qq(.\\" ###makeman.pl: Insert options from help-output here!\n);
  24 @@ -113,7 +113,7 @@
  25  print {$MANPAGE} <<"END_MANPAGE_HEADER";
  26  .\\" This manpage is generated!
  27  .\\" Please edit the template-file in the source-distribution only.
  28 -.TH VPNC "8" "$date" "vpnc version $vpnc_version" "System Administration Utilities"
  29 +.TH VPNC "1m" "$date" "vpnc version $vpnc_version" "System Administration Utilities"
  30  END_MANPAGE_HEADER
  31
  32  $magic_found = 0;
  33 diff --git a/Makefile b/Makefile
  34 index c66bb5e..3deeb96 100644
  35 --- a/Makefile
  36 +++ b/Makefile
  37 @@ -76,12 +76,12 @@ ifneq (,$(findstring Apple,$(shell $(CC) --version)))
  38  CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock
  39  endif
  40
  41 -all : $(BINS) vpnc.8
  42 +all : $(BINS) vpnc.1m
  43
  44  vpnc : $(OBJS) vpnc.o
  45         $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  46
  47 -vpnc.8 : vpnc.8.template makeman.pl vpnc
  48 +vpnc.1m : vpnc.1m.template makeman.pl vpnc
  49         ./makeman.pl
  50
  51  cisco-decrypt : cisco-decrypt.o decrypt-utils.o
  52 @@ -117,16 +117,16 @@ test : all
  53         ./test-crypto test/sig_data.bin test/dec_data.bin test/ca_list.pem \
  54                 test/cert3.pem test/cert2.pem test/cert1.pem test/cert0.pem
  55
  56 -dist : VERSION vpnc.8 vpnc-$(RELEASE_VERSION).tar.gz
  57 +dist : VERSION vpnc.1m vpnc-$(RELEASE_VERSION).tar.gz
  58
  59  clean :
  60         -rm -f $(OBJS) $(BINOBJS) $(BINS) tags
  61
  62  distclean : clean
  63 -       -rm -f vpnc-debug.c vpnc-debug.h vpnc.ps vpnc.8 .depend
  64 +       -rm -f vpnc-debug.c vpnc-debug.h vpnc.ps vpnc.1m .depend
  65
  66  install-common: all
  67 -       install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(DOCDIR)
  68 +       install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man1m $(DESTDIR)$(DOCDIR)
  69         if [ "`uname -s | cut -c-6`" = "CYGWIN" ]; then \
  70                 install vpnc-script-win $(DESTDIR)$(ETCDIR)/vpnc-script; \
  71                 install vpnc-script-win.js $(DESTDIR)$(ETCDIR); \
  72 diff --git a/vpnc.8.template b/vpnc.8.template
  73 index 854a806..43f2b59 100644
  74 --- a/vpnc.8.template
  75 +++ b/vpnc.8.template
  76 @@ -1,7 +1,7 @@
  77  .\" Template to generate the vpnc-manpage
  78 -.\" $Id: vpnc.8.template 541 2014-02-18 05:09:33Z Antonio Borneo $
  79 +.\" $Id: vpnc.1m.template 541 2014-02-18 05:09:33Z Antonio Borneo $
  80  .\"
  81 -.TH VPNC "8" "Warning: Just a template!" "vpnc man-template" "Warning: Just a template!"
  82 +.TH VPNC "1m" "Warning: Just a template!" "vpnc man-template" "Warning: Just a template!"
  83  .\" Fake header just to make this file viewable with man.
  84  .\" ###makeman.pl: Replace header here!
  85  .SH NAME
  86 @@ -212,7 +212,6 @@ License can be found in /usr/share/common\-licenses/GPL.
  87  .SH "SEE ALSO"
  88  .BR pcf2vpnc (1),
  89  .BR cisco\-decrypt (1),
  90 -.BR ip (8),
  91 -.BR ifconfig (8),
  92 +.BR ifconfig (1m),
  93  .BR route (1),
  94  .BR http://www.unix\-ag.uni\-kl.de/~massar/vpnc/
  95 diff --git a/Makefile b/Makefile
  96 index 7777a45..610c365 100644
  97 --- a/Makefile
  98 +++ b/Makefile
  99 @@ -136,7 +136,7 @@ install-common: all
 100         install -m600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
 101         install -m755 vpnc-disconnect $(DESTDIR)$(SBINDIR)
 102         install -m755 pcf2vpnc $(DESTDIR)$(BINDIR)
 103 -       install -m644 vpnc.8 $(DESTDIR)$(MANDIR)/man8
 104 +       install -m644 vpnc.1m $(DESTDIR)$(MANDIR)/man1m
 105         install -m644 pcf2vpnc.1 $(DESTDIR)$(MANDIR)/man1
 106         install -m644 cisco-decrypt.1 $(DESTDIR)$(MANDIR)/man1
 107         install -m644 COPYING $(DESTDIR)$(DOCDIR)
 108 @@ -156,7 +156,7 @@ uninstall :
 109                 $(DESTDIR)$(BINDIR)/cisco-decrypt \
 110                 $(DESTDIR)$(MANDIR)/man1/cisco-decrypt.1 \
 111                 $(DESTDIR)$(MANDIR)/man1/pcf2vpnc \
 112 -               $(DESTDIR)$(MANDIR)/man8/vpnc.8
 113 +               $(DESTDIR)$(MANDIR)/man1m/vpnc.1m
 114         @echo NOTE: remove $(DESTDIR)$(ETCDIR) manually
 115
 116  .PHONY : clean distclean dist all install install-strip uninstall