5 files changed, 28 insertions, 71 deletions

diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index d3d63378b76a..bdcf2d9e7475 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	upp
-PORTVERSION=	2007.1
-PORTREVISION=	4
+PORTVERSION=	2008.1
 CATEGORIES=	devel x11-toolkits
 MASTER_SITES=	SF
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	m.sund@arcor.de
 COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
@@ -21,27 +21,34 @@ USE_XORG=	xft
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 
-.if defined(WITH_SDL)
-USE_SDL=	sdl
-.endif
+ALL_TARGET=	theide
 
 WRKSRC=	${WRKDIR}
 
-INSTALL_DIRS=	Common examples reference tutorial uppsrc
+INSTALL_DIRS=	bazaar examples reference tutorial uppsrc
 
-pre-everything::
-.if !defined(WITH_SDL)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define WITH_SDL to install SDL library for running SDL example."
-	@${ECHO_MSG} ""
-.endif
+OPTIONS=	SDL	"Install with SDL library" off \
+		GL	"Install wiht OpenGL library" off \
+		MYSQL	"Install with MySQL database" off \
+		PGSQL	"Install with PostreSQL database" off
+
+.include <bsd.port.pre.mk>
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|CFLAGS|C_FLAGS|' ${WRKSRC}/uppsrc/ide/Makefile
+.if defined(WITH_SDL)
+USE_SDL=	sdl
+.endif
+.if defined(WITH_GL)
+USE_GL=	gl
+.endif
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+.endif
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+.endif
 
 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:
@@ -51,7 +58,7 @@ post-build:
 	@${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} "RELEASE_OPTIONS = \"-O2 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm
 	@${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm
 	@${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm
 	@${ECHO_CMD} "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
@@ -62,7 +69,7 @@ post-build:
 	@${ECHO_CMD} "REMOTE_MAP = \"\";" >> ${WRKSRC}/GCC.bm
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/out/ide/GCC-Gcc-Gui-Linux-Main-Shared/ide ${PREFIX}/bin/theide
+	@${INSTALL_PROGRAM} ${WRKSRC}/out/ide/GCC-FREEBSD-Gcc-Gui-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;)
@@ -78,4 +85,4 @@ post-install:
 	@${ECHO_CMD} @dirrm share/upp >> ${TMPPLIST}
 	@${RM} ${WRKSRC}/*.txt
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/upp/distinfo b/devel/upp/distinfo
index 27ad1b926152..eee8b4ebb164 100644
--- a/devel/upp/distinfo
+++ b/devel/upp/distinfo
@@ -1,3 +1,3 @@
-MD5 (upp-2007.1.tar.gz) = 52e896525a3754bac265234e520278be
-SHA256 (upp-2007.1.tar.gz) = 8f8fcf201551b12b9018d16ae07b7199a1e6124d6a03b8aa68bfe0183d5fbd96
-SIZE (upp-2007.1.tar.gz) = 6333018
+MD5 (upp-src-2008.1.tar.gz) = fd98b01aac28037060e35295c3256b26
+SHA256 (upp-src-2008.1.tar.gz) = 3c1de9a50a40817c75538b441a4e0a43708d08aff73045e256e2a1ee111407aa
+SIZE (upp-src-2008.1.tar.gz) = 7718090
diff --git a/devel/upp/files/patch-Makefile b/devel/upp/files/patch-Makefile
deleted file mode 100644
index 4c6a257772f9..000000000000
--- a/devel/upp/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-uppsrc-Core-Core.h b/devel/upp/files/patch-uppsrc-Core-Core.h
deleted file mode 100644
index f0beeedd5960..000000000000
--- a/devel/upp/files/patch-uppsrc-Core-Core.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- uppsrc/Core/Core.h.orig	Thu Jul 19 19:57:53 2007
-+++ uppsrc/Core/Core.h	Thu Jul 19 19:59:16 2007
-@@ -300,8 +300,16 @@
- #include <string>

- 

- #ifdef PLATFORM_POSIX

-+#ifdef COMPILER_GCC
-+#if __GNUC__ > 3
-+#include <ext/atomicity.h>
-+#else
-+#include <bits/atomicity.h>
-+#endif
-+#else
- #include <bits/atomicity.h>

- #endif

-+#endif
- 

- // fix MSC8 beta problem....

- #ifdef COMPILER_MSC

diff --git a/devel/upp/files/patch-uppsrc-ide-Makefile b/devel/upp/files/patch-uppsrc-ide-Makefile
deleted file mode 100644
index 3bb69074b02f..000000000000
--- a/devel/upp/files/patch-uppsrc-ide-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 = 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$(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) -x c -c $(CFLAGS)
-+CPPFLAGS = $(CC) -x c++ -c $(CXXFLAGS)
-+LIBPATH =  -L$(LOCALBASE)/lib
- AR = ar -sr
- OutDir_ide = $(UPPOUT)ide/GCC-Gcc-Gui-Linux-Main-Shared/
- Macro_ide = $(Macro) -DflagMAIN