Attachment #103962 for bug #144062

View | Details | Raw Unified | Return to bug 144062
Collapse All | Expand All

Lines 6-12 Link Here

(-)/tmp/port/loki/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= loki	8	PORTNAME= loki
9	PORTVERSION= 0.1.5	9	PORTVERSION= 0.1.7
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= SF/${PORTNAME}-lib/Loki/Loki%20${PORTVERSION}	11	MASTER_SITES= SF/${PORTNAME}-lib/Loki/Loki%20${PORTVERSION}
12		12

Lines 1-3 Link Here

(-)/tmp/port/loki/distinfo (-3 / +3 lines)
1	MD5 (loki-0.1.5.tar.gz) = f246e9e91b46d4e55ce36193984697e6	1	MD5 (loki-0.1.7.tar.gz) = 005d79581fbe888ceabd65d46c99c8b1
2	SHA256 (loki-0.1.5.tar.gz) = 01ae8b65e286a64017a9fa2eb633d70b5f029b03bb4682f3105148165e3345f5	2	SHA256 (loki-0.1.7.tar.gz) = 0f185478552009cd3f82a4ef3038fd6080d293308c15a6501284ba6092b21cf6
3	SIZE (loki-0.1.5.tar.gz) = 324972	3	SIZE (loki-0.1.7.tar.gz) = 520453




--- Makefile.orig	Sun Jan 28 02:20:26 2007
+++ Makefile	Sun Jan 28 02:24:49 2007
@@ -2,7 +2,7 @@
 export OS ?= $(shell uname -s)
 
 export CXXWARNFLAGS = -Wall -Wold-style-cast -Wundef -Wsign-compare -Wconversion -Wpointer-arith -pedantic
-export CXXFLAGS = $(CXXWARNFLAGS) -g -O2
+export CXXFLAGS += $(CXXWARNFLAGS) -fPIC
 
 .PHONY: all build-static build-shared check clean distclean
 all: build-static build-shared check
@@ -23,7 +23,7 @@
 	$(MAKE) -C src distclean
 
 ifneq ($(OS),Windows)
-export prefix ?= /usr
+export prefix ?= ${PREFIX}
 
 .PHONY: install install-static
 install:

Line 0 Link Here

(-)/tmp/port/loki/files/patch-Makefile.common (+11 lines)
	1
	2	$FreeBSD$
	3
	4	--- Makefile.common.orig
	5	+++ Makefile.common
	6	@@ -4,4 +4,4 @@
	7	CXXWARNFLAGS := -Wall -Wold-style-cast -Wundef -Wsign-compare -Wconversion -Wpointer-arith -pedantic
	8	CXXFLAGS := $(CXXWARNFLAGS) -g -O2
	9
	10	-prefix := /usr
	11	+prefix := ${PREFIX}




--- include/loki/Threads.h.orig	Mon Nov  6 20:39:26 2006
+++ include/loki/Threads.h	Mon Nov  6 20:42:26 2006
@@ -51,8 +51,8 @@
 
 #include <cassert>
 
-#if defined(LOKI_CLASS_LEVEL_THREADING) || defined(LOKI_OBJECT_LEVEL_THREADING)
-
+//#if defined(LOKI_CLASS_LEVEL_THREADING) || defined(LOKI_OBJECT_LEVEL_THREADING)
+#if 0
     #define LOKI_DEFAULT_THREADING_NO_OBJ_LEVEL ::Loki::ClassLevelLockable
     
     #if defined(LOKI_CLASS_LEVEL_THREADING) && !defined(LOKI_OBJECT_LEVEL_THREADING)





$FreeBSD$

--- src/Makefile.orig
+++ src/Makefile
@@ -20,7 +20,7 @@
   override LDFLAGS += --shared -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC
   LDLIBS := -lpthread
 else
-ifeq ($(OS), GNU/kFreeBSD)
+ifeq ($(OS), $(filter $(OS),GNU/kFreeBSD FreeBSD))
   SHARED_LIB_BASE := libloki.so
   SHARED_LIB_VERSIONED := libloki.so.$(VERSION)
   override LDFLAGS += --shared -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC
+  RESULT_DIR = ../lib/
+else
   SHARED_LIB_BASE = libloki.dll
   LDFLAGS = --shared
   LDLIBS =
   RESULT_DIR = ../lib/
+endif
 endif
 endif
 




--- test/Makefile.orig	Mon Nov  6 20:45:11 2006
+++ test/Makefile	Mon Nov  6 20:49:04 2006
@@ -1,5 +1,9 @@
 export CPPFLAGS = -I../../include -DNDEBUG
+ifeq ($(OS),FreeBSD)
+export LDFLAGS = -L../../lib -pthread
+else
 export LDFLAGS = -L../../lib
+endif
 export LDLIBS = -lloki
 
 ifeq ($(OS),Windows)




--- test/SingletonDll/Makefile.orig	Sun Jan 28 02:00:34 2007
+++ test/SingletonDll/Makefile	Sun Jan 28 02:05:49 2007
@@ -8,9 +8,15 @@
   LIB2 = libsingletondll.so
   SHARED_LIB_FLAG = --shared
 else
+ifeq ($(OS),FreeBSD)
+  LIB1 = libfoo.so
+  LIB2 = libsingletondll.so
+  SHARED_LIB_FLAG = --shared
+else
   LIB1 = foo.dll
   LIB2 = singletondll.dll
   SHARED_LIB_FLAG = --shared
+endif
 endif
 endif
 

Lines 1-11 Link Here

(-)/tmp/port/loki/files/patch-test-SmartPtr-main.cpp (-11 lines)
1	--- test/SmartPtr/main.cpp.orig Mon Nov 6 20:25:41 2006
2	+++ test/SmartPtr/main.cpp Mon Nov 6 20:26:02 2006
3	@@ -998,7 +998,7 @@
4
5	// ----------------------------------------------------------------------------
6
7	-int main( unsigned int , const char * [] )
8	+int main( int , const char * [] )
9	{
10
11	DoRefLinkTests();





$FreeBSD$

--- test/SingletonDll/Makefile.orig
+++ test/SingletonDll/Makefile
@@ -5,6 +5,11 @@
   LIB2 := libsingletondll.dylib
   SHARED_LIB_FLAG := -dynamiclib -fPIC
 else
+ifeq ($(OS),FreeBSD)
+  LIB1 := libfoo.so
+  LIB2 := libsingletondll.so
+  SHARED_LIB_FLAG := --shared -fPIC
+else
 ifeq ($(OS),Linux)
   LIB1 := libfoo.so
   LIB2 := libsingletondll.so
@@ -15,6 +20,7 @@
   SHARED_LIB_FLAG := --shared
 endif
 endif
+endif
 
 BIN1 := client$(BIN_SUFFIX)
 SRC1 := client.cpp

Lines 1-5 Link Here

(-)/tmp/port/loki/pkg-plist (-1 / +9 lines)
1	include/loki/AbstractFactory.h	1	include/loki/AbstractFactory.h
		2	include/loki/Allocator.h
2	include/loki/AssocVector.h	3	include/loki/AssocVector.h
		4	include/loki/CachedFactory.h
		5	include/loki/CheckReturn.h
		6	include/loki/Checker.h
3	include/loki/ConstPolicy.h	7	include/loki/ConstPolicy.h
4	include/loki/DataGenerators.h	8	include/loki/DataGenerators.h
5	include/loki/EmptyType.h	9	include/loki/EmptyType.h
Lines 7-12 Link Here
7	include/loki/Function.h	11	include/loki/Function.h
8	include/loki/Functor.h	12	include/loki/Functor.h
9	include/loki/HierarchyGenerators.h	13	include/loki/HierarchyGenerators.h
		14	include/loki/Key.h
		15	include/loki/LevelMutex.h
10	include/loki/LockingPtr.h	16	include/loki/LockingPtr.h
11	include/loki/LokiExport.h	17	include/loki/LokiExport.h
12	include/loki/LokiTypeInfo.h	18	include/loki/LokiTypeInfo.h
Lines 16-21 Link Here
16	include/loki/Pimpl.h	22	include/loki/Pimpl.h
17	include/loki/RefToValue.h	23	include/loki/RefToValue.h
18	include/loki/Register.h	24	include/loki/Register.h
		25	include/loki/SPCachedFactory.h
		26	include/loki/SafeBits.h
19	include/loki/SafeFormat.h	27	include/loki/SafeFormat.h
20	include/loki/ScopeGuard.h	28	include/loki/ScopeGuard.h
21	include/loki/Sequence.h	29	include/loki/Sequence.h
Lines 48-54 Link Here
48	include/loki/yasli/yasli_vector.h	56	include/loki/yasli/yasli_vector.h
49	lib/libloki.a	57	lib/libloki.a
50	lib/libloki.so	58	lib/libloki.so
51	lib/libloki.so.0	59	lib/libloki.so.0.1.7
52	%%PORTDOCS%%%%DOCSDIR%%/CHANGES	60	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
53	%%PORTDOCS%%%%DOCSDIR%%/Notes.txt	61	%%PORTDOCS%%%%DOCSDIR%%/Notes.txt
54	%%PORTDOCS%%%%DOCSDIR%%/README	62	%%PORTDOCS%%%%DOCSDIR%%/README

Return to bug 144062

Lines 1-20 Link Here

(-)/tmp/port/loki/files/patch-Makefile (-20 lines)
1	--- Makefile.orig Sun Jan 28 02:20:26 2007
2	+++ Makefile Sun Jan 28 02:24:49 2007
3	@@ -2,7 +2,7 @@
4	export OS ?= $(shell uname -s)
5
6	export CXXWARNFLAGS = -Wall -Wold-style-cast -Wundef -Wsign-compare -Wconversion -Wpointer-arith -pedantic
7	-export CXXFLAGS = $(CXXWARNFLAGS) -g -O2
8	+export CXXFLAGS += $(CXXWARNFLAGS) -fPIC
9
10	.PHONY: all build-static build-shared check clean distclean
11	all: build-static build-shared check
12	@@ -23,7 +23,7 @@
13	$(MAKE) -C src distclean
14
15	ifneq ($(OS),Windows)
16	-export prefix ?= /usr
17	+export prefix ?= ${PREFIX}
18
19	.PHONY: install install-static
20	install:

Lines 1-13 Link Here

(-)/tmp/port/loki/files/patch-include-loki-Threads.h (-13 lines)
1	--- include/loki/Threads.h.orig Mon Nov 6 20:39:26 2006
2	+++ include/loki/Threads.h Mon Nov 6 20:42:26 2006
3	@@ -51,8 +51,8 @@
4
5	#include <cassert>
6
7	-#if defined(LOKI_CLASS_LEVEL_THREADING) \|\| defined(LOKI_OBJECT_LEVEL_THREADING)
8	-
9	+//#if defined(LOKI_CLASS_LEVEL_THREADING) \|\| defined(LOKI_OBJECT_LEVEL_THREADING)
10	+#if 0
11	#define LOKI_DEFAULT_THREADING_NO_OBJ_LEVEL ::Loki::ClassLevelLockable
12
13	#if defined(LOKI_CLASS_LEVEL_THREADING) && !defined(LOKI_OBJECT_LEVEL_THREADING)

Lines 1-21 Link Here

(-)/tmp/port/loki/files/patch-src-Makefile (-20 / +13 lines)
1	--- src/Makefile.orig Sun Jan 28 01:57:12 2007	1
2	+++ src/Makefile Sun Jan 28 01:59:57 2007	2	$FreeBSD$
3	@@ -20,10 +20,18 @@	3
4	LDLIBS = -lpthread	4	--- src/Makefile.orig
5	RESULT_DIR = ../lib/	5	+++ src/Makefile
		6	@@ -20,7 +20,7 @@
		7	override LDFLAGS += --shared -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC
		8	LDLIBS := -lpthread
6	else	9	else
7	+ifeq ($(OS), FreeBSD)	10	-ifeq ($(OS), GNU/kFreeBSD)
8	+ SHARED_LIB_BASE = libloki.so	11	+ifeq ($(OS), $(filter $(OS),GNU/kFreeBSD FreeBSD))
9	+ SHARED_LIB_VERSIONED = libloki.so.0	12	SHARED_LIB_BASE := libloki.so
10	+ LDFLAGS = --shared -Wl,-soname=$(SHARED_LIB_VERSIONED)	13	SHARED_LIB_VERSIONED := libloki.so.$(VERSION)
11	+ LDLIBS = -pthread	14	override LDFLAGS += --shared -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC
12	+ RESULT_DIR = ../lib/
13	+else
14	SHARED_LIB_BASE = libloki.dll
15	LDFLAGS = --shared
16	LDLIBS =
17	RESULT_DIR = ../lib/
18	+endif
19	endif
20	endif
21

Lines 1-12 Link Here

(-)/tmp/port/loki/files/patch-test-Makefile (-12 lines)
1	--- test/Makefile.orig Mon Nov 6 20:45:11 2006
2	+++ test/Makefile Mon Nov 6 20:49:04 2006
3	@@ -1,5 +1,9 @@
4	export CPPFLAGS = -I../../include -DNDEBUG
5	+ifeq ($(OS),FreeBSD)
6	+export LDFLAGS = -L../../lib -pthread
7	+else
8	export LDFLAGS = -L../../lib
9	+endif
10	export LDLIBS = -lloki
11
12	ifeq ($(OS),Windows)

Lines 1-18 Link Here

(-)/tmp/port/loki/files/patch-test-SingletonDll-Makefile (-18 lines)
1	--- test/SingletonDll/Makefile.orig Sun Jan 28 02:00:34 2007
2	+++ test/SingletonDll/Makefile Sun Jan 28 02:05:49 2007
3	@@ -8,9 +8,15 @@
4	LIB2 = libsingletondll.so
5	SHARED_LIB_FLAG = --shared
6	else
7	+ifeq ($(OS),FreeBSD)
8	+ LIB1 = libfoo.so
9	+ LIB2 = libsingletondll.so
10	+ SHARED_LIB_FLAG = --shared
11	+else
12	LIB1 = foo.dll
13	LIB2 = singletondll.dll
14	SHARED_LIB_FLAG = --shared
15	+endif
16	endif
17	endif
18

Line 0 Link Here

(-)/tmp/port/loki/files/patch-test_SingletonDll_Makefile (+25 lines)
	1
	2	$FreeBSD$
	3
	4	--- test/SingletonDll/Makefile.orig
	5	+++ test/SingletonDll/Makefile
	6	@@ -5,6 +5,11 @@
	7	LIB2 := libsingletondll.dylib
	8	SHARED_LIB_FLAG := -dynamiclib -fPIC
	9	else
	10	+ifeq ($(OS),FreeBSD)
	11	+ LIB1 := libfoo.so
	12	+ LIB2 := libsingletondll.so
	13	+ SHARED_LIB_FLAG := --shared -fPIC
	14	+else
	15	ifeq ($(OS),Linux)
	16	LIB1 := libfoo.so
	17	LIB2 := libsingletondll.so
	18	@@ -15,6 +20,7 @@
	19	SHARED_LIB_FLAG := --shared
	20	endif
	21	endif
	22	+endif
	23
	24	BIN1 := client$(BIN_SUFFIX)
	25	SRC1 := client.cpp