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

(-)upp/Makefile (-11 / +16 lines)
Lines 6-16 Link Here
6
#
6
#
7
7
8
PORTNAME=	upp
8
PORTNAME=	upp
9
PORTVERSION=	602
9
PORTVERSION=	605
10
CATEGORIES=	devel x11-toolkits
10
CATEGORIES=	devel x11-toolkits
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
13
DISTNAME=	upp-src-602
13
DISTNAME=	${PORTNAME}-src-${PORTVERSION}
14
14
15
MAINTAINER=	m.sund@arcor.de
15
MAINTAINER=	m.sund@arcor.de
16
COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
16
COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
Lines 20-28 Link Here
20
		expat.6:${PORTSDIR}/textproc/expat2
20
		expat.6:${PORTSDIR}/textproc/expat2
21
21
22
USE_ZIP=	yes
22
USE_ZIP=	yes
23
USE_DOS2UNIX=	yes
23
USE_GMAKE=	yes
24
USE_GMAKE=	yes
24
USE_X_PREFIX=	yes
25
USE_X_PREFIX=	yes
25
26
27
.if defined(WITH_SDL)
28
USE_SDL=	sdl
29
.endif
30
31
EXTRACT_AFTER_ARGS=	"-d${DISTNAME}"
32
26
BUILD_WRKSRC=	${WRKSRC}/uppsrc/ide
33
BUILD_WRKSRC=	${WRKSRC}/uppsrc/ide
27
34
28
INSTALL_DIRS=	Common examples reference uppsrc
35
INSTALL_DIRS=	Common examples reference uppsrc
Lines 33-48 Link Here
33
BROKEN=		Ultimate++ is not supported on FreeBSD 4.x
40
BROKEN=		Ultimate++ is not supported on FreeBSD 4.x
34
.endif
41
.endif
35
42
36
post-extract:
43
pre-everything::
37
	@${MKDIR} ${WRKDIR}/${DISTNAME}
44
.if !defined(WITH_SDL)
38
	@for d in ${INSTALL_DIRS}; do ${MV} ${WRKDIR}/$$d ${WRKSRC}; done;
45
	@${ECHO_MSG} ""
46
	@${ECHO_MSG} "Define WITH_SDL to install SDL library for running SDL example."
47
	@${ECHO_MSG} ""
48
.endif
39
49
40
pre-patch:
50
pre-patch:
41
	@${FIND} -E ${WRKDIR} -type f -iregex \
42
	".*\.(c|h|cpp|icpp|upp|tpp|am|in|lay|key|txt)" -print0 | \
43
	${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
44
	@for f in `${FIND} -E ${WRKDIR} -type f -name Makefile -print`; \
45
	do ${CP} $$f $$f.bak && (${CAT} $$f.bak | ${TR} -d "\r" > $$f); done
46
	@${REINPLACE_CMD} -e 's|CFLAGS|C_FLAGS|' ${BUILD_WRKSRC}/Makefile
51
	@${REINPLACE_CMD} -e 's|CFLAGS|C_FLAGS|' ${BUILD_WRKSRC}/Makefile
47
52
48
pre-build:
53
pre-build:
Lines 51-57 Link Here
51
	@${REINPLACE_CMD} -e 's|CINC =(.*)|$1 ${PTHREAD_CFLAGS}|' ${BUILD_WRKSRC}/Makefile
56
	@${REINPLACE_CMD} -e 's|CINC =(.*)|$1 ${PTHREAD_CFLAGS}|' ${BUILD_WRKSRC}/Makefile
52
57
53
post-build:
58
post-build:
54
	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(bak|orig)" -exec ${RM} -r {} \;
59
	@${RM} ${BUILD_WRKSRC}/Makefile.*
55
	@${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC32.bm
60
	@${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC32.bm
56
	@${ECHO_CMD} "COMPILER = \"\";" >> ${WRKSRC}/GCC32.bm
61
	@${ECHO_CMD} "COMPILER = \"\";" >> ${WRKSRC}/GCC32.bm
57
	@${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC32.bm
62
	@${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC32.bm
(-)upp/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
MD5 (upp-src-602.zip) = f3d38ec40089635614f2ff9faa8e35d3
1
MD5 (upp-src-605.zip) = a9c7dccd6270fb007104dbed7ac792d8
2
SHA256 (upp-src-602.zip) = 7e797be5b5b54cb05eed7069e7d8764209d795738a9b3be5d1e8967d1dd520d8
2
SHA256 (upp-src-605.zip) = d7664c72e84545558064c4ea7649ec57ab05b6c0fdd7f084ba1f10ed121e9476
3
SIZE (upp-src-605.zip) = 6965517
(-)upp/files/patch-examples-SDLExample-SDLExample.upp (-4 / +4 lines)
Lines 1-12 Link Here
1
--- examples/SDLExample/SDLExample.upp.orig	Sat Mar  4 19:46:31 2006
1
--- examples/SDLExample/SDLExample.upp.orig	Tue Jun  6 20:57:56 2006
2
+++ examples/SDLExample/SDLExample.upp	Sat Mar  4 19:46:38 2006
2
+++ examples/SDLExample/SDLExample.upp	Tue Jun  6 21:18:25 2006
3
@@ -7,6 +7,10 @@
3
@@ -7,6 +7,10 @@
4
 
4
 
5
 library(LINUX) "SDL SDLmain";
5
 library(LINUX) "SDL SDLmain";
6
 
6
 
7
+library(FREEBSD) "SDL-1.1 vgl X11 Xext vga aa usbhid ncurses";
7
+library(FREEBSD) "SDL-1.1 m vgl X11 Xext vga aa usbhid";
8
+
8
+
9
+options(FREEBSD) -I/usr/local/include/SDL11;
9
+link(FREEBSD) -pthread;
10
+
10
+
11
 file
11
 file
12
 	main.cpp;
12
 	main.cpp;
(-)upp/files/patch-examples-SDLExample-main.cpp (-8 / +9 lines)
Lines 1-10 Link Here
1
--- examples/SDLExample/main.cpp.orig	Sat Mar  4 17:47:29 2006
1
--- examples/SDLExample/main.cpp.orig	Tue Jun  6 21:18:47 2006
2
+++ examples/SDLExample/main.cpp	Sat Mar  4 17:47:41 2006
2
+++ examples/SDLExample/main.cpp	Tue Jun  6 21:18:58 2006
3
@@ -1,6 +1,6 @@
3
@@ -3,7 +3,7 @@
4
 #include <Core/Core.h>
4
 #ifdef PLATFORM_WIN32
5
 
6
-#ifdef PLATFORM_WIN32
7
+#if defined PLATFORM_WIN32 || defined PLATFORM_FREEBSD
8
 #include <SDL.h>
5
 #include <SDL.h>
9
 #else
6
 #else
10
 #include <SDL/SDL.h>
7
-#include <SDL/SDL.h>
8
+#include <SDL11/SDL.h>
9
 #endif
10
 
11
 const int maxpoint  = 1000;
(-)upp/files/patch-examples-imgsrv-imgsrv.upp (-9 lines)
Lines 1-9 Link Here
1
--- examples/imgsrv/imgsrv.upp.orig	Sat Mar  4 19:51:12 2006
2
+++ examples/imgsrv/imgsrv.upp	Sat Mar  4 19:51:26 2006
3
@@ -7,5 +7,5 @@
4
 	imgsrv.cpp;
5
 
6
 mainconfig
7
-	"" = "";
8
+	"" = "GUI";
9
 
(-)upp/files/patch-uppsrc-Core-Core.upp (-11 lines)
Lines 1-11 Link Here
1
--- uppsrc/Core/Core.upp.orig	Sat Mar  4 19:46:59 2006
2
+++ uppsrc/Core/Core.upp	Sat Mar  4 19:47:05 2006
3
@@ -13,6 +13,8 @@
4
 
5
 library(WIN32 GCC) "ole32 oleaut32 uuid";
6
 
7
+library(FREEBSD) pthread;
8
+
9
 options(XGNU) -O0;
10
 
11
 options(XGNU) -ffunction-sections;
(-)upp/files/patch-uppsrc-Core-Stream.cpp (-32 lines)
Lines 1-32 Link Here
1
--- uppsrc/Core/Stream.cpp.orig	Sat Mar  4 17:09:13 2006
2
+++ uppsrc/Core/Stream.cpp	Sat Mar  4 17:09:22 2006
3
@@ -10,11 +10,14 @@
4
 #define LLOGHEXDUMP(x, y) // RLOGHEXDUMP(x, y)
5
 
6
 #ifdef PLATFORM_POSIX
7
+#define LOFF_T_      off_t
8
 #define LSEEK64_     lseek
9
 #define FTRUNCATE64_ ftruncate
10
 #endif
11
 
12
 #ifdef PLATFORM_LINUX
13
+#undef  LOFF_T_
14
+#define LOFF_T_      loff_t
15
 #undef  LSEEK64_
16
 #define LSEEK64_     lseek64
17
 #undef  FTRUNCATE64_
18
@@ -1217,12 +1220,12 @@
19
 void FileStream::SetStreamSize(int64 pos)
20
 {
21
 	if(handle < 0) return;
22
-	loff_t cur = LSEEK64_(handle, 0, SEEK_CUR);
23
+	LOFF_T_ cur = LSEEK64_(handle, 0, SEEK_CUR);
24
 	if(cur < 0) {
25
 		SetLastError();
26
 		return;
27
 	}
28
-	loff_t len = LSEEK64_(handle, 0, SEEK_END);
29
+	LOFF_T_ len = LSEEK64_(handle, 0, SEEK_END);
30
 	if(len < 0) {
31
 		SetLastError();
32
 		LSEEK64_(handle, cur, SEEK_SET);
(-)upp/files/patch-uppsrc-Draw-Draw.upp (-35 lines)
Lines 1-35 Link Here
1
--- uppsrc/Draw/Draw.upp.orig	Sat Mar  4 19:48:28 2006
2
+++ uppsrc/Draw/Draw.upp	Sat Mar  4 19:48:44 2006
3
@@ -1,22 +1,24 @@
4
-uses
5
-	Core;
6
-
7
 acceptflags
8
 	XLFD;
9
 
10
+uses
11
+	Core;
12
+
13
 library(WIN32) "user32 gdi32";
14
 
15
-library(LINUX) "X11";
16
+library(LINUX) X11;
17
 
18
-library(LINUX) "dl";
19
+library(LINUX) dl;
20
 
21
-library(LINUX !XLFD) "Xft";
22
+library(LINUX !XLFD) Xft;
23
 
24
-library(FREEBSD) "X11";
25
+library(FREEBSD) X11;
26
 
27
-library(FREEBSD !XLFD) "Xft fontconfig";
28
+library(FREEBSD !XLFD) Xft;
29
 
30
 library(LINUX !XLFD !SHARED) "fontconfig Xrender freetype expat";
31
+
32
+library(FREEBSD !XLFD !SHARED) "fontconfig Xrender freetype expat";
33
 
34
 file
35
 	Draw.h,
(-)upp/files/patch-uppsrc-ide-Makefile (-37 / +37 lines)
Lines 1-5 Link Here
1
---uppsrc/ide/Makefile.orig	Mon Mar 20 18:36:35 2006
1
--- uppsrc/ide/Makefile.orig	Sat Jun  3 15:34:49 2006
2
+++ uppsrc/ide/Makefile	Mon Mar 20 18:37:40 2006
2
+++ uppsrc/ide/Makefile	Sat Jun  3 15:38:38 2006
3
@@ -1,13 +1,13 @@
3
@@ -1,13 +1,13 @@
4
-UPPDIR1 = /src/uppsrc/
4
-UPPDIR1 = /src/uppsrc/
5
+UPPDIR1 = ../
5
+UPPDIR1 = ../
Lines 26-32 Link Here
26
 Macro_PdfDraw = $(Macro)
26
 Macro_PdfDraw = $(Macro)
27
 
27
 
28
 OutDir = $(OutDir_ide)
28
 OutDir = $(OutDir_ide)
29
-OutFile = /src/ide
29
-OutFile = /home/cxl/ide
30
+OutFile = $(UPPDIR1)../ide
30
+OutFile = $(UPPDIR1)../ide
31
 
31
 
32
 .PHONY: all
32
 .PHONY: all
Lines 68-107 Link Here
68
-	-mkdir -p $(OutDir_RichText)
68
-	-mkdir -p $(OutDir_RichText)
69
-	-mkdir -p $(OutDir_CtrlCore)
69
-	-mkdir -p $(OutDir_CtrlCore)
70
-	-mkdir -p $(OutDir_PdfDraw)
70
-	-mkdir -p $(OutDir_PdfDraw)
71
+	-$(MKDIR) $(OutDir)
71
+	-${MKDIR} $(OutDir)
72
+	-$(MKDIR) $(OutDir_ide)
72
+	-${MKDIR} $(OutDir_ide)
73
+	-$(MKDIR) $(OutDir_ide_Common)
73
+	-${MKDIR} $(OutDir_ide_Common)
74
+	-$(MKDIR) $(OutDir_ide_LayDes)
74
+	-${MKDIR} $(OutDir_ide_LayDes)
75
+	-$(MKDIR) $(OutDir_ide_IconDes)
75
+	-${MKDIR} $(OutDir_ide_IconDes)
76
+	-$(MKDIR) $(OutDir_ide_Builders)
76
+	-${MKDIR} $(OutDir_ide_Builders)
77
+	-$(MKDIR) $(OutDir_ide_Debuggers)
77
+	-${MKDIR} $(OutDir_ide_Debuggers)
78
+	-$(MKDIR) $(OutDir_ide_Browser)
78
+	-${MKDIR} $(OutDir_ide_Browser)
79
+	-$(MKDIR) $(OutDir_ide_Topic)
79
+	-${MKDIR} $(OutDir_ide_Topic)
80
+	-$(MKDIR) $(OutDir_ide_VectorDes)
80
+	-${MKDIR} $(OutDir_ide_VectorDes)
81
+	-$(MKDIR) $(OutDir_CodeEditor)
81
+	-${MKDIR} $(OutDir_CodeEditor)
82
+	-$(MKDIR) $(OutDir_Topic)
82
+	-${MKDIR} $(OutDir_Topic)
83
+	-$(MKDIR) $(OutDir_CtrlLib)
83
+	-${MKDIR} $(OutDir_CtrlLib)
84
+	-$(MKDIR) $(OutDir_Web)
84
+	-${MKDIR} $(OutDir_Web)
85
+	-$(MKDIR) $(OutDir_plugin_bz2)
85
+	-${MKDIR} $(OutDir_plugin_bz2)
86
+	-$(MKDIR) $(OutDir_HexView)
86
+	-${MKDIR} $(OutDir_HexView)
87
+	-$(MKDIR) $(OutDir_Esc)
87
+	-${MKDIR} $(OutDir_Esc)
88
+	-$(MKDIR) $(OutDir_Core)
88
+	-${MKDIR} $(OutDir_Core)
89
+	-$(MKDIR) $(OutDir_RichEdit)
89
+	-${MKDIR} $(OutDir_RichEdit)
90
+	-$(MKDIR) $(OutDir_plugin_png)
90
+	-${MKDIR} $(OutDir_plugin_png)
91
+	-$(MKDIR) $(OutDir_plugin_gif)
91
+	-${MKDIR} $(OutDir_plugin_gif)
92
+	-$(MKDIR) $(OutDir_Image)
92
+	-${MKDIR} $(OutDir_Image)
93
+	-$(MKDIR) $(OutDir_plugin_tif)
93
+	-${MKDIR} $(OutDir_plugin_tif)
94
+	-$(MKDIR) $(OutDir_plugin_jpg)
94
+	-${MKDIR} $(OutDir_plugin_jpg)
95
+	-$(MKDIR) $(OutDir_Draw)
95
+	-${MKDIR} $(OutDir_Draw)
96
+	-$(MKDIR) $(OutDir_plugin_z)
96
+	-${MKDIR} $(OutDir_plugin_z)
97
+	-$(MKDIR) $(OutDir_coff_binobj)
97
+	-${MKDIR} $(OutDir_coff_binobj)
98
+	-$(MKDIR) $(OutDir_coff)
98
+	-${MKDIR} $(OutDir_coff)
99
+	-$(MKDIR) $(OutDir_plugin_ndisasm)
99
+	-${MKDIR} $(OutDir_plugin_ndisasm)
100
+	-$(MKDIR) $(OutDir_CppBase)
100
+	-${MKDIR} $(OutDir_CppBase)
101
+	-$(MKDIR) $(OutDir_VectorDes)
101
+	-${MKDIR} $(OutDir_VectorDes)
102
+	-$(MKDIR) $(OutDir_RichText)
102
+	-${MKDIR} $(OutDir_RichText)
103
+	-$(MKDIR) $(OutDir_CtrlCore)
103
+	-${MKDIR} $(OutDir_CtrlCore)
104
+	-$(MKDIR) $(OutDir_PdfDraw)
104
+	-${MKDIR} $(OutDir_PdfDraw)
105
 
105
 
106
 $(OutFile):  \
106
 $(OutFile):  \
107
 	$(OutDir_ide)SelectPkg.o \
107
 	$(OutDir_ide)SelectPkg.o \

Return to bug 98598