Attachment #118362 for bug #160598

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





PORTNAME=	scintilla
PORTVERSION=	2.28
PORTREVISION=	1
CATEGORIES=	x11-toolkits
MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
DISTNAME=	scite${PORTVERSION:S/.//g}

MAKEFILE=	makefile
USE_LDCONFIG=	yes
USE_GNOME=	gtk20
USE_GCC=	4.2+
MAKE_JOBS_SAFE=	yes
MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
CFLAGS+=	-DPIC ${PICFLAG}

.include <bsd.port.pre.mk>

.if ${ARCH} == "sparc64"
PICFLAG?=	-fPIC
.else
PICFLAG?=	-fpic
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|[(]CCOMP[)]|(CC)|g' \
		${WRKSRC}/makefile

do-install:
	${MKDIR} ${PREFIX}/include/scintilla




--- makefile.orig	2011-07-31 22:49:04.000000000 -0400
+++ makefile	2011-09-06 20:44:00.000000000 -0400
@@ -7,14 +7,7 @@
 # Also works with ming32-make on Windows.
 
 .SUFFIXES: .cxx .c .o .h .a

-CCOMP = gcc
-endif
-AR = ar
+AR = $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
+#CC = clang
+#CCOMP = clang
+#else
+#CC = g++
+#CCOMP = gcc
+#endif
+AR = $(CXX) -shared
 RANLIB = touch
 
 ifdef GTK3
@@ -36,7 +29,8 @@
 COMPLIB=..\bin\scintilla.a
 else
 DEL = rm -f

 endif
 
 vpath %.h ../src ../include ../lexlib
@@ -55,14 +49,15 @@
 endif
 
 ifdef DEBUG

+CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
 else
-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
 endif
 
 CFLAGS:=$(CXXFLAGS)
 
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
+CONFIGLIBS:=$(shell pkg-config --libs $(GTKVERSION))
 MARSHALLER=scintilla-marshal.o
 
 .cxx.o:
@@ -72,7 +67,7 @@
+	$(CC) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
 .c.o:
-	$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
+	$(CCOMP) $(PICFLAGS) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
 
 LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
 

 
 clean:
 	$(DEL) *.o $(COMPLIB)
@@ -85,9 +80,11 @@
 	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \
 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
 	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \

-	$(AR) rc $@ $^
-	$(RANLIB) $@
+	$(MARSHALLER)
+	$(AR) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
+
+$(LEXRLIB): $(LEXOBJS)
+	$(AR) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
 
 # Automatically generate header dependencies with "make deps"
 include deps.mak

Return to bug 160598

Lines 7-12 Link Here

(-)Makefile (-5 / +7 lines)
7		7
8	PORTNAME= scintilla	8	PORTNAME= scintilla
9	PORTVERSION= 2.28	9	PORTVERSION= 2.28
		10	PORTREVISION= 1
10	CATEGORIES= x11-toolkits	11	CATEGORIES= x11-toolkits
11	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}	12	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
12	DISTNAME= scite${PORTVERSION:S/.//g}	13	DISTNAME= scite${PORTVERSION:S/.//g}
Lines 22-41 Link Here
22	MAKEFILE= makefile	23	MAKEFILE= makefile
23	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
24	USE_GNOME= gtk20	25	USE_GNOME= gtk20
25	USE_GCC= 4.2+
26	MAKE_JOBS_SAFE= yes	26	MAKE_JOBS_SAFE= yes
		27	MAKE_ENV+= LDFLAGS="${LDFLAGS}"
		28	CFLAGS+= -DPIC ${PICFLAG}
27		29
28	.include <bsd.port.pre.mk>	30	.include <bsd.port.pre.mk>
29		31
30	.if ${ARCH} == "sparc64"	32	.if ${ARCH} == "sparc64"
31	MAKE_ARGS+= PICFLAGS=-DPIC	33	PICFLAG?= -fPIC
32	.else	34	.else
33	MAKE_ARGS+= PICFLAGS="-DPIC -fPIC -fpic"	35	PICFLAG?= -fpic
34	.endif	36	.endif
35		37
36	post-patch:	38	post-patch:
37	@${REINPLACE_CMD} -e 's\|[(]CC[)]\|(CXX)\|g ; s\|[(]CCOMP[)]\|(CC)\|g ; \	39	@${REINPLACE_CMD} -e 's\|[(]CC[)]\|(CXX)\|g ; s\|[(]CCOMP[)]\|(CC)\|g' \
38	s\| -Os\|\|g' ${WRKSRC}/makefile	40	${WRKSRC}/makefile
39		41
40	do-install:	42	do-install:
41	${MKDIR} ${PREFIX}/include/scintilla	43	${MKDIR} ${PREFIX}/include/scintilla

Lines 1-6 Link Here

(-)files/patch-aa (-24 / +13 lines)
1	--- makefile.orig 2011-05-02 05:11:17.000000000 -0400	1	--- makefile.orig 2011-07-31 22:49:04.000000000 -0400
2	+++ makefile 2011-07-03 21:09:17.000000000 -0400	2	+++ makefile 2011-09-06 20:44:00.000000000 -0400
3	@@ -7,14 +7,14 @@	3	@@ -7,14 +7,7 @@
4	# Also works with ming32-make on Windows.	4	# Also works with ming32-make on Windows.
5		5
6	.SUFFIXES: .cxx .c .o .h .a	6	.SUFFIXES: .cxx .c .o .h .a
Lines 12-29 Link Here
12	-CCOMP = gcc	12	-CCOMP = gcc
13	-endif	13	-endif
14	-AR = ar	14	-AR = ar
15	+#ifdef CLANG	15	+AR = $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
16	+#CC = clang
17	+#CCOMP = clang
18	+#else
19	+#CC = g++
20	+#CCOMP = gcc
21	+#endif
22	+AR = $(CXX) -shared
23	RANLIB = touch	16	RANLIB = touch
24		17
25	ifdef GTK3	18	ifdef GTK3
26	@@ -36,7 +36,8 @@	19	@@ -36,7 +29,8 @@
27	COMPLIB=..\bin\scintilla.a	20	COMPLIB=..\bin\scintilla.a
28	else	21	else
29	DEL = rm -f	22	DEL = rm -f
Lines 33-39 Link Here
33	endif	26	endif
34		27
35	vpath %.h ../src ../include ../lexlib	28	vpath %.h ../src ../include ../lexlib
36	@@ -55,24 +56,24 @@	29	@@ -55,14 +49,15 @@
37	endif	30	endif
38		31
39	ifdef DEBUG	32	ifdef DEBUG
Lines 41-61 Link Here
41	+CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)	34	+CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
42	else	35	else
43	-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)	36	-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
44	+CXXFLAGS+=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)	37	+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
45	endif	38	endif
46		39
47	CFLAGS:=$(CXXFLAGS)	40	CFLAGS:=$(CXXFLAGS)
48		41
49	-CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))	42	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
50	+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)	43	+CONFIGLIBS:=$(shell pkg-config --libs $(GTKVERSION))
51	MARSHALLER=scintilla-marshal.o	44	MARSHALLER=scintilla-marshal.o
52		45
53	.cxx.o:	46	.cxx.o:
54	- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<	47	@@ -72,7 +67,7 @@
55	+ $(CC) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
56	.c.o:
57	- $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
58	+ $(CCOMP) $(PICFLAGS) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
59		48
60	LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))	49	LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
61		50
Lines 64-70 Link Here
64		53
65	clean:	54	clean:
66	$(DEL) *.o $(COMPLIB)	55	$(DEL) *.o $(COMPLIB)
67	@@ -85,9 +86,11 @@	56	@@ -85,9 +80,11 @@
68	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \	57	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \
69	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \	58	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
70	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \	59	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
Lines 72-81 Link Here
72	- $(AR) rc $@ $^	61	- $(AR) rc $@ $^
73	- $(RANLIB) $@	62	- $(RANLIB) $@
74	+ $(MARSHALLER)	63	+ $(MARSHALLER)
75	+ $(AR) $(CONFIGFLAGS:cflags=libs) -o $@ $^	64	+ $(AR) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
76	+	65	+
77	+$(LEXRLIB): $(LEXOBJS)	66	+$(LEXRLIB): $(LEXOBJS)
78	+ $(AR) $(CONFIGFLAGS:cflags=libs) -o $@ $^	67	+ $(AR) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
79		68
80	# Automatically generate header dependencies with "make deps"	69	# Automatically generate header dependencies with "make deps"
81	include deps.mak	70	include deps.mak