net/vpnc/patches/001-cross.patch

   1 --- a/Makefile
   2 +++ b/Makefile
   3 @@ -20,7 +20,7 @@
   4  # $Id$
   5
   6  DESTDIR=
   7 -PREFIX=/usr/local
   8 +PREFIX=/usr
   9  ETCDIR=/etc/vpnc
  10  BINDIR=$(PREFIX)/bin
  11  SBINDIR=$(PREFIX)/sbin
  12 @@ -57,18 +57,15 @@
  13  CRYPTO_OBJS = $(addsuffix .o,$(basename $(CRYPTO_SRCS)))
  14  BINOBJS = $(addsuffix .o,$(BINS))
  15  BINSRCS = $(addsuffix .c,$(BINS))
  16 -VERSION := $(shell sh mk-version)
  17  RELEASE_VERSION := $(shell cat VERSION)
  18
  19  CC ?= gcc
  20 -CFLAGS ?= -O3 -g
  21  CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
  22 -CFLAGS +=  $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS)
  23 +CFLAGS += -O3 -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS) $(CRYPTO_CFLAGS)
  24  CPPFLAGS += -DVERSION=\"$(VERSION)\"
  25 -LDFLAGS ?= -g
  26 -LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD)
  27 +LIBS += -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error $(CRYPTO_LDADD)
  28
  29 -ifeq ($(shell uname -s), SunOS)
  30 +ifeq ($(OS), SunOS)
  31  LIBS += -lnsl -lresolv -lsocket
  32  endif
  33  ifneq (,$(findstring Apple,$(shell $(CC) --version)))
  34 @@ -82,7 +79,7 @@
  35         $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  36
  37  vpnc.8 : vpnc.8.template makeman.pl vpnc
  38 -       ./makeman.pl
  39 +       touch vpnc.8
  40
  41  cisco-decrypt : cisco-decrypt.o decrypt-utils.o
  42         $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)