From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 1 15:04:46 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C5F4D16A549 for ; Fri, 1 Dec 2006 15:04:46 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E90D43E0A for ; Fri, 1 Dec 2006 15:02:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kB1Eo93T054835 for ; Fri, 1 Dec 2006 14:50:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB1Eo9ee054830; Fri, 1 Dec 2006 14:50:09 GMT (envelope-from gnats) Resent-Date: Fri, 1 Dec 2006 14:50:09 GMT Resent-Message-Id: <200612011450.kB1Eo9ee054830@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, trasz Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DC55316A412; Fri, 1 Dec 2006 14:44:49 +0000 (UTC) (envelope-from trasz@pin.if.uz.zgora.pl) Received: from pin.if.uz.zgora.pl (pin.if.uz.zgora.pl [212.109.128.251]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAE7243CA3; Fri, 1 Dec 2006 14:44:34 +0000 (GMT) (envelope-from trasz@pin.if.uz.zgora.pl) Received: by pin.if.uz.zgora.pl (Postfix, from userid 1001) id 0C86539DBA; Fri, 1 Dec 2006 15:46:37 +0100 (CET) Message-Id: <20061201144637.0C86539DBA@pin.if.uz.zgora.pl> Date: Fri, 1 Dec 2006 15:46:37 +0100 (CET) From: trasz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: osa@FreeBSD.org Subject: ports/106136: [PATCH] devel/libhoard: update to 3.5.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2006 15:04:47 -0000 >Number: 106136 >Category: ports >Synopsis: [PATCH] devel/libhoard: update to 3.5.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Dec 01 14:50:08 GMT 2006 >Closed-Date: >Last-Modified: >Originator: trasz >Release: FreeBSD 6.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006 >Description: - Update to 3.5.1 Added file(s): - files/patch-compile Removed file(s): - files/patch-Makefile - files/patch-Makefile.common Port maintainer (osa@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- libhoard-3.5.1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/libhoard/Makefile /home/trasz/libhoard/Makefile --- /usr/ports/devel/libhoard/Makefile Wed Feb 4 06:19:39 2004 +++ /home/trasz/libhoard/Makefile Fri Dec 1 15:46:01 2006 @@ -6,33 +6,36 @@ # PORTNAME= libhoard -PORTVERSION= 2.1.2d -PORTREVISION?= 2 +PORTVERSION= 3.5.1 CATEGORIES= devel -MASTER_SITES= http://www.cs.umass.edu/~emery/software/ +MASTER_SITES= http://www.cs.umass.edu/~emery/hoard/hoard-${PORTVERSION}/ +DISTNAME= heaplayers_3_5_1 MAINTAINER= osa@FreeBSD.org COMMENT= Fast, scalable and memory-efficient allocator for MP -USE_GMAKE= yes -MAKE_ENV= USE_FREEBSD=1 \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -INSTALLS_SHLIB= YES +WRKSRC= ${WRKDIR}/heaplayers-351/allocators/hoard +MAKE_ENV= CXX=${CXX} +USE_LDCONFIG= yes + +OPTIONS= OPTIMIZED_CFLAGS "Enable extra optimization options" on .include .if ${OSVERSION} < 501100 -IGNORE= "You must have a FreeBSD 5.1-RELEASE or better" +IGNORE= you must have a FreeBSD 5.1-RELEASE or better +.endif + +.if !defined(WITHOUT_OPTIMIZED_CFLAGS) +CFLAGS+= -march=pentiumpro -O3 -finline-limit=20000 -fkeep-inline-functions \ + -finline-functions -ffast-math -fomit-frame-pointer .endif +do-build: + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./compile) + do-install: ${INSTALL_DATA} ${WRKSRC}/libhoard.so ${PREFIX}/lib/libhoard.so.1 ${LN} -sf ${PREFIX}/lib/libhoard.so.1 ${PREFIX}/lib/libhoard.so -.if !defined(NOPORTDOCS) - ${INSTALL} -d -m 0755 ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/asplos2000.pdf ${DOCSDIR} -.endif .include diff -ruN --exclude=CVS /usr/ports/devel/libhoard/distinfo /home/trasz/libhoard/distinfo --- /usr/ports/devel/libhoard/distinfo Sun Jan 22 09:28:24 2006 +++ /home/trasz/libhoard/distinfo Fri Dec 1 15:46:01 2006 @@ -1,3 +1,3 @@ -MD5 (libhoard-2.1.2d.tar.gz) = fd0247f3ec28f507e2eb6b437263fcfe -SHA256 (libhoard-2.1.2d.tar.gz) = 975ca2e090fe9454e6fa6548f003e2bd4a98e7452739ce25f566511f7de1ef6e -SIZE (libhoard-2.1.2d.tar.gz) = 570753 +MD5 (heaplayers_3_5_1.tar.gz) = 3c9a82427b82c27e44132ce2fb48b050 +SHA256 (heaplayers_3_5_1.tar.gz) = babf287449f57fd1be9d9dba4d84ebf2367f16a86efbfa554ee7a813931b4964 +SIZE (heaplayers_3_5_1.tar.gz) = 3429409 diff -ruN --exclude=CVS /usr/ports/devel/libhoard/files/patch-Makefile /home/trasz/libhoard/files/patch-Makefile --- /usr/ports/devel/libhoard/files/patch-Makefile Wed Jun 25 16:37:49 2003 +++ /home/trasz/libhoard/files/patch-Makefile Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- Makefile.orig Wed Jun 25 17:44:34 2003 -+++ Makefile Wed Jun 25 17:45:03 2003 -@@ -37,7 +37,7 @@ - $(LIBSO) libhoard.o $(OBJS) -o $@ $(LIBS) - - libhoard.o: libhoard.cpp $(SRCS) -- $(CXX) $(CXXFLAGS) -c $< -o $@ -+ $(CXX) $(CXXFLAGS) $(FEATURESXX) -c $< -o $@ - endif - - ifeq ($(WINDOWS),1) diff -ruN --exclude=CVS /usr/ports/devel/libhoard/files/patch-Makefile.common /home/trasz/libhoard/files/patch-Makefile.common --- /usr/ports/devel/libhoard/files/patch-Makefile.common Wed Aug 31 11:26:37 2005 +++ /home/trasz/libhoard/files/patch-Makefile.common Thu Jan 1 01:00:00 1970 @@ -1,133 +0,0 @@ ---- Makefile.common.orig Mon Apr 7 19:57:11 2003 -+++ Makefile.common Wed Jun 25 17:41:29 2003 -@@ -21,8 +21,17 @@ - # or supply new values as parameters to make, e.g.: - # make USE_WINDOWS=1 DEBUG=1 - -+ifeq ($(OSTYPE),freebsd) -+USE_FREEBSD = 1 -+USE_LINUX = 0 -+USE_HPUX = 0 -+USE_WINDOWS = 0 -+USE_SOLARIS = 0 -+UNIX = 1 -+endif - - ifeq ($(OSTYPE),hpux) -+USE_FREEBSD = 0 - USE_LINUX = 0 - USE_HPUX = 1 - USE_WINDOWS = 0 -@@ -31,6 +40,7 @@ - endif - - ifeq ($(OSTYPE),linux) -+USE_FREEBSD = 0 - USE_HPUX = 0 - USE_LINUX = 1 # Linux - USE_WINDOWS = 0 -@@ -39,6 +49,7 @@ - endif - - ifeq ($(OSTYPE),linux-gnu) -+USE_FREEBSD = 0 - USE_HPUX = 0 - USE_LINUX = 1 # Linux - USE_WINDOWS = 0 -@@ -47,6 +58,7 @@ - endif - - ifeq ($(OSTYPE),solaris) -+USE_FREEBSD = 0 - USE_HPUX = 0 - USE_LINUX = 0 - USE_WINDOWS = 0 -@@ -55,6 +67,7 @@ - endif - - ifeq ($(OS),Windows_NT) -+USE_FREEBSD = 0 - USE_HPUX = 0 - USE_LINUX = 0 - USE_WINDOWS = 1 -@@ -109,6 +122,15 @@ - # LIBSO = $(CC) -shared - endif - -+ifeq ($(USE_FREEBSD),1) -+ GNUC = 1 -+ VPATH = ../run-freebsd -+ FEATURES = ${PTHREAD_CFLAGS} -+ LIBS = ${PTHREAD_LIBS} -+ UNIX = 1 -+endif -+ -+ - ifdef BROKEN - CPATH = /usr/bin/ - endif -@@ -125,10 +147,8 @@ - endif - - ifdef GNUC -- CC = $(CPATH)gcc -- CXX = $(CPATH)g++ -- FEATURES = -fPIC -D__STRICT_ANSI__ -D_GNU_SOURCE -D_REENTRANT -Wall -fno-exceptions #-fPIC -- OPTIMIZE = -O6 -fexpensive-optimizations -finline-functions -fomit-frame-pointer -ffast-math -+ FEATURES = -fPIC -D__STRICT_ANSI__ -D_GNU_SOURCE -D_REENTRANT -Wall -fno-exceptions -Wno-deprecated -+ OPTIMIZE = - FEATURESXX = $(FEATURES) - OPTIMIZEXX = $(OPTIMIZE) - LIBSO = $(CC) -shared #-nostartfiles -@@ -144,40 +164,40 @@ - endif - - else -- CFLAGS = $(FEATURES) -DNDEBUG $(OPTIMIZE) -- CXXFLAGS = $(FEATURESXX) -DNDEBUG $(OPTIMIZEXX) -+# CFLAGS = $(FEATURES) -DNDEBUG $(OPTIMIZE) -+# CXXFLAGS = $(FEATURESXX) -DNDEBUG $(OPTIMIZEXX) - # CFLAGS = $(FEATURES) /Zi /DEBUG $(OPTIMIZE) - # CXXFLAGS = $(FEATURESXX) /Zi /DEBUG $(OPTIMIZEXX) - endif - --LIBS = $(LIBTHREAD) -+LIBS = ${PTHREAD_LIBS} - - - .SUFFIXES: .c .cpp .o .a .so .tex .dvi .ps .png .bmp .ppm .eps .s .obj - - .s.o: -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(FEATURES) -c -o $@ $< - - .c.o: -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(FEATURES) -c -o $@ $< - - .cpp.o: -- $(CXX) $(CXXFLAGS) -c -o $@ $< -+ $(CXX) $(CXXFLAGS) $(FEATURESXX) -c -o $@ $< - - .c.obj: -- $(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) $(FEATURES) -c -o $@ $< - - .cpp.obj: -- $(CXX) $(CXXFLAGS) -c -o $@ $< -+ $(CXX) $(CXXFLAGS) $(FEATURESXX) -c -o $@ $< - - .o: -- $(CC) $(CFLAGS) $< -o $@ $(LIBS) -+ $(CC) $(CFLAGS) $(FEATURES) $< -o $@ $(LIBS) - - .c: -- $(CC) $(CFLAGS) $< -o $@ $(LIBS) -+ $(CC) $(CFLAGS) $(FEATURES) $< -o $@ $(LIBS) - - .cpp: -- $(CXX) $(CXXFLAGS) $< -o $@ $(LIBS) -+ $(CXX) $(CXXFLAGS) $(FEATURESXX) $< -o $@ $(LIBS) - - .o.a: - -rm -f $@ diff -ruN --exclude=CVS /usr/ports/devel/libhoard/files/patch-compile /home/trasz/libhoard/files/patch-compile --- /usr/ports/devel/libhoard/files/patch-compile Thu Jan 1 01:00:00 1970 +++ /home/trasz/libhoard/files/patch-compile Fri Dec 1 15:46:01 2006 @@ -0,0 +1,15 @@ +--- compile.orig Fri Dec 1 14:53:25 2006 ++++ compile Fri Dec 1 14:56:37 2006 +@@ -9,6 +9,12 @@ + SunOS) + echo "Compiling for Solaris" + g++ -nostartfiles -pipe -DNDEBUG -mcpu=ultrasparc -O3 -finline-limit=20000 -fPIC -fkeep-inline-functions -finline-functions -ffast-math -fomit-frame-pointer -I. -I../../heaplayers -I../../heaplayers/util -DUSE_HOARD=1 -D_REENTRANT=1 -shared libhoard.cpp -lthread -lpthread -ldl -o libhoard.so;; ++FreeBSD) ++ echo "Compiling for FreeBSD" ++ echo $CXX $CFLAGS -DNDEBUG -I. -I../../heaplayers -I../../heaplayers/util -DUSE_HOARD=1 -D_REENTRANT=1 -c libhoard.cpp -pthread ++ $CXX $CFLAGS -DNDEBUG -I. -I../../heaplayers -I../../heaplayers/util -DUSE_HOARD=1 -D_REENTRANT=1 -c libhoard.cpp -pthread ++ echo $CXX -shared libhoard.o -pthread -o libhoard.so ++ $CXX -shared libhoard.o -pthread -o libhoard.so;; + *) + case "$OSTYPE" in + [Dd]arwin8.0) diff -ruN --exclude=CVS /usr/ports/devel/libhoard/pkg-plist /home/trasz/libhoard/pkg-plist --- /usr/ports/devel/libhoard/pkg-plist Sat Jun 21 22:32:54 2003 +++ /home/trasz/libhoard/pkg-plist Fri Dec 1 15:46:01 2006 @@ -1,5 +1,2 @@ lib/libhoard.so lib/libhoard.so.1 -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/asplos2000.pdf -%%PORTDOCS%%@dirrm %%DOCSDIR%% --- libhoard-3.5.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: