Attachment #98722 for bug #137675

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




#    $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $

PORTNAME=	scintilla
PORTVERSION=	2.00
CATEGORIES=	x11-toolkits
MASTER_SITES=	SF
		http://www.scintilla.org/
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	scite${PORTVERSION:S/.//g}
EXTRACT_SUFX=	.tgz



WRKSRC=		${WRKDIR}/${PORTNAME}/gtk

FETCH_ARGS=	-pRr

USE_GMAKE=	yes
USE_ICONV=	yes
MAKEFILE=	makefile
USE_LDCONFIG=	yes

.if defined(WITH_GTK2)
USE_GNOME=	gtk20
PKGNAMESUFFIX:=	-gtk2
.else
USE_GNOME=	gtk12
MAKE_ARGS+=	GTK1=yes
.endif

.include <bsd.port.pre.mk>


do-install:
	${MKDIR} ${PREFIX}/include/scintilla
	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${PREFIX}/include/scintilla
	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${PREFIX}/lib
	${LN} -sf ${PREFIX}/lib/libscintilla.so.2 ${PREFIX}/lib/libscintilla.so
	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${PREFIX}/lib
	${LN} -sf ${PREFIX}/lib/libscintilla_lexers.so.2 ${PREFIX}/lib/libscintilla_lexers.so

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/kirby/shared/ports/scintilla/distinfo (-3 / +3 lines)
1	MD5 (scite179.tgz) = 02a0d68f0c33c01c9a2c9d69c295acea	1	MD5 (scite200.tgz) = fe6ba62eaf86ec0a49e03d2a03c3e048
2	SHA256 (scite179.tgz) = ebd7105b892b68ec4f9190ffcd4a98226e84a73d2e9cbd29653d52692de3cbf9	2	SHA256 (scite200.tgz) = 56be771b4aaf9a0e0b601dea374f12926fc1c2eb1b91ab8783165143c8d7b210
3	SIZE (scite179.tgz) = 1719588	3	SIZE (scite200.tgz) = 1810957




--- makefile.orig	2009-07-03 01:48:46.000000000 -0400
+++ makefile	2009-08-11 12:37:37.000000000 -0400
@@ -8,16 +8,17 @@
 # To force GTK+ 1 build, define GTK1 on the make command line.
 

 endif
 
-COMPLIB=../bin/scintilla.a
+COMPLIB=../bin/libscintilla.so.2
+LEXRLIB=../bin/libscintilla_lexers.so.2
 
 vpath %.h ../src ../include
 vpath %.cxx ../src

 
 #++Autogenerated -- run src/LexGen.py to regenerate
 #**LEXOBJS=\\\n\(\*.o \)
@@ -76,7 +77,7 @@
 LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
 #--Autogenerated -- end of automatically generated section
 
-all: $(COMPLIB)

 
 clean:
 	rm -f *.o $(COMPLIB)
@@ -89,9 +90,11 @@
 	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.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 \
-	$(MARSHALLER) $(LEXOBJS)
-	$(AR) rc $@ $^
-	$(RANLIB) $@




include/scintilla/KeyWords.h
include/scintilla/Platform.h
include/scintilla/PropSet.h
include/scintilla/SString.h
include/scintilla/SciLexer.h
include/scintilla/Scintilla.h
include/scintilla/ScintillaWidget.h
include/scintilla/WindowAccessor.h
lib/libscintilla.so
lib/libscintilla.so.2
lib/libscintilla_lexers.so
lib/libscintilla_lexers.so.2
@dirrm include/scintilla

Return to bug 137675

Lines 6-16 Link Here

(-)/kirby/shared/ports/scintilla/Makefile (-15 / +8 lines)
6	# $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $	6	# $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $
7		7
8	PORTNAME= scintilla	8	PORTNAME= scintilla
9	PORTVERSION= 1.79	9	PORTVERSION= 2.00
10	CATEGORIES= x11-toolkits	10	CATEGORIES= x11-toolkits
11	MASTER_SITES= SF \	11	MASTER_SITES= SF
12	http://www.scintilla.org/
13	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= scite${PORTVERSION:S/.//g}	12	DISTNAME= scite${PORTVERSION:S/.//g}
15	EXTRACT_SUFX= .tgz	13	EXTRACT_SUFX= .tgz
16		14
Lines 19-36 Link Here
19		17
20	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk	18	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
21		19
		20	FETCH_ARGS= -pRr
		21
22	USE_GMAKE= yes	22	USE_GMAKE= yes
23	USE_ICONV= yes	23	USE_ICONV= yes
24	MAKEFILE= makefile	24	MAKEFILE= makefile
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26
27	.if defined(WITH_GTK2)
28	USE_GNOME= gtk20	26	USE_GNOME= gtk20
29	PKGNAMESUFFIX:= -gtk2
30	.else
31	USE_GNOME= gtk12
32	MAKE_ARGS+= GTK1=yes
33	.endif
34		27
35	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
36		29
Lines 47-55 Link Here
47	do-install:	40	do-install:
48	${MKDIR} ${PREFIX}/include/scintilla	41	${MKDIR} ${PREFIX}/include/scintilla
49	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${PREFIX}/include/scintilla	42	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${PREFIX}/include/scintilla
50	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.1 ${PREFIX}/lib	43	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${PREFIX}/lib
51	${LN} -sf ${PREFIX}/lib/libscintilla.so.1 ${PREFIX}/lib/libscintilla.so	44	${LN} -sf ${PREFIX}/lib/libscintilla.so.2 ${PREFIX}/lib/libscintilla.so
52	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.1 ${PREFIX}/lib	45	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${PREFIX}/lib
53	${LN} -sf ${PREFIX}/lib/libscintilla_lexers.so.1 ${PREFIX}/lib/libscintilla_lexers.so	46	${LN} -sf ${PREFIX}/lib/libscintilla_lexers.so.2 ${PREFIX}/lib/libscintilla_lexers.so
54		47
55	.include <bsd.port.post.mk>	48	.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)/kirby/shared/ports/scintilla/files/patch-aa (-8 / +8 lines)
1	--- makefile.orig 2007-06-11 22:57:30.000000000 -0500	1	--- makefile.orig 2009-07-03 01:48:46.000000000 -0400
2	+++ makefile 2007-08-21 17:21:51.000000000 -0500	2	+++ makefile 2009-08-11 12:37:37.000000000 -0400
3	@@ -8,16 +8,17 @@	3	@@ -8,16 +8,17 @@
4	# To force GTK+ 1 build, define GTK1 on the make command line.	4	# To force GTK+ 1 build, define GTK1 on the make command line.
5		5
Lines 17-24 Link Here
17	endif	17	endif
18		18
19	-COMPLIB=../bin/scintilla.a	19	-COMPLIB=../bin/scintilla.a
20	+COMPLIB=../bin/libscintilla.so.1	20	+COMPLIB=../bin/libscintilla.so.2
21	+LEXRLIB=../bin/libscintilla_lexers.so.1	21	+LEXRLIB=../bin/libscintilla_lexers.so.2
22		22
23	vpath %.h ../src ../include	23	vpath %.h ../src ../include
24	vpath %.cxx ../src	24	vpath %.cxx ../src
Lines 64-71 Link Here
64		64
65	#++Autogenerated -- run src/LexGen.py to regenerate	65	#++Autogenerated -- run src/LexGen.py to regenerate
66	#*LEXOBJS=\\\n\(\.o \)	66	#*LEXOBJS=\\\n\(\.o \)
67	@@ -75,7 +76,7 @@	67	@@ -76,7 +77,7 @@
68	LexVHDL.o LexYAML.o	68	LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
69	#--Autogenerated -- end of automatically generated section	69	#--Autogenerated -- end of automatically generated section
70		70
71	-all: $(COMPLIB)	71	-all: $(COMPLIB)
Lines 73-82 Link Here
73		73
74	clean:	74	clean:
75	rm -f *.o $(COMPLIB)	75	rm -f *.o $(COMPLIB)
76	@@ -88,9 +89,11 @@	76	@@ -89,9 +90,11 @@
77	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \	77	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
78	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \	78	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
79	RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \	79	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
80	- $(MARSHALLER) $(LEXOBJS)	80	- $(MARSHALLER) $(LEXOBJS)
81	- $(AR) rc $@ $^	81	- $(AR) rc $@ $^
82	- $(RANLIB) $@	82	- $(RANLIB) $@

Lines 2-14 Link Here

(-)/kirby/shared/ports/scintilla/pkg-plist (-3 / +2 lines)
2	include/scintilla/KeyWords.h	2	include/scintilla/KeyWords.h
3	include/scintilla/Platform.h	3	include/scintilla/Platform.h
4	include/scintilla/PropSet.h	4	include/scintilla/PropSet.h
5	include/scintilla/SString.h
6	include/scintilla/SciLexer.h	5	include/scintilla/SciLexer.h
7	include/scintilla/Scintilla.h	6	include/scintilla/Scintilla.h
8	include/scintilla/ScintillaWidget.h	7	include/scintilla/ScintillaWidget.h
9	include/scintilla/WindowAccessor.h	8	include/scintilla/WindowAccessor.h
10	lib/libscintilla.so	9	lib/libscintilla.so
11	lib/libscintilla.so.1	10	lib/libscintilla.so.2
12	lib/libscintilla_lexers.so	11	lib/libscintilla_lexers.so
13	lib/libscintilla_lexers.so.1	12	lib/libscintilla_lexers.so.2
14	@dirrm include/scintilla	13	@dirrm include/scintilla