9 files changed, 53 insertions, 230 deletions

diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 92a9b88d0fa4..b2954ba550eb 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	upp
-PORTVERSION=	605
-PORTREVISION=	2
+PORTVERSION=	2007.1
 CATEGORIES=	devel x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}
+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
+		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
@@ -30,11 +28,9 @@ USE_XLIB=	yes
 USE_SDL=	sdl
 .endif
 
-EXTRACT_AFTER_ARGS=	"-d${DISTNAME}"
+WRKSRC=	${WRKDIR}
 
-BUILD_WRKSRC=	${WRKSRC}/uppsrc/ide
-
-INSTALL_DIRS=	Common examples reference uppsrc
+INSTALL_DIRS=	Common examples reference tutorial uppsrc
 
 .include <bsd.port.pre.mk>
 
@@ -50,38 +46,34 @@ pre-everything::
 .endif
 
 pre-patch:
-	@${REINPLACE_CMD} -e 's|CFLAGS|C_FLAGS|' ${BUILD_WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|CFLAGS|C_FLAGS|' ${WRKSRC}/uppsrc/ide/Makefile
 
 pre-build:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${BUILD_WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|-ldl|-lfreetype|g' ${BUILD_WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|CINC =(.*)|$1 ${PTHREAD_CFLAGS}|' ${BUILD_WRKSRC}/Makefile
+	@${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:
-	@${RM} ${BUILD_WRKSRC}/Makefile.*
-	@${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "COMPILER = \"\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "DEBUG_BLITZ = \"1\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "DEBUG_LINKMODE = \"0\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "DEBUG_OPTIONS = \"-O0\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "RELEASE_BLITZ = \"1\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "RELEASE_LINKMODE = \"0\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "RELEASE_OPTIONS = \"-O2\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "RELEASE_SIZE_OPTIONS = \"-O1\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "INCLUDE = \"${X11BASE}/include;${LOCALBASE}/include;${LOCALBASE}/include/freetype2\";" >> ${WRKSRC}/GCC32.bm
-	@${ECHO_CMD} "LIB = \"${X11BASE}/lib;${LOCALBASE}/lib\";" >> ${WRKSRC}/GCC32.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
+	@${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
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ide ${PREFIX}/bin/theide
+	@${INSTALL_PROGRAM} ${WRKSRC}/out/ide/GCC-Gcc-Gui-Linux-Main-Shared/ide ${PREFIX}/bin/theide
 	@${MKDIR} ${PREFIX}/share/upp
-	@${INSTALL_DATA} ${WRKSRC}/GCC32.bm ${PREFIX}/share/upp/GCC32.bm
+	@${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;
@@ -89,7 +81,7 @@ do-install:
 
 post-install:
 	@${ECHO_CMD} bin/theide > ${TMPPLIST}
-	@${ECHO_CMD} share/upp/GCC32.bm >> ${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}
diff --git a/devel/upp/distinfo b/devel/upp/distinfo
index 0f3a73b06cde..27ad1b926152 100644
--- a/devel/upp/distinfo
+++ b/devel/upp/distinfo
@@ -1,4 +1,3 @@
-MD5 (upp-src-605.zip) = a9c7dccd6270fb007104dbed7ac792d8
-SHA256 (upp-src-605.zip) = d7664c72e84545558064c4ea7649ec57ab05b6c0fdd7f084ba1f10ed121e9476
-SIZE (upp-src-605.zip) = 6965517
-SIZE (upp-src-602.zip) = 5994800
+MD5 (upp-2007.1.tar.gz) = 52e896525a3754bac265234e520278be
+SHA256 (upp-2007.1.tar.gz) = 8f8fcf201551b12b9018d16ae07b7199a1e6124d6a03b8aa68bfe0183d5fbd96
+SIZE (upp-2007.1.tar.gz) = 6333018
diff --git a/devel/upp/files/patch-Makefile b/devel/upp/files/patch-Makefile
new file mode 100644
index 000000000000..4c6a257772f9
--- /dev/null
+++ b/devel/upp/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	Mon Apr 16 21:17:27 2007
++++ Makefile	Mon Apr 16 21:18:26 2007
+@@ -25,7 +25,7 @@
+ 	install -D uppsrc/ide/GCC.bm $(DESTDIR)/usr/share/upp
+ 
+ .PHONY: all
+-all:	theide install
++all:	theide
+ 
+ .PHONY: clean
+ clean:
diff --git a/devel/upp/files/patch-examples-SDLExample-SDLExample.upp b/devel/upp/files/patch-examples-SDLExample-SDLExample.upp
deleted file mode 100644
index dce9c841ab27..000000000000
--- a/devel/upp/files/patch-examples-SDLExample-SDLExample.upp
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/SDLExample/SDLExample.upp.orig	Wed Oct  4 23:58:12 2006
-+++ examples/SDLExample/SDLExample.upp	Thu Oct  5 00:00:08 2006
-@@ -7,6 +7,8 @@
- 
- library(LINUX) "SDL SDLmain";
- 
-+library(FREEBSD) "SDL SDLmain X11 Xext Xrandr Xrender vga vgl aa usbhid ncurses";
-+
- file
- 	main.cpp;
- 
diff --git a/devel/upp/files/patch-uppsrc-Core-Core.upp b/devel/upp/files/patch-uppsrc-Core-Core.upp
deleted file mode 100644
index 25fe2c47bcdc..000000000000
--- a/devel/upp/files/patch-uppsrc-Core-Core.upp
+++ /dev/null
@@ -1,11 +0,0 @@
---- uppsrc/Core/Core.upp.orig	Thu Oct  5 00:00:40 2006
-+++ uppsrc/Core/Core.upp	Thu Oct  5 00:01:06 2006
-@@ -7,6 +7,8 @@
- 
- library(LINUX) "pthread dl";
- 
-+library(FREEBSD) "pthread";
-+
- library(WIN32) "advapi32 shell32 winmm";
- 
- library(SOLARIS) "posix4 dl";
diff --git a/devel/upp/files/patch-uppsrc-Draw-Draw.upp b/devel/upp/files/patch-uppsrc-Draw-Draw.upp
deleted file mode 100644
index d3a7118bb6d9..000000000000
--- a/devel/upp/files/patch-uppsrc-Draw-Draw.upp
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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,
diff --git a/devel/upp/files/patch-uppsrc-Web-socket.cpp b/devel/upp/files/patch-uppsrc-Web-socket.cpp
deleted file mode 100644
index 8a84547e90fc..000000000000
--- a/devel/upp/files/patch-uppsrc-Web-socket.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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;
- }
diff --git a/devel/upp/files/patch-uppsrc-ide-Makefile b/devel/upp/files/patch-uppsrc-ide-Makefile
index 8a07af10a339..17ca6944eb0b 100644
--- a/devel/upp/files/patch-uppsrc-ide-Makefile
+++ b/devel/upp/files/patch-uppsrc-ide-Makefile
@@ -1,116 +1,20 @@
---- uppsrc/ide/Makefile.orig	Sat Jun  3 15:34:49 2006
-+++ uppsrc/ide/Makefile	Sat Jun  3 15:38:38 2006
-@@ -1,13 +1,13 @@
--UPPDIR1 = /src/uppsrc/
-+UPPDIR1 = ../
+--- 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/
  
--UPPOUT = /home/cxl/upp/out/
--CINC =  -I$(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 -O2 -Os -ffunction-sections 
+-CC = c++ -c -O3 -ffunction-sections 
 -C_FLAGS = $(CC) -x c
 -CPPFLAGS = $(CC) -x c++ 
 -LIBPATH =  -L"/usr/X11R6/lib"
-+UPPOUT = $(UPPDIR1)../out/
-+CINC =  -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2
++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
 +Macro =  -DflagGUI -DflagGCC -DflagSHARED -DflagFREEBSD
-+C_FLAGS = $(CC) -c $(CFLAGS)
-+CPPFLAGS = $(CXX) -c $(CXXFLAGS)
++C_FLAGS = $(CC) -x c -c $(CFLAGS)
++CPPFLAGS = $(CC) -x c++ -c $(CXXFLAGS)
 +LIBPATH =  -L$(X11BASE)/lib -L$(LOCALBASE)/lib
  AR = ar -sr
-+MKDIR?=	mkdir -p
- OutDir_ide = $(UPPOUT)ide/GCC32-Gcc-Gui-Linux-Main-Shared/
+ OutDir_ide = $(UPPOUT)ide/GCC-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 \
diff --git a/devel/upp/pkg-message b/devel/upp/pkg-message
deleted file mode 100644
index 93c0761b36ba..000000000000
--- a/devel/upp/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-===============================================================================
-You may wish to set environment variable $UPP_DIR to your personal Ultimate++
-installation directory.
-===============================================================================