From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 6 20:02:29 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6ECC116CCEE for ; Tue, 6 Jun 2006 20:00:47 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C03FD43D48 for ; Tue, 6 Jun 2006 20:00:46 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k56K0kks051714 for ; Tue, 6 Jun 2006 20:00:46 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k56K0ki4051713; Tue, 6 Jun 2006 20:00:46 GMT (envelope-from gnats) Resent-Date: Tue, 6 Jun 2006 20:00:46 GMT Resent-Message-Id: <200606062000.k56K0ki4051713@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Sund Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D7CA16C652 for ; Tue, 6 Jun 2006 19:52:37 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E24543D6E for ; Tue, 6 Jun 2006 19:52:34 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k56JqXfV048193 for ; Tue, 6 Jun 2006 19:52:33 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k56JqXpD048192; Tue, 6 Jun 2006 19:52:33 GMT (envelope-from nobody) Message-Id: <200606061952.k56JqXpD048192@www.freebsd.org> Date: Tue, 6 Jun 2006 19:52:33 GMT From: Matthias Sund To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/98598: [port upgrade:] devel/upp X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jun 2006 20:02:30 -0000 >Number: 98598 >Category: ports >Synopsis: [port upgrade:] devel/upp >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jun 06 20:00:46 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Matthias Sund >Release: FreeBSD 6.1-STABLE >Organization: >Environment: FreeBSD travelmate 6.1-STABLE FreeBSD 6.1-STABLE #15: Sun May 21 21:34:16 CEST 2006 masu@travelmate:/usr/obj/usr/src/sys/TRAVELMATE i386 >Description: Version upgrade to 605: - few patch file removals, due to source code integration - added WITH_SDL make variable to choose if SDL libraries should be installed along with upp >How-To-Repeat: >Fix: diff -ruN upp_orig/Makefile upp/Makefile --- upp_orig/Makefile Tue Apr 4 22:12:23 2006 +++ upp/Makefile Tue Jun 6 20:39:36 2006 @@ -6,11 +6,11 @@ # PORTNAME= upp -PORTVERSION= 602 +PORTVERSION= 605 CATEGORIES= devel x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= upp-src-602 +DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= m.sund@arcor.de COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite @@ -20,9 +20,16 @@ expat.6:${PORTSDIR}/textproc/expat2 USE_ZIP= yes +USE_DOS2UNIX= yes USE_GMAKE= yes USE_X_PREFIX= yes +.if defined(WITH_SDL) +USE_SDL= sdl +.endif + +EXTRACT_AFTER_ARGS= "-d${DISTNAME}" + BUILD_WRKSRC= ${WRKSRC}/uppsrc/ide INSTALL_DIRS= Common examples reference uppsrc @@ -33,16 +40,14 @@ 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-everything:: +.if !defined(WITH_SDL) + @${ECHO_MSG} "" + @${ECHO_MSG} "Define WITH_SDL to install SDL library for running SDL example." + @${ECHO_MSG} "" +.endif 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: @@ -51,7 +56,7 @@ @${REINPLACE_CMD} -e 's|CINC =(.*)|$1 ${PTHREAD_CFLAGS}|' ${BUILD_WRKSRC}/Makefile post-build: - @${FIND} -E ${WRKDIR} -type f -iregex ".*\.(bak|orig)" -exec ${RM} -r {} \; + @${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 diff -ruN upp_orig/distinfo upp/distinfo --- upp_orig/distinfo Tue Mar 21 07:28:30 2006 +++ upp/distinfo Tue Jun 6 20:00:55 2006 @@ -1,2 +1,3 @@ -MD5 (upp-src-602.zip) = f3d38ec40089635614f2ff9faa8e35d3 -SHA256 (upp-src-602.zip) = 7e797be5b5b54cb05eed7069e7d8764209d795738a9b3be5d1e8967d1dd520d8 +MD5 (upp-src-605.zip) = a9c7dccd6270fb007104dbed7ac792d8 +SHA256 (upp-src-605.zip) = d7664c72e84545558064c4ea7649ec57ab05b6c0fdd7f084ba1f10ed121e9476 +SIZE (upp-src-605.zip) = 6965517 diff -ruN upp_orig/files/patch-examples-SDLExample-SDLExample.upp upp/files/patch-examples-SDLExample-SDLExample.upp --- upp_orig/files/patch-examples-SDLExample-SDLExample.upp Tue Mar 21 07:28:30 2006 +++ upp/files/patch-examples-SDLExample-SDLExample.upp Tue Jun 6 21:26:53 2006 @@ -1,12 +1,12 @@ ---- examples/SDLExample/SDLExample.upp.orig Sat Mar 4 19:46:31 2006 -+++ examples/SDLExample/SDLExample.upp Sat Mar 4 19:46:38 2006 +--- examples/SDLExample/SDLExample.upp.orig Tue Jun 6 20:57:56 2006 ++++ examples/SDLExample/SDLExample.upp Tue Jun 6 21:18:25 2006 @@ -7,6 +7,10 @@ library(LINUX) "SDL SDLmain"; -+library(FREEBSD) "SDL-1.1 vgl X11 Xext vga aa usbhid ncurses"; ++library(FREEBSD) "SDL-1.1 m vgl X11 Xext vga aa usbhid"; + -+options(FREEBSD) -I/usr/local/include/SDL11; ++link(FREEBSD) -pthread; + file main.cpp; diff -ruN upp_orig/files/patch-examples-SDLExample-main.cpp upp/files/patch-examples-SDLExample-main.cpp --- upp_orig/files/patch-examples-SDLExample-main.cpp Tue Mar 21 07:28:30 2006 +++ upp/files/patch-examples-SDLExample-main.cpp Tue Jun 6 21:21:05 2006 @@ -1,10 +1,11 @@ ---- 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 - --#ifdef PLATFORM_WIN32 -+#if defined PLATFORM_WIN32 || defined PLATFORM_FREEBSD +--- examples/SDLExample/main.cpp.orig Tue Jun 6 21:18:47 2006 ++++ examples/SDLExample/main.cpp Tue Jun 6 21:18:58 2006 +@@ -3,7 +3,7 @@ + #ifdef PLATFORM_WIN32 #include #else - #include +-#include ++#include + #endif + + const int maxpoint = 1000; diff -ruN upp_orig/files/patch-examples-imgsrv-imgsrv.upp upp/files/patch-examples-imgsrv-imgsrv.upp --- upp_orig/files/patch-examples-imgsrv-imgsrv.upp Tue Mar 21 07:28:30 2006 +++ upp/files/patch-examples-imgsrv-imgsrv.upp Thu Jan 1 01:00:00 1970 @@ -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 -ruN upp_orig/files/patch-uppsrc-Core-Core.upp upp/files/patch-uppsrc-Core-Core.upp --- upp_orig/files/patch-uppsrc-Core-Core.upp Tue Mar 21 07:28:30 2006 +++ upp/files/patch-uppsrc-Core-Core.upp Thu Jan 1 01:00:00 1970 @@ -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 -ruN upp_orig/files/patch-uppsrc-Core-Stream.cpp upp/files/patch-uppsrc-Core-Stream.cpp --- upp_orig/files/patch-uppsrc-Core-Stream.cpp Tue Mar 21 07:28:30 2006 +++ upp/files/patch-uppsrc-Core-Stream.cpp Thu Jan 1 01:00:00 1970 @@ -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 -ruN upp_orig/files/patch-uppsrc-Draw-Draw.upp upp/files/patch-uppsrc-Draw-Draw.upp --- upp_orig/files/patch-uppsrc-Draw-Draw.upp Tue Mar 21 07:28:30 2006 +++ upp/files/patch-uppsrc-Draw-Draw.upp Thu Jan 1 01:00:00 1970 @@ -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 -ruN upp_orig/files/patch-uppsrc-ide-Makefile upp/files/patch-uppsrc-ide-Makefile --- upp_orig/files/patch-uppsrc-ide-Makefile Tue Mar 21 07:28:30 2006 +++ upp/files/patch-uppsrc-ide-Makefile Sat Jun 3 15:40:18 2006 @@ -1,5 +1,5 @@ ----uppsrc/ide/Makefile.orig Mon Mar 20 18:36:35 2006 -+++ uppsrc/ide/Makefile Mon Mar 20 18:37:40 2006 +--- 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 = ../ @@ -26,7 +26,7 @@ Macro_PdfDraw = $(Macro) OutDir = $(OutDir_ide) --OutFile = /src/ide +-OutFile = /home/cxl/ide +OutFile = $(UPPDIR1)../ide .PHONY: all @@ -68,40 +68,40 @@ - -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) ++ -${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 \ >Release-Note: >Audit-Trail: >Unformatted: