package/isakmpd/patches/020-standardize.patch

   1 diff -urN isakmpd/GNUmakefile isakmpd.new/GNUmakefile
   2 --- isakmpd/GNUmakefile 2004-01-16 13:36:32.000000000 +0100
   3 +++ isakmpd.new/GNUmakefile     2006-09-03 17:33:03.000000000 +0200
   4 @@ -238,3 +238,16 @@
   5
   6  realcleandepend:
   7         rm -f .depend tags
   8 +
   9 +# Install rules
  10 +install: install-bin install-man
  11 +
  12 +install-bin: isakmpd
  13 +       -mkdir -p $(DESTDIR)$(BINDIR)
  14 +       $(INSTALL) $(INSTALL_OPTS) -m 755 isakmpd $(DESTDIR)$(BINDIR)
  15 +
  16 +install-man:
  17 +       -mkdir -p $(DESTDIR)$(MANDIR)/man8
  18 +       $(INSTALL) $(INSTALL_OPTS) -m 444 isakmpd.8 $(DESTDIR)$(MANDIR)/man8
  19 +       -mkdir -p $(DESTDIR)$(MANDIR)/man5
  20 +       $(INSTALL) $(INSTALL_OPTS) -m 444 isakmpd.conf.5 isakmpd.policy.5 $(DESTDIR)$(MANDIR)/man5
  21 diff -urN isakmpd/samples/Makefile isakmpd.new/samples/Makefile
  22 --- isakmpd/samples/Makefile    2003-06-03 16:39:50.000000000 +0200
  23 +++ isakmpd.new/samples/Makefile        2006-09-03 17:07:24.000000000 +0200
  24 @@ -26,7 +26,7 @@
  25  #
  26
  27  FILES=         VPN-* policy singlehost-*
  28 -TARGETDIR=     /usr/share/ipsec/isakmpd
  29 +TARGETDIR=     /usr/share/isakmpd/samples
  30
  31  # The mkdir below is for installation on OpenBSD pre 2.7
  32  install:
  33
  34 diff -urN isakmp.old/sysdep/linux/GNUmakefile.sysdep isakmp.dev/sysdep/linux/GNUmakefile.sysdep
  35 --- isakmp.old/sysdep/linux/GNUmakefile.sysdep  2006-09-07 13:49:20.000000000 +0200
  36 +++ isakmp.dev/sysdep/linux/GNUmakefile.sysdep  2006-09-07 13:51:41.000000000 +0200
  37 @@ -25,18 +25,18 @@
  38  # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  39  #
  40
  41 -LIBGMP:=       /usr/lib/libgmp.a
  42 -LIBCRYPTO:=    /usr/lib/libcrypto.a
  43 +LIBGMP:=
  44 +LIBCRYPTO:=    -lcrypto
  45  LIBSYSDEPDIR:= ${.CURDIR}/sysdep/common/libsysdep
  46  LIBSYSDEP:=    ${LIBSYSDEPDIR}/libsysdep.a
  47
  48 -LDADD+=                -lgmp ${LIBSYSDEP} ${LIBCRYPTO}
  49 +LDADD+=                -L$(STAGING_DIR)/usr/lib -lgmp ${LIBSYSDEP} ${LIBCRYPTO}
  50  DPADD+=                ${LIBGMP} ${LIBSYSDEP}
  51
  52  CFLAGS+=       -DHAVE_GETNAMEINFO -DUSE_OLD_SOCKADDR -DHAVE_PCAP \
  53                 -DNEED_SYSDEP_APP -DMP_FLAVOUR=MP_FLAVOUR_GMP -DUSE_AES \
  54                 -I${.CURDIR}/sysdep/linux/include -I${.CURDIR}/sysdep/common \
  55 -               -I/usr/include/openssl
  56 +               -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/openssl -I$(LINUX_DIR)/include
  57
  58  FEATURES=      debug tripledes blowfish cast ec aggressive x509 policy
  59  FEATURES+=     dpd nat_traversal isakmp_cfg des aes