Attachment #77659 for bug #111787

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




#

PORTNAME=	upp
PORTVERSION=	2007.1
PORTREVISION=	2
CATEGORIES=	devel x11-toolkits
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-${PORTVERSION}

MAINTAINER=	m.sund@arcor.de
COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite

LIB_DEPENDS=	Xft:${PORTSDIR}/x11-fonts/libXft\
		freetype.9:${PORTSDIR}/print/freetype2\
		expat.6:${PORTSDIR}/textproc/expat2\
		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20

USE_ZIP=	yes
USE_DOS2UNIX=	yes
USE_GMAKE=	yes
USE_X_PREFIX=	yes
USE_XLIB=	yes

USE_SDL=	sdl
.endif

WRKSRC=	${WRKDIR}

INSTALL_DIRS=	Common examples reference tutorial uppsrc

INSTALL_DIRS=	Common examples reference uppsrc

.include <bsd.port.pre.mk>


.endif

pre-patch:
	@${REINPLACE_CMD} -e 's|CFLAGS|C_FLAGS|' ${WRKSRC}/uppsrc/ide/Makefile

pre-build:
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/uppsrc/ide/Makefile
	@${REINPLACE_CMD} -e 's|-ldl|-lfreetype|g' ${WRKSRC}/uppsrc/ide/Makefile
	@${REINPLACE_CMD} -e 's|CINC =(.*)|$1 ${PTHREAD_CFLAGS}|' ${WRKSRC}/uppsrc/ide/Makefile

post-build:
	@${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "DEBUG_BLITZ = \"1\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "DEBUG_OPTIONS = \"-O0\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "RELEASE_BLITZ = \"0\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "RELEASE_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "RELEASE_OPTIONS = \"-O3 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "INCLUDE = \"${X11BASE}/include;${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/atk-1.0\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "LIB = \"${X11BASE}/lib;${LOCALBASE}/lib\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "REMOTE_HOST = \"\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "REMOTE_OS = \"\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "REMOTE_TRANSFER = \"\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "REMOTE_MAP = \"\";" >> ${WRKSRC}/GCC.bm
	@${ECHO_CMD} "REMOTE_HOST = \"\";" >> ${WRKSRC}/GCC32.bm
	@${ECHO_CMD} "REMOTE_OS = \"FREEBSD\";" >> ${WRKSRC}/GCC32.bm
	@${ECHO_CMD} "REMOTE_TRANSFER = \"\";" >> ${WRKSRC}/GCC32.bm
	@${ECHO_CMD} "REMOTE_MAP = \"\";" >> ${WRKSRC}/GCC32.bm

do-install:
	@${INSTALL_PROGRAM} ${WRKSRC}/out/ide/GCC-Gcc-Gui-Linux-Main-Shared/ide ${PREFIX}/bin/theide
	@${MKDIR} ${PREFIX}/share/upp
	@${INSTALL_DATA} ${WRKSRC}/GCC.bm ${PREFIX}/share/upp/GCC.bm
	@(cd ${WRKSRC} && for d in ${INSTALL_DIRS};do ${FIND} $$d \! -empty -type d -print|${SORT} -r>>dirs.txt;done;)
	@(cd ${WRKSRC} && for d in ${INSTALL_DIRS};do ${FIND} $$d -type f -print|${SORT}>>files.txt;done;)
	@for d in `${CAT} ${WRKSRC}/dirs.txt`;do ${MKDIR} ${PREFIX}/share/upp/$$d;done;


post-install:
	@${ECHO_CMD} bin/theide > ${TMPPLIST}
	@${ECHO_CMD} share/upp/GCC.bm >> ${TMPPLIST}
	@for f in `${CAT} ${WRKSRC}/files.txt`;do ${ECHO_CMD} share/upp/$$f >> ${TMPPLIST};done;
	@for d in `${CAT} ${WRKSRC}/dirs.txt`;do ${ECHO_CMD} @dirrm share/upp/$$d >> ${TMPPLIST};done;
	@${ECHO_CMD} @dirrm share/upp >> ${TMPPLIST}

Lines 1-4 Link Here

(-)upp/distinfo (-4 / +3 lines)
1	MD5 (upp-src-605.zip) = a9c7dccd6270fb007104dbed7ac792d8	1	MD5 (upp-2007.1.tar.gz) = 52e896525a3754bac265234e520278be
2	SHA256 (upp-src-605.zip) = d7664c72e84545558064c4ea7649ec57ab05b6c0fdd7f084ba1f10ed121e9476	2	SHA256 (upp-2007.1.tar.gz) = 8f8fcf201551b12b9018d16ae07b7199a1e6124d6a03b8aa68bfe0183d5fbd96
3	SIZE (upp-src-605.zip) = 6965517	3	SIZE (upp-2007.1.tar.gz) = 6333018
4	SIZE (upp-src-602.zip) = 5994800

Line 0 Link Here

(-)upp/files/patch-Makefile (+11 lines)
	1	--- Makefile.orig Mon Apr 16 21:17:27 2007
	2	+++ Makefile Mon Apr 16 21:18:26 2007
	3	@@ -25,7 +25,7 @@
	4	install -D uppsrc/ide/GCC.bm $(DESTDIR)/usr/share/upp
	5
	6	.PHONY: all
	7	-all: theide install
	8	+all: theide
	9
	10	.PHONY: clean
	11	clean:

Lines 1-11 Link Here

(-)upp/files/patch-examples-SDLExample-SDLExample.upp (-11 lines)
1	--- examples/SDLExample/SDLExample.upp.orig Wed Oct 4 23:58:12 2006
2	+++ examples/SDLExample/SDLExample.upp Thu Oct 5 00:00:08 2006
3	@@ -7,6 +7,8 @@
4
5	library(LINUX) "SDL SDLmain";
6
7	+library(FREEBSD) "SDL SDLmain X11 Xext Xrandr Xrender vga vgl aa usbhid ncurses";
8	+
9	file
10	main.cpp;
11

Lines 1-11 Link Here

(-)upp/files/patch-uppsrc-Core-Core.upp (-11 lines)
1	--- uppsrc/Core/Core.upp.orig Thu Oct 5 00:00:40 2006
2	+++ uppsrc/Core/Core.upp Thu Oct 5 00:01:06 2006
3	@@ -7,6 +7,8 @@
4
5	library(LINUX) "pthread dl";
6
7	+library(FREEBSD) "pthread";
8	+
9	library(WIN32) "advapi32 shell32 winmm";
10
11	library(SOLARIS) "posix4 dl";




--- uppsrc/Draw/Draw.upp.orig	Thu Oct  5 00:01:36 2006
+++ uppsrc/Draw/Draw.upp	Thu Oct  5 00:03:16 2006
@@ -11,11 +11,9 @@
 
 library(FREEBSD) X11;
 
-library(FREEBSD !XLFD) "Xft fontconfig";
+library(FREEBSD !XLFD) "Xft fontconfig Xrender freetype expat";
 
 library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
-
-library(FREEBSD) "Xrender freetype expat";
 
 file
 	Draw.h,




--- uppsrc/Web/socket.cpp.orig	Thu Oct  5 00:43:27 2006
+++ uppsrc/Web/socket.cpp	Thu Oct  5 20:33:14 2006
@@ -12,6 +12,12 @@
 {
 	NB_TIMEOUT  = 30000,
 	SOCKBUFSIZE = 65536,
+
+#ifdef PLATFORM_WIN32
+	IS_BLOCKED = SOCKERR(EWOULDBLOCK),
+#else
+	IS_BLOCKED = SOCKERR(EINPROGRESS),
+#endif
 };
 
 static bool LogSocketFlag = false;
@@ -202,7 +208,7 @@
 		return true;
 
 	int err = GetLastError();
-	if(err != SOCKERR(EWOULDBLOCK)) {
+	if(err != IS_BLOCKED) {
 		SetSockError(NFormat("connect(%s:%d)", host, port));
 		SLOG("Socket::Data::OpenClient -> connect error, returning false");
 		return false;
@@ -274,7 +280,7 @@
 #endif
 	if(res == 0)
 		is_eof = true;
-	else if(res < 0 && GetLastError() != SOCKERR(EWOULDBLOCK))
+	else if(res < 0 && GetLastError() != IS_BLOCKED)
 		SetSockError("recv");
 	return res;
 }
@@ -282,7 +288,7 @@
 int Socket::Data::Write(const void *buf, int amount)
 {
 	int res = send(socket, (const char *)buf, amount, 0);
-	if(res == 0 || res < 0 && GetLastError() != SOCKERR(EWOULDBLOCK))
+	if(res == 0 || res < 0 && GetLastError() != IS_BLOCKED)
 		SetSockError("send");
 	return res;
 }




--- uppsrc/ide/Makefile.orig	Mon Apr 16 19:28:22 2007
+++ uppsrc/ide/Makefile	Mon Apr 16 19:36:46 2007
@@ -1,12 +1,11 @@
 UPPDIR1 = uppsrc/
+UPPDIR1 = ../
 
 UPPOUT = out/
-CINC =  -I$(UPPDIR1) -I/usr/include/freetype2 -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0
-Macro =  -DflagGUI -DflagGCC -DflagSHARED -DflagLINUX
-CC = c++ -c -O3 -ffunction-sections 
-C_FLAGS = $(CC) -x c
-CPPFLAGS = $(CC) -x c++ 
-LIBPATH =  -L"/usr/X11R6/lib"
+CINC =  -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0
+CINC =  -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2
+Macro =  -DflagGUI -DflagGCC -DflagSHARED -DflagFREEBSD
+C_FLAGS = $(CC) -x c -c $(CFLAGS)
+CPPFLAGS = $(CC) -x c++ -c $(CXXFLAGS)
+LIBPATH =  -L$(X11BASE)/lib -L$(LOCALBASE)/lib
 AR = ar -sr
 OutDir_ide = $(UPPOUT)ide/GCC-Gcc-Gui-Linux-Main-Shared/
 OutDir_ide = $(UPPOUT)ide/GCC32-Gcc-Gui-Linux-Main-Shared/
 Macro_ide = $(Macro) -DflagMAIN
 OutDir_ide_Common = $(UPPOUT)ide/Common/GCC32-Gcc-Gui-Linux-Shared/
@@ -76,47 +76,47 @@
 Macro_PdfDraw = $(Macro)
 
 OutDir = $(OutDir_ide)
-OutFile = /home/cxl/ide
+OutFile = $(UPPDIR1)../ide
 
 .PHONY: all
 all: install $(OutFile)
 
 .PHONY: install
 install:
-	-mkdir -p $(OutDir)
-	-mkdir -p $(OutDir_ide)
-	-mkdir -p $(OutDir_ide_Common)
-	-mkdir -p $(OutDir_ide_LayDes)
-	-mkdir -p $(OutDir_ide_IconDes)
-	-mkdir -p $(OutDir_ide_Builders)
-	-mkdir -p $(OutDir_ide_Debuggers)
-	-mkdir -p $(OutDir_ide_Browser)
-	-mkdir -p $(OutDir_ide_Topic)
-	-mkdir -p $(OutDir_ide_VectorDes)
-	-mkdir -p $(OutDir_CodeEditor)
-	-mkdir -p $(OutDir_Topic)
-	-mkdir -p $(OutDir_CtrlLib)
-	-mkdir -p $(OutDir_Web)
-	-mkdir -p $(OutDir_plugin_bz2)
-	-mkdir -p $(OutDir_HexView)
-	-mkdir -p $(OutDir_Esc)
-	-mkdir -p $(OutDir_Core)
-	-mkdir -p $(OutDir_RichEdit)
-	-mkdir -p $(OutDir_plugin_png)
-	-mkdir -p $(OutDir_plugin_gif)
-	-mkdir -p $(OutDir_Image)
-	-mkdir -p $(OutDir_plugin_tif)
-	-mkdir -p $(OutDir_plugin_jpg)
-	-mkdir -p $(OutDir_Draw)
-	-mkdir -p $(OutDir_plugin_z)
-	-mkdir -p $(OutDir_coff_binobj)
-	-mkdir -p $(OutDir_coff)
-	-mkdir -p $(OutDir_plugin_ndisasm)
-	-mkdir -p $(OutDir_CppBase)
-	-mkdir -p $(OutDir_VectorDes)
-	-mkdir -p $(OutDir_RichText)
-	-mkdir -p $(OutDir_CtrlCore)
-	-mkdir -p $(OutDir_PdfDraw)
+	-${MKDIR} $(OutDir)
+	-${MKDIR} $(OutDir_ide)
+	-${MKDIR} $(OutDir_ide_Common)
+	-${MKDIR} $(OutDir_ide_LayDes)
+	-${MKDIR} $(OutDir_ide_IconDes)
+	-${MKDIR} $(OutDir_ide_Builders)
+	-${MKDIR} $(OutDir_ide_Debuggers)
+	-${MKDIR} $(OutDir_ide_Browser)
+	-${MKDIR} $(OutDir_ide_Topic)
+	-${MKDIR} $(OutDir_ide_VectorDes)
+	-${MKDIR} $(OutDir_CodeEditor)
+	-${MKDIR} $(OutDir_Topic)
+	-${MKDIR} $(OutDir_CtrlLib)
+	-${MKDIR} $(OutDir_Web)
+	-${MKDIR} $(OutDir_plugin_bz2)
+	-${MKDIR} $(OutDir_HexView)
+	-${MKDIR} $(OutDir_Esc)
+	-${MKDIR} $(OutDir_Core)
+	-${MKDIR} $(OutDir_RichEdit)
+	-${MKDIR} $(OutDir_plugin_png)
+	-${MKDIR} $(OutDir_plugin_gif)
+	-${MKDIR} $(OutDir_Image)
+	-${MKDIR} $(OutDir_plugin_tif)
+	-${MKDIR} $(OutDir_plugin_jpg)
+	-${MKDIR} $(OutDir_Draw)
+	-${MKDIR} $(OutDir_plugin_z)
+	-${MKDIR} $(OutDir_coff_binobj)
+	-${MKDIR} $(OutDir_coff)
+	-${MKDIR} $(OutDir_plugin_ndisasm)
+	-${MKDIR} $(OutDir_CppBase)
+	-${MKDIR} $(OutDir_VectorDes)
+	-${MKDIR} $(OutDir_RichText)
+	-${MKDIR} $(OutDir_CtrlCore)
+	-${MKDIR} $(OutDir_PdfDraw)
 
 $(OutFile):  \
 	$(OutDir_ide)SelectPkg.o \
@@ -182,7 +182,7 @@
 	$(OutDir_RichText)RichText.a \
 	$(OutDir_CtrlCore)CtrlCore.a \
 	$(OutDir_PdfDraw)PdfDraw.a
-	c++ -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,-O,2 $(LINKOPTIONS) \
+	$(CXX) -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,-O,2 $(LINKOPTIONS) \
 		$(OutDir_ide)SelectPkg.o \
 		$(OutDir_ide)UppWspc.o \
 		$(OutDir_ide)UppDlg.o \

Lines 1-4 Link Here

(-)upp/pkg-message (-4 lines)
1	===============================================================================
2	You may wish to set environment variable $UPP_DIR to your personal Ultimate++
3	installation directory.
4	===============================================================================

Return to bug 111787

Lines 6-27 Link Here

(-)upp/Makefile (-36 / +28 lines)
6	#	6	#
7		7
8	PORTNAME= upp	8	PORTNAME= upp
9	PORTVERSION= 605	9	PORTVERSION= 2007.1
10	PORTREVISION= 2
11	CATEGORIES= devel x11-toolkits	10	CATEGORIES= devel x11-toolkits
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= ${PORTNAME}-src-${PORTVERSION}	13	DISTNAME= ${PORTNAME}-${PORTVERSION}
15		14
16	MAINTAINER= m.sund@arcor.de	15	MAINTAINER= m.sund@arcor.de
17	COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite	16	COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
18		17
19	LIB_DEPENDS= Xft:${PORTSDIR}/x11-fonts/libXft\	18	LIB_DEPENDS= Xft:${PORTSDIR}/x11-fonts/libXft\
20	freetype.9:${PORTSDIR}/print/freetype2\	19	freetype.9:${PORTSDIR}/print/freetype2\
21	expat.6:${PORTSDIR}/textproc/expat2	20	expat.6:${PORTSDIR}/textproc/expat2\
		21	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
22		22
23	USE_ZIP= yes
24	USE_DOS2UNIX= yes
25	USE_GMAKE= yes	23	USE_GMAKE= yes
26	USE_X_PREFIX= yes	24	USE_X_PREFIX= yes
27	USE_XLIB= yes	25	USE_XLIB= yes
Lines 30-40 Link Here
30	USE_SDL= sdl	28	USE_SDL= sdl
31	.endif	29	.endif
32		30
33	EXTRACT_AFTER_ARGS= "-d${DISTNAME}"	31	WRKSRC= ${WRKDIR}
34		32
35	BUILD_WRKSRC= ${WRKSRC}/uppsrc/ide	33	INSTALL_DIRS= Common examples reference tutorial uppsrc
36
37	INSTALL_DIRS= Common examples reference uppsrc
38		34
39	.include <bsd.port.pre.mk>	35	.include <bsd.port.pre.mk>
40		36
Lines 50-87 Link Here
50	.endif	46	.endif
51		47
52	pre-patch:	48	pre-patch:
53	@${REINPLACE_CMD} -e 's\|CFLAGS\|C_FLAGS\|' ${BUILD_WRKSRC}/Makefile	49	@${REINPLACE_CMD} -e 's\|CFLAGS\|C_FLAGS\|' ${WRKSRC}/uppsrc/ide/Makefile
54		50
55	pre-build:	51	pre-build:
56	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' ${BUILD_WRKSRC}/Makefile	52	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/uppsrc/ide/Makefile
57	@${REINPLACE_CMD} -e 's\|-ldl\|-lfreetype\|g' ${BUILD_WRKSRC}/Makefile	53	@${REINPLACE_CMD} -e 's\|-ldl\|-lfreetype\|g' ${WRKSRC}/uppsrc/ide/Makefile
58	@${REINPLACE_CMD} -e 's\|CINC =(.*)\|$1 ${PTHREAD_CFLAGS}\|' ${BUILD_WRKSRC}/Makefile	54	@${REINPLACE_CMD} -e 's\|CINC =(.*)\|$1 ${PTHREAD_CFLAGS}\|' ${WRKSRC}/uppsrc/ide/Makefile
59		55
60	post-build:	56	post-build:
61	@${RM} ${BUILD_WRKSRC}/Makefile.*	57	@${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
62	@${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC32.bm	58	@${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC.bm
63	@${ECHO_CMD} "COMPILER = \"\";" >> ${WRKSRC}/GCC32.bm	59	@${ECHO_CMD} "DEBUG_BLITZ = \"1\";" >> ${WRKSRC}/GCC.bm
64	@${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC32.bm	60	@${ECHO_CMD} "DEBUG_OPTIONS = \"-O0\";" >> ${WRKSRC}/GCC.bm
65	@${ECHO_CMD} "DEBUG_BLITZ = \"1\";" >> ${WRKSRC}/GCC32.bm	61	@${ECHO_CMD} "RELEASE_BLITZ = \"0\";" >> ${WRKSRC}/GCC.bm
66	@${ECHO_CMD} "DEBUG_LINKMODE = \"0\";" >> ${WRKSRC}/GCC32.bm	62	@${ECHO_CMD} "RELEASE_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
67	@${ECHO_CMD} "DEBUG_OPTIONS = \"-O0\";" >> ${WRKSRC}/GCC32.bm	63	@${ECHO_CMD} "RELEASE_OPTIONS = \"-O3 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm
68	@${ECHO_CMD} "RELEASE_BLITZ = \"1\";" >> ${WRKSRC}/GCC32.bm	64	@${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm
69	@${ECHO_CMD} "RELEASE_LINKMODE = \"0\";" >> ${WRKSRC}/GCC32.bm	65	@${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm
70	@${ECHO_CMD} "RELEASE_OPTIONS = \"-O2\";" >> ${WRKSRC}/GCC32.bm	66	@${ECHO_CMD} "INCLUDE = \"${X11BASE}/include;${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/atk-1.0\";" >> ${WRKSRC}/GCC.bm
71	@${ECHO_CMD} "RELEASE_SIZE_OPTIONS = \"-O1\";" >> ${WRKSRC}/GCC32.bm	67	@${ECHO_CMD} "LIB = \"${X11BASE}/lib;${LOCALBASE}/lib\";" >> ${WRKSRC}/GCC.bm
72	@${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC32.bm	68	@${ECHO_CMD} "REMOTE_HOST = \"\";" >> ${WRKSRC}/GCC.bm
73	@${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC32.bm	69	@${ECHO_CMD} "REMOTE_OS = \"\";" >> ${WRKSRC}/GCC.bm
74	@${ECHO_CMD} "INCLUDE = \"${X11BASE}/include;${LOCALBASE}/include;${LOCALBASE}/include/freetype2\";" >> ${WRKSRC}/GCC32.bm	70	@${ECHO_CMD} "REMOTE_TRANSFER = \"\";" >> ${WRKSRC}/GCC.bm
75	@${ECHO_CMD} "LIB = \"${X11BASE}/lib;${LOCALBASE}/lib\";" >> ${WRKSRC}/GCC32.bm	71	@${ECHO_CMD} "REMOTE_MAP = \"\";" >> ${WRKSRC}/GCC.bm
76	@${ECHO_CMD} "REMOTE_HOST = \"\";" >> ${WRKSRC}/GCC32.bm
77	@${ECHO_CMD} "REMOTE_OS = \"FREEBSD\";" >> ${WRKSRC}/GCC32.bm
78	@${ECHO_CMD} "REMOTE_TRANSFER = \"\";" >> ${WRKSRC}/GCC32.bm
79	@${ECHO_CMD} "REMOTE_MAP = \"\";" >> ${WRKSRC}/GCC32.bm
80		72
81	do-install:	73	do-install:
82	@${INSTALL_PROGRAM} ${WRKSRC}/ide ${PREFIX}/bin/theide	74	@${INSTALL_PROGRAM} ${WRKSRC}/out/ide/GCC-Gcc-Gui-Linux-Main-Shared/ide ${PREFIX}/bin/theide
83	@${MKDIR} ${PREFIX}/share/upp	75	@${MKDIR} ${PREFIX}/share/upp
84	@${INSTALL_DATA} ${WRKSRC}/GCC32.bm ${PREFIX}/share/upp/GCC32.bm	76	@${INSTALL_DATA} ${WRKSRC}/GCC.bm ${PREFIX}/share/upp/GCC.bm
85	@(cd ${WRKSRC} && for d in ${INSTALL_DIRS};do ${FIND} $$d \! -empty -type d -print\|${SORT} -r>>dirs.txt;done;)	77	@(cd ${WRKSRC} && for d in ${INSTALL_DIRS};do ${FIND} $$d \! -empty -type d -print\|${SORT} -r>>dirs.txt;done;)
86	@(cd ${WRKSRC} && for d in ${INSTALL_DIRS};do ${FIND} $$d -type f -print\|${SORT}>>files.txt;done;)	78	@(cd ${WRKSRC} && for d in ${INSTALL_DIRS};do ${FIND} $$d -type f -print\|${SORT}>>files.txt;done;)
87	@for d in `${CAT} ${WRKSRC}/dirs.txt`;do ${MKDIR} ${PREFIX}/share/upp/$$d;done;	79	@for d in `${CAT} ${WRKSRC}/dirs.txt`;do ${MKDIR} ${PREFIX}/share/upp/$$d;done;
Lines 89-95 Link Here
89		81
90	post-install:	82	post-install:
91	@${ECHO_CMD} bin/theide > ${TMPPLIST}	83	@${ECHO_CMD} bin/theide > ${TMPPLIST}
92	@${ECHO_CMD} share/upp/GCC32.bm >> ${TMPPLIST}	84	@${ECHO_CMD} share/upp/GCC.bm >> ${TMPPLIST}
93	@for f in `${CAT} ${WRKSRC}/files.txt`;do ${ECHO_CMD} share/upp/$$f >> ${TMPPLIST};done;	85	@for f in `${CAT} ${WRKSRC}/files.txt`;do ${ECHO_CMD} share/upp/$$f >> ${TMPPLIST};done;
94	@for d in `${CAT} ${WRKSRC}/dirs.txt`;do ${ECHO_CMD} @dirrm share/upp/$$d >> ${TMPPLIST};done;	86	@for d in `${CAT} ${WRKSRC}/dirs.txt`;do ${ECHO_CMD} @dirrm share/upp/$$d >> ${TMPPLIST};done;
95	@${ECHO_CMD} @dirrm share/upp >> ${TMPPLIST}	87	@${ECHO_CMD} @dirrm share/upp >> ${TMPPLIST}

Lines 1-15 Link Here

(-)upp/files/patch-uppsrc-Draw-Draw.upp (-15 lines)
1	--- uppsrc/Draw/Draw.upp.orig Thu Oct 5 00:01:36 2006
2	+++ uppsrc/Draw/Draw.upp Thu Oct 5 00:03:16 2006
3	@@ -11,11 +11,9 @@
4
5	library(FREEBSD) X11;
6
7	-library(FREEBSD !XLFD) "Xft fontconfig";
8	+library(FREEBSD !XLFD) "Xft fontconfig Xrender freetype expat";
9
10	library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
11	-
12	-library(FREEBSD) "Xrender freetype expat";
13
14	file
15	Draw.h,

Lines 1-42 Link Here

(-)upp/files/patch-uppsrc-Web-socket.cpp (-42 lines)
1	--- uppsrc/Web/socket.cpp.orig Thu Oct 5 00:43:27 2006
2	+++ uppsrc/Web/socket.cpp Thu Oct 5 20:33:14 2006
3	@@ -12,6 +12,12 @@
4	{
5	NB_TIMEOUT = 30000,
6	SOCKBUFSIZE = 65536,
7	+
8	+#ifdef PLATFORM_WIN32
9	+ IS_BLOCKED = SOCKERR(EWOULDBLOCK),
10	+#else
11	+ IS_BLOCKED = SOCKERR(EINPROGRESS),
12	+#endif
13	};
14
15	static bool LogSocketFlag = false;
16	@@ -202,7 +208,7 @@
17	return true;
18
19	int err = GetLastError();
20	- if(err != SOCKERR(EWOULDBLOCK)) {
21	+ if(err != IS_BLOCKED) {
22	SetSockError(NFormat("connect(%s:%d)", host, port));
23	SLOG("Socket::Data::OpenClient -> connect error, returning false");
24	return false;
25	@@ -274,7 +280,7 @@
26	#endif
27	if(res == 0)
28	is_eof = true;
29	- else if(res < 0 && GetLastError() != SOCKERR(EWOULDBLOCK))
30	+ else if(res < 0 && GetLastError() != IS_BLOCKED)
31	SetSockError("recv");
32	return res;
33	}
34	@@ -282,7 +288,7 @@
35	int Socket::Data::Write(const void *buf, int amount)
36	{
37	int res = send(socket, (const char *)buf, amount, 0);
38	- if(res == 0 \|\| res < 0 && GetLastError() != SOCKERR(EWOULDBLOCK))
39	+ if(res == 0 \|\| res < 0 && GetLastError() != IS_BLOCKED)
40	SetSockError("send");
41	return res;
42	}

Lines 1-116 Link Here

(-)upp/files/patch-uppsrc-ide-Makefile (-107 / +11 lines)
1	--- uppsrc/ide/Makefile.orig Sat Jun 3 15:34:49 2006	1	--- uppsrc/ide/Makefile.orig Mon Apr 16 19:28:22 2007
2	+++ uppsrc/ide/Makefile Sat Jun 3 15:38:38 2006	2	+++ uppsrc/ide/Makefile Mon Apr 16 19:36:46 2007
3	@@ -1,13 +1,13 @@	3	@@ -1,12 +1,11 @@
4	-UPPDIR1 = /src/uppsrc/	4	UPPDIR1 = uppsrc/
5	+UPPDIR1 = ../
6		5
7	-UPPOUT = /home/cxl/upp/out/	6	UPPOUT = out/
8	-CINC = -I$(UPPDIR1)	7	-CINC = -I$(UPPDIR1) -I/usr/include/freetype2 -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0
9	-Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagLINUX	8	-Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagLINUX
10	-CC = c++ -c -O2 -Os -ffunction-sections	9	-CC = c++ -c -O3 -ffunction-sections
11	-C_FLAGS = $(CC) -x c	10	-C_FLAGS = $(CC) -x c
12	-CPPFLAGS = $(CC) -x c++	11	-CPPFLAGS = $(CC) -x c++
13	-LIBPATH = -L"/usr/X11R6/lib"	12	-LIBPATH = -L"/usr/X11R6/lib"
14	+UPPOUT = $(UPPDIR1)../out/	13	+CINC = -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0
15	+CINC = -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2
16	+Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagFREEBSD	14	+Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagFREEBSD
17	+C_FLAGS = $(CC) -c $(CFLAGS)	15	+C_FLAGS = $(CC) -x c -c $(CFLAGS)
18	+CPPFLAGS = $(CXX) -c $(CXXFLAGS)	16	+CPPFLAGS = $(CC) -x c++ -c $(CXXFLAGS)
19	+LIBPATH = -L$(X11BASE)/lib -L$(LOCALBASE)/lib	17	+LIBPATH = -L$(X11BASE)/lib -L$(LOCALBASE)/lib
20	AR = ar -sr	18	AR = ar -sr
21	+MKDIR?= mkdir -p	19	OutDir_ide = $(UPPOUT)ide/GCC-Gcc-Gui-Linux-Main-Shared/
22	OutDir_ide = $(UPPOUT)ide/GCC32-Gcc-Gui-Linux-Main-Shared/
23	Macro_ide = $(Macro) -DflagMAIN	20	Macro_ide = $(Macro) -DflagMAIN
24	OutDir_ide_Common = $(UPPOUT)ide/Common/GCC32-Gcc-Gui-Linux-Shared/
25	@@ -76,47 +76,47 @@
26	Macro_PdfDraw = $(Macro)
27
28	OutDir = $(OutDir_ide)
29	-OutFile = /home/cxl/ide
30	+OutFile = $(UPPDIR1)../ide
31
32	.PHONY: all
33	all: install $(OutFile)
34
35	.PHONY: install
36	install:
37	- -mkdir -p $(OutDir)
38	- -mkdir -p $(OutDir_ide)
39	- -mkdir -p $(OutDir_ide_Common)
40	- -mkdir -p $(OutDir_ide_LayDes)
41	- -mkdir -p $(OutDir_ide_IconDes)
42	- -mkdir -p $(OutDir_ide_Builders)
43	- -mkdir -p $(OutDir_ide_Debuggers)
44	- -mkdir -p $(OutDir_ide_Browser)
45	- -mkdir -p $(OutDir_ide_Topic)
46	- -mkdir -p $(OutDir_ide_VectorDes)
47	- -mkdir -p $(OutDir_CodeEditor)
48	- -mkdir -p $(OutDir_Topic)
49	- -mkdir -p $(OutDir_CtrlLib)
50	- -mkdir -p $(OutDir_Web)
51	- -mkdir -p $(OutDir_plugin_bz2)
52	- -mkdir -p $(OutDir_HexView)
53	- -mkdir -p $(OutDir_Esc)
54	- -mkdir -p $(OutDir_Core)
55	- -mkdir -p $(OutDir_RichEdit)
56	- -mkdir -p $(OutDir_plugin_png)
57	- -mkdir -p $(OutDir_plugin_gif)
58	- -mkdir -p $(OutDir_Image)
59	- -mkdir -p $(OutDir_plugin_tif)
60	- -mkdir -p $(OutDir_plugin_jpg)
61	- -mkdir -p $(OutDir_Draw)
62	- -mkdir -p $(OutDir_plugin_z)
63	- -mkdir -p $(OutDir_coff_binobj)
64	- -mkdir -p $(OutDir_coff)
65	- -mkdir -p $(OutDir_plugin_ndisasm)
66	- -mkdir -p $(OutDir_CppBase)
67	- -mkdir -p $(OutDir_VectorDes)
68	- -mkdir -p $(OutDir_RichText)
69	- -mkdir -p $(OutDir_CtrlCore)
70	- -mkdir -p $(OutDir_PdfDraw)
71	+ -${MKDIR} $(OutDir)
72	+ -${MKDIR} $(OutDir_ide)
73	+ -${MKDIR} $(OutDir_ide_Common)
74	+ -${MKDIR} $(OutDir_ide_LayDes)
75	+ -${MKDIR} $(OutDir_ide_IconDes)
76	+ -${MKDIR} $(OutDir_ide_Builders)
77	+ -${MKDIR} $(OutDir_ide_Debuggers)
78	+ -${MKDIR} $(OutDir_ide_Browser)
79	+ -${MKDIR} $(OutDir_ide_Topic)
80	+ -${MKDIR} $(OutDir_ide_VectorDes)
81	+ -${MKDIR} $(OutDir_CodeEditor)
82	+ -${MKDIR} $(OutDir_Topic)
83	+ -${MKDIR} $(OutDir_CtrlLib)
84	+ -${MKDIR} $(OutDir_Web)
85	+ -${MKDIR} $(OutDir_plugin_bz2)
86	+ -${MKDIR} $(OutDir_HexView)
87	+ -${MKDIR} $(OutDir_Esc)
88	+ -${MKDIR} $(OutDir_Core)
89	+ -${MKDIR} $(OutDir_RichEdit)
90	+ -${MKDIR} $(OutDir_plugin_png)
91	+ -${MKDIR} $(OutDir_plugin_gif)
92	+ -${MKDIR} $(OutDir_Image)
93	+ -${MKDIR} $(OutDir_plugin_tif)
94	+ -${MKDIR} $(OutDir_plugin_jpg)
95	+ -${MKDIR} $(OutDir_Draw)
96	+ -${MKDIR} $(OutDir_plugin_z)
97	+ -${MKDIR} $(OutDir_coff_binobj)
98	+ -${MKDIR} $(OutDir_coff)
99	+ -${MKDIR} $(OutDir_plugin_ndisasm)
100	+ -${MKDIR} $(OutDir_CppBase)
101	+ -${MKDIR} $(OutDir_VectorDes)
102	+ -${MKDIR} $(OutDir_RichText)
103	+ -${MKDIR} $(OutDir_CtrlCore)
104	+ -${MKDIR} $(OutDir_PdfDraw)
105
106	$(OutFile): \
107	$(OutDir_ide)SelectPkg.o \
108	@@ -182,7 +182,7 @@
109	$(OutDir_RichText)RichText.a \
110	$(OutDir_CtrlCore)CtrlCore.a \
111	$(OutDir_PdfDraw)PdfDraw.a
112	- c++ -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,-O,2 $(LINKOPTIONS) \
113	+ $(CXX) -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,-O,2 $(LINKOPTIONS) \
114	$(OutDir_ide)SelectPkg.o \
115	$(OutDir_ide)UppWspc.o \
116	$(OutDir_ide)UppDlg.o \