diff options
| author | dholland <dholland@pkgsrc.org> | 2014-09-11 21:27:09 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2014-09-11 21:27:09 +0000 |
| commit | e49572eabc827dc4b968fd4ffad20bee482f627a (patch) | |
| tree | 9a8db403669e5476fa35f3c3109733a426791629 /net | |
| parent | b62577d9447c6e78680dd58a74ef53d42afc5210 (diff) | |
| download | pkgsrc-e49572eabc827dc4b968fd4ffad20bee482f627a.tar.gz | |
Fix Solaris detection; should fix Solaris build.
Diffstat (limited to 'net')
| -rw-r--r-- | net/icsi-finger/Makefile | 7 | ||||
| -rw-r--r-- | net/icsi-finger/distinfo | 4 | ||||
| -rw-r--r-- | net/icsi-finger/patches/patch-ac | 12 |
3 files changed, 17 insertions, 6 deletions
diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile index 886e838ff0e..1567a21a804 100644 --- a/net/icsi-finger/Makefile +++ b/net/icsi-finger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/10/10 00:08:40 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2014/09/11 21:27:09 dholland Exp $ # DISTNAME= icsi-finger-1.0.29 @@ -23,11 +23,16 @@ INSTALLATION_DIRS+= share/examples/icsi-finger/targets TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp .include "../../mk/compiler.mk" +.include "../../mk/bsd.prefs.mk" .if !empty(PKGSRC_COMPILER:Mclang) CPPFLAGS+= -Wno-error=return-type .endif +.if ${OPSYS} == "SunOS" +MAKE_ENV+= CPP_ARGS=-DSVR4 +.endif + pre-configure: chmod +w ${WRKSRC}/config.h ${ECHO} \#define ManDir ${PREFIX}/${PKGMANDIR} >> \ diff --git a/net/icsi-finger/distinfo b/net/icsi-finger/distinfo index f78afd4469e..d3b7660c63e 100644 --- a/net/icsi-finger/distinfo +++ b/net/icsi-finger/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.17 2013/07/01 10:43:50 joerg Exp $ +$NetBSD: distinfo,v 1.18 2014/09/11 21:27:09 dholland Exp $ SHA1 (icsi-finger-1.0.29.tar.Z) = 7c61ce8c847ff6e40ecc3de909c3db1a4b996d04 RMD160 (icsi-finger-1.0.29.tar.Z) = 5047e636538ae66cf0ba3e170dc3a3edb31f317a Size (icsi-finger-1.0.29.tar.Z) = 302729 bytes SHA1 (patch-aa) = d68de6daa5a9ebaeb57cd5afd723f502a72d7dc5 SHA1 (patch-ab) = d8a719d78288aad8ab3a7159f332afdd59231ebb -SHA1 (patch-ac) = 6348df24858979b42b99ad7f34b2f388c602d3bd +SHA1 (patch-ac) = ad13f2c4bb781fbeab4399cc0812f43f6052a74f SHA1 (patch-ad) = de1489cf9860bd412a43a875a43eae69dd559606 SHA1 (patch-ae) = 7613ee307bb047d5e5c794b829dcd1cb1c8edb81 SHA1 (patch-ah) = 9e3b5dc141395d36140f4b1166bad7429f3a0977 diff --git a/net/icsi-finger/patches/patch-ac b/net/icsi-finger/patches/patch-ac index 2ce5edb1efb..3698efc9f13 100644 --- a/net/icsi-finger/patches/patch-ac +++ b/net/icsi-finger/patches/patch-ac @@ -1,6 +1,12 @@ -$NetBSD: patch-ac,v 1.3 2013/07/01 10:43:50 joerg Exp $ +$NetBSD: patch-ac,v 1.4 2014/09/11 21:27:09 dholland Exp $ ---- Makefile.orig 1998-04-04 19:27:42.000000000 +0000 +- configure for pkgsrc +- always use tradcpp +- quote $(CC) bmake-style when passing to cpp +- allow putting stuff in CPP_ARGS from the pkgsrc makefile +- improve post-cpp seddery (?) + +--- Makefile.orig 1999-03-29 06:09:39.000000000 +0000 +++ Makefile @@ -44,22 +44,8 @@ DEFINES = -DSVR4 DEFINES = @@ -31,7 +37,7 @@ $NetBSD: patch-ac,v 1.3 2013/07/01 10:43:50 joerg Exp $ CPPFLAGS = $(SYSTEM) $(CPP_DEFINES) -CPP_ARGS = -DCPP_CC="$(CC)" -DIncludes=$(INCLUDES) -+CPP_ARGS = -DCPP_CC=${CC:Q} -DIncludes=$(INCLUDES) ++CPP_ARGS += -DCPP_CC=${CC:Q} -DIncludes=$(INCLUDES) all: $(SRC)$(MKFILE) # (cd $(SRC); $(MAKE) -f $(MKFILE) depend) |