From 49a26a233f573dfd6a193167c65bca2322d1e1a9 Mon Sep 17 00:00:00 2001 From: lwhsu Date: Mon, 10 Nov 2008 14:47:09 +0000 Subject: - Update to 0.52 - Unbreak with GCC 4.2 PR: ports/128233 Submitted by: Yi-Jheng Lin Approved by: maintainer timeout --- net/nepim/Makefile | 10 ++++++---- net/nepim/distinfo | 6 +++--- net/nepim/files/patch-Makefile | 25 +++++++++++++------------ 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/net/nepim/Makefile b/net/nepim/Makefile index d6848331f6ca..0ef53261ab9c 100644 --- a/net/nepim/Makefile +++ b/net/nepim/Makefile @@ -4,8 +4,7 @@ # $FreeBSD$ PORTNAME= nepim -PORTVERSION= 0.15 -PORTREVISION= 3 +PORTVERSION= 0.52 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SAVANNAH} \ http://www.yazzy.org/ports/ @@ -32,8 +31,11 @@ do-install: .include -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 +.if ${OSVERSION} < 700048 +CFLAGS+= -DHAVE_IP_MREQ -DHAVE_IPV6_MREQ +.else +CFLAGS+= -DHAVE_IP_MREQ -DHAVE_IPV6_MREQ -DHAVE_IP_MREQN \ + -DHAVE_GROUP_SOURCE_REQ .endif .include diff --git a/net/nepim/distinfo b/net/nepim/distinfo index 18a29b497499..1d1555b860cf 100644 --- a/net/nepim/distinfo +++ b/net/nepim/distinfo @@ -1,3 +1,3 @@ -MD5 (nepim-0.15.tar.gz) = 719d6a31f8f10919f1bde7d9aff5550b -SHA256 (nepim-0.15.tar.gz) = 4d25a850ec124be1a07061527119ad07c8babc6bf211eaa50cb9087ccae7448f -SIZE (nepim-0.15.tar.gz) = 43041 +MD5 (nepim-0.52.tar.gz) = 68f4c3ce4b46b026bc2c43207f5007ca +SHA256 (nepim-0.52.tar.gz) = c86954bab54706caa2180b7d4a230632650e207dd7894b4eca3bc9f6a4387aa9 +SIZE (nepim-0.52.tar.gz) = 70871 diff --git a/net/nepim/files/patch-Makefile b/net/nepim/files/patch-Makefile index df328394d27e..aa8810d91654 100644 --- a/net/nepim/files/patch-Makefile +++ b/net/nepim/files/patch-Makefile @@ -1,8 +1,8 @@ ---- Makefile.orig Thu Oct 13 16:57:39 2005 -+++ Makefile Fri Oct 14 15:05:17 2005 -@@ -2,16 +2,14 @@ - # $Id: Makefile,v 1.20 2005/10/13 19:57:39 evertonm Exp $ - # +--- Makefile.orig 2008-10-20 02:07:49.000000000 +0800 ++++ Makefile 2008-10-20 02:14:16.000000000 +0800 +@@ -38,17 +38,17 @@ + # ENABLE_DLOPEN defined as -DHAVE_DLOPEN. + # Otherwise, tcpwrapper support is disabled. -OOP_BASE = /usr/local/oop +OOP_BASE = %%LOCALBASE%% @@ -12,11 +12,12 @@ ENABLE_DLOPEN = -DHAVE_DLOPEN -CC = gcc --CFLAGS = -Wall -g -ggdb -I$(OOP_INC) $(ENABLE_DLOPEN) \ -- -DHAVE_IPV6_MREQ --LDFLAGS = -L$(OOP_LIB) -loop -+CFLAGS += -Wall -I$(OOP_INC) -DHAVE_IPV6_MREQ $(ENABLE_DLOPEN) -+LDFLAGS += -L$(OOP_LIB) -loop - - PLATFORM=$(shell uname) ++CC ?= gcc + WARN = -Wall + REENT = -D_REENTRANT + #DEBUG = -DNEPIM_DEBUG_KEEPALIVE -DNEPIM_DEBUG_FIXME +-CFLAGS = $(WARN) $(REENT) $(DEBUG) -g -ggdb -I$(OOP_INC) $(ENABLE_DLOPEN) \ ++CFLAGS += $(WARN) $(REENT) $(DEBUG) -I$(OOP_INC) $(ENABLE_DLOPEN) \ + -DHAVE_IPV6_MREQ + LDFLAGS += -L$(OOP_LIB) -loop -- cgit