Move devel/upp602 to devel/upp.

PR:i		95318
Submitted by:	Matthias Sund <m.sund (at) arcor.de> (maintainer)
Repocopied by:	marcus

12 files changed, 1 insertions, 330 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 2c58b61d550c..260e9b0cedd0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1690,7 +1690,7 @@
     SUBDIR += ucpp
     SUBDIR += upnp
     SUBDIR += upnp104
-    SUBDIR += upp602
+    SUBDIR += upp
     SUBDIR += uppaal
     SUBDIR += ups-debug
     SUBDIR += ustl
diff --git a/devel/upp602/Makefile b/devel/upp602/Makefile
deleted file mode 100644
index 034f38a1cdf4..000000000000
--- a/devel/upp602/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# New ports collection makefile for:	upp
-# Date created:				February, 8th 2006
-# Whom:					Matthias Sund <m.sund@arcor.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	upp
-PORTVERSION=	602
-CATEGORIES=	devel x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	upp-src-602
-
-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
-
-USE_ZIP=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-
-BUILD_WRKSRC=	${WRKSRC}/uppsrc/ide
-
-INSTALL_DIRS=	Common examples reference uppsrc
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		Ultimate++ is not supported on FreeBSD 4.x
-.endif
-
-post-extract:
-	@${MKDIR} ${WRKDIR}/${DISTNAME}
-	@for d in ${INSTALL_DIRS}; do ${MV} ${WRKDIR}/$$d ${WRKSRC}; done;
-
-pre-patch:
-	@${FIND} -E ${WRKDIR} -type f -iregex \
-	".*\.(c|h|cpp|icpp|upp|tpp|am|in|lay|key|txt)" -print0 | \
-	${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
-	@for f in `${FIND} -E ${WRKDIR} -type f -name Makefile -print`; \
-	do ${CP} $$f $$f.bak && (${CAT} $$f.bak | ${TR} -d "\r" > $$f); done
-	@${REINPLACE_CMD} -e 's|CFLAGS|C_FLAGS|' ${BUILD_WRKSRC}/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
-
-post-build:
-	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(bak|orig)" -exec ${RM} -r {} \;
-	@${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
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ide ${PREFIX}/bin/theide
-	@${MKDIR} ${PREFIX}/share/upp
-	@${INSTALL_DATA} ${WRKSRC}/GCC32.bm ${PREFIX}/share/upp/GCC32.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;
-	@for f in `${CAT} ${WRKSRC}/files.txt`;do ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/upp/$$f;done;
-
-post-install:
-	@${ECHO_CMD} bin/theide > ${TMPPLIST}
-	@${ECHO_CMD} share/upp/GCC32.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}
-	@${RM} ${WRKSRC}/*.txt
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/devel/upp602/distinfo b/devel/upp602/distinfo
deleted file mode 100644
index 77030989328b..000000000000
--- a/devel/upp602/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (upp-src-602.zip) = f3d38ec40089635614f2ff9faa8e35d3
-SHA256 (upp-src-602.zip) = 7e797be5b5b54cb05eed7069e7d8764209d795738a9b3be5d1e8967d1dd520d8
diff --git a/devel/upp602/files/patch-examples-SDLExample-SDLExample.upp b/devel/upp602/files/patch-examples-SDLExample-SDLExample.upp
deleted file mode 100644
index 5f8e6e0fc6f4..000000000000
--- a/devel/upp602/files/patch-examples-SDLExample-SDLExample.upp
+++ /dev/null
@@ -1,13 +0,0 @@
---- examples/SDLExample/SDLExample.upp.orig	Sat Mar  4 19:46:31 2006
-+++ examples/SDLExample/SDLExample.upp	Sat Mar  4 19:46:38 2006
-@@ -7,6 +7,10 @@
- 
- library(LINUX) "SDL SDLmain";
- 
-+library(FREEBSD) "SDL-1.1 vgl X11 Xext vga aa usbhid ncurses";
-+
-+options(FREEBSD) -I/usr/local/include/SDL11;
-+
- file
- 	main.cpp;
- 
diff --git a/devel/upp602/files/patch-examples-SDLExample-main.cpp b/devel/upp602/files/patch-examples-SDLExample-main.cpp
deleted file mode 100644
index 2e04c9456afb..000000000000
--- a/devel/upp602/files/patch-examples-SDLExample-main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/SDLExample/main.cpp.orig	Sat Mar  4 17:47:29 2006
-+++ examples/SDLExample/main.cpp	Sat Mar  4 17:47:41 2006
-@@ -1,6 +1,6 @@
- #include <Core/Core.h>
- 
--#ifdef PLATFORM_WIN32
-+#if defined PLATFORM_WIN32 || defined PLATFORM_FREEBSD
- #include <SDL.h>
- #else
- #include <SDL/SDL.h>
diff --git a/devel/upp602/files/patch-examples-imgsrv-imgsrv.upp b/devel/upp602/files/patch-examples-imgsrv-imgsrv.upp
deleted file mode 100644
index 771f1b57af08..000000000000
--- a/devel/upp602/files/patch-examples-imgsrv-imgsrv.upp
+++ /dev/null
@@ -1,9 +0,0 @@
---- examples/imgsrv/imgsrv.upp.orig	Sat Mar  4 19:51:12 2006
-+++ examples/imgsrv/imgsrv.upp	Sat Mar  4 19:51:26 2006
-@@ -7,5 +7,5 @@
- 	imgsrv.cpp;
- 
- mainconfig
--	"" = "";
-+	"" = "GUI";
- 
diff --git a/devel/upp602/files/patch-uppsrc-Core-Core.upp b/devel/upp602/files/patch-uppsrc-Core-Core.upp
deleted file mode 100644
index 859b0b413732..000000000000
--- a/devel/upp602/files/patch-uppsrc-Core-Core.upp
+++ /dev/null
@@ -1,11 +0,0 @@
---- uppsrc/Core/Core.upp.orig	Sat Mar  4 19:46:59 2006
-+++ uppsrc/Core/Core.upp	Sat Mar  4 19:47:05 2006
-@@ -13,6 +13,8 @@
- 
- library(WIN32 GCC) "ole32 oleaut32 uuid";
- 
-+library(FREEBSD) pthread;
-+
- options(XGNU) -O0;
- 
- options(XGNU) -ffunction-sections;
diff --git a/devel/upp602/files/patch-uppsrc-Core-Stream.cpp b/devel/upp602/files/patch-uppsrc-Core-Stream.cpp
deleted file mode 100644
index 4758a07896f5..000000000000
--- a/devel/upp602/files/patch-uppsrc-Core-Stream.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- uppsrc/Core/Stream.cpp.orig	Sat Mar  4 17:09:13 2006
-+++ uppsrc/Core/Stream.cpp	Sat Mar  4 17:09:22 2006
-@@ -10,11 +10,14 @@
- #define LLOGHEXDUMP(x, y) // RLOGHEXDUMP(x, y)
- 
- #ifdef PLATFORM_POSIX
-+#define LOFF_T_      off_t
- #define LSEEK64_     lseek
- #define FTRUNCATE64_ ftruncate
- #endif
- 
- #ifdef PLATFORM_LINUX
-+#undef  LOFF_T_
-+#define LOFF_T_      loff_t
- #undef  LSEEK64_
- #define LSEEK64_     lseek64
- #undef  FTRUNCATE64_
-@@ -1217,12 +1220,12 @@
- void FileStream::SetStreamSize(int64 pos)
- {
- 	if(handle < 0) return;
--	loff_t cur = LSEEK64_(handle, 0, SEEK_CUR);
-+	LOFF_T_ cur = LSEEK64_(handle, 0, SEEK_CUR);
- 	if(cur < 0) {
- 		SetLastError();
- 		return;
- 	}
--	loff_t len = LSEEK64_(handle, 0, SEEK_END);
-+	LOFF_T_ len = LSEEK64_(handle, 0, SEEK_END);
- 	if(len < 0) {
- 		SetLastError();
- 		LSEEK64_(handle, cur, SEEK_SET);
diff --git a/devel/upp602/files/patch-uppsrc-Draw-Draw.upp b/devel/upp602/files/patch-uppsrc-Draw-Draw.upp
deleted file mode 100644
index 4666b12b48da..000000000000
--- a/devel/upp602/files/patch-uppsrc-Draw-Draw.upp
+++ /dev/null
@@ -1,35 +0,0 @@
---- uppsrc/Draw/Draw.upp.orig	Sat Mar  4 19:48:28 2006
-+++ uppsrc/Draw/Draw.upp	Sat Mar  4 19:48:44 2006
-@@ -1,22 +1,24 @@
--uses
--	Core;
--
- acceptflags
- 	XLFD;
- 
-+uses
-+	Core;
-+
- library(WIN32) "user32 gdi32";
- 
--library(LINUX) "X11";
-+library(LINUX) X11;
- 
--library(LINUX) "dl";
-+library(LINUX) dl;
- 
--library(LINUX !XLFD) "Xft";
-+library(LINUX !XLFD) Xft;
- 
--library(FREEBSD) "X11";
-+library(FREEBSD) X11;
- 
--library(FREEBSD !XLFD) "Xft fontconfig";
-+library(FREEBSD !XLFD) Xft;
- 
- library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
-+
-+library(FREEBSD !XLFD !SHARED) "fontconfig Xrender freetype expat";
- 
- file
- 	Draw.h,
diff --git a/devel/upp602/files/patch-uppsrc-ide-Makefile b/devel/upp602/files/patch-uppsrc-ide-Makefile
deleted file mode 100644
index 749e05995f4e..000000000000
--- a/devel/upp602/files/patch-uppsrc-ide-Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
----uppsrc/ide/Makefile.orig	Mon Mar 20 18:36:35 2006
-+++ uppsrc/ide/Makefile	Mon Mar 20 18:37:40 2006
-@@ -1,13 +1,13 @@
--UPPDIR1 = /src/uppsrc/
-+UPPDIR1 = ../
- 
--UPPOUT = /home/cxl/upp/out/
--CINC =  -I$(UPPDIR1)
--Macro =  -DflagGUI -DflagGCC -DflagSHARED -DflagLINUX
--CC = c++ -c -O2 -Os -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
-+Macro =  -DflagGUI -DflagGCC -DflagSHARED -DflagFREEBSD
-+C_FLAGS = $(CC) -c $(CFLAGS)
-+CPPFLAGS = $(CXX) -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/
- 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 = /src/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/upp602/pkg-descr b/devel/upp602/pkg-descr
deleted file mode 100644
index 344d7279ab77..000000000000
--- a/devel/upp602/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Ultimate++ is a C++ cross-platform rapid application development suite.
-It includes a set of libraries (GUI, SQL, etc..), and an integrated
-development environment.
-
-WWW: http://upp.sourceforge.net/
diff --git a/devel/upp602/pkg-message b/devel/upp602/pkg-message
deleted file mode 100644
index 93c0761b36ba..000000000000
--- a/devel/upp602/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-===============================================================================
-You may wish to set environment variable $UPP_DIR to your personal Ultimate++
-installation directory.
-===============================================================================