diff options
| author | dholland <dholland@pkgsrc.org> | 2015-11-07 23:39:15 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2015-11-07 23:39:15 +0000 |
| commit | 2828bde06530a96396cec08675e11d937a78d6a5 (patch) | |
| tree | dd0b7fffd8a2a1eeb7607e1656845ba7cdc3e539 /comms | |
| parent | 8798d544c1851dfaa70f706e8ed78cada122597c (diff) | |
| download | pkgsrc-2828bde06530a96396cec08675e11d937a78d6a5.tar.gz | |
Take out upstream's --traditional-cpp for MacOS as it breaks the build,
even on PPC (old) MacOS.
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/malsync/distinfo | 4 | ||||
| -rw-r--r-- | comms/malsync/patches/patch-aa | 20 |
2 files changed, 19 insertions, 5 deletions
diff --git a/comms/malsync/distinfo b/comms/malsync/distinfo index 77a4b779dca..9a1f956df32 100644 --- a/comms/malsync/distinfo +++ b/comms/malsync/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 01:34:55 agc Exp $ +$NetBSD: distinfo,v 1.9 2015/11/07 23:39:15 dholland Exp $ SHA1 (malsync_2.2.0.src.tar.gz) = c8400205b3f8770c105c9f62afdba20c94b85c26 RMD160 (malsync_2.2.0.src.tar.gz) = 14be8ba01c20969eed8d7b718284880e0bbd424f SHA512 (malsync_2.2.0.src.tar.gz) = 09d58a5e29a9d02a01245a3707c6f59d4a7a6e94e911a9147d1e543b1de198fab7fa0270eaa4b1a0aa65474f68a6e4b0fdbf8d35ec0b37b1503f23b7c6d77978 Size (malsync_2.2.0.src.tar.gz) = 173851 bytes -SHA1 (patch-aa) = 616a237452a3f408b6cce199ce338746e8fa3149 +SHA1 (patch-aa) = f16cc36e8c9d0e801ad96bfb353a07941119d585 SHA1 (patch-ab) = de38ceb03f777bac1f4612517850e023dee946b7 SHA1 (patch-ac) = a0ffae72d282e6b9276b8e16b909010e6e9c9b1e SHA1 (patch-ad) = 2c9f6f3b60ba1d198e6752c7f0ec239727ae78e7 diff --git a/comms/malsync/patches/patch-aa b/comms/malsync/patches/patch-aa index 97b2f1012b9..02e904e0556 100644 --- a/comms/malsync/patches/patch-aa +++ b/comms/malsync/patches/patch-aa @@ -1,6 +1,12 @@ -$NetBSD: patch-aa,v 1.5 2012/02/16 17:25:16 hans Exp $ +$NetBSD: patch-aa,v 1.6 2015/11/07 23:39:15 dholland Exp $ ---- Makefile.orig 2003-05-31 11:42:14.000000000 +1200 +- configure for pkgsrc +- provide a correct all: target +- remove --traditional-cpp on MacOS as it breaks the build +- remove custom snprintf on Solaris as it hasn't been needed in ages +- honor pkgsrc LDFLAGS + +--- Makefile.orig 2003-05-30 23:42:14.000000000 +0000 +++ Makefile @@ -1,5 +1,7 @@ TARGET = malsync @@ -10,7 +16,7 @@ $NetBSD: patch-aa,v 1.5 2012/02/16 17:25:16 hans Exp $ PLAT := $(shell uname) ifeq ($(PLAT),SunOS) -@@ -15,7 +17,6 @@ LINKLIBS = -lm +@@ -15,14 +17,13 @@ LINKLIBS = -lm endif TREETOP = . @@ -18,6 +24,14 @@ $NetBSD: patch-aa,v 1.5 2012/02/16 17:25:16 hans Exp $ CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \ -I$(TREETOP)/mal/client/common -I$(PILOT_LINK_DIR)/include \ + -I$(TREETOP)/mal/client/unix + + ifeq ($(PLAT),Darwin) +-CFLAGS += --traditional-cpp -DDARWIN -D__unix__ -D__FreeBSD__ -D_HPUX_SOURCE ++CFLAGS += -DDARWIN -D__unix__ -D__FreeBSD__ -D_HPUX_SOURCE + endif + + SRC = malsync.c \ @@ -59,10 +60,6 @@ SRC = malsync.c \ $(TREETOP)/mal/client/common/AGSyncProcessor.c \ $(TREETOP)/mal/common/AGServerConfig.c |