Date: Thu, 27 Jan 2011 23:12:22 +0600 From: Sender Ghost <lightside@safebox.ru> To: pav@FreeBSD.org Cc: m.sund@arcor.de, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/153969: [PATCH] devel/upp: Update from 2008.1 to 2791 Message-ID: <4D41A776.5060207@safebox.ru> In-Reply-To: <201101261303.p0QD31JN065151@freefall.freebsd.org> References: <201101261303.p0QD31JN065151@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------090101020404090700000505
Content-Type: text/plain; charset=windows-1251; format=flowed
Content-Transfer-Encoding: 7bit
pav@FreeBSD.org wrote:
> No, this had little effect. There will be some larger problem, like
> linking wrong stdlib or something
Ok, I think, I (with help of dolik.rce) found the reason:
LINKER = $(CC)
Need to be:
LINKER = $(CXX)
I created new patch, which replaces all $(CC) with $(CXX).
Please, check.
--------------090101020404090700000505
Content-Type: text/plain;
name="upp_2008.1_2791.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="upp_2008.1_2791.txt"
diff -ruN upp.orig/Makefile upp/Makefile
--- upp.orig/Makefile 2010-03-28 13:33:43.000000000 +0700
+++ upp/Makefile 2011-01-27 22:49:08.000000000 +0600
@@ -6,11 +6,10 @@
#
PORTNAME= upp
-PORTVERSION= 2008.1
-PORTREVISION= 3
+PORTVERSION= 2791
CATEGORIES= devel x11-toolkits
MASTER_SITES= SF
-DISTNAME= ${PORTNAME}-src-${PORTVERSION}
+DISTNAME= ${PORTNAME}-x11-src-${PORTVERSION}
MAINTAINER= m.sund@arcor.de
COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
@@ -22,16 +21,30 @@
USE_GNOME= gtk20
USE_GMAKE= yes
-ALL_TARGET= theide
-
-WRKSRC= ${WRKDIR}
-
-INSTALL_DIRS= bazaar examples reference tutorial uppsrc
+WRKSRC= ${WRKDIR}/${DISTNAME}
+BUILD_WRKSRC= ${WRKSRC}/uppsrc
+LICENSE= BSD
+LICENSE_FILE= ${BUILD_WRKSRC}/ide/Copying
+MAKE_JOBS_SAFE= yes
+
+MACRO_FLAGS= -DflagGUI -DflagGCC -DflagSHARED -DflagPOSIX -DflagBSD -DflagFREEBSD
+
+MAKE_ARGS= UPPOUT="../_out/" OutFile="../theide" \
+ Macro="${MACRO_FLAGS}" \
+ LIBPATH="-L${LOCALBASE}/lib -L/usr/lib" \
+ CINC="-I. -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include/gtk-2.0 -I${LOCALBASE}/include/atk-1.0 -I${LOCALBASE}/include/cairo -I${LOCALBASE}/include/gdk-pixbuf-2.0 -I${LOCALBASE}/include/pango-1.0 -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/include/libpng -I/usr/include"
+
+PORTDATA= bazaar examples reference tutorial uppsrc GCC.bm
+
+DESKTOP_ENTRIES="TheIDE" "IDE for cross-platform C++ development" \
+ "${DATADIR}/uppsrc/ide/theide-48.png" "theide" \
+ "Application;Development;IDE;" ${FALSE}
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
+ PGSQL "Install with PostreSQL database" off \
+ USEMALLOC "Compile without U++ heap allocator" off
.include <bsd.port.pre.mk>
@@ -47,47 +60,51 @@
.if defined(WITH_PGSQL)
USE_PGSQL= yes
.endif
+.if defined(WITH_USEMALLOC)
+MACRO_FLAGS+= -DflagUSEMALLOC
+.endif
.if ${ARCH} == "sparc64"
BROKEN= Does not compile on sparc64
.endif
-pre-build:
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/uppsrc/ide/Makefile
- @${REINPLACE_CMD} -e 's|CINC =(.*)|$1 ${PTHREAD_CFLAGS}|' ${WRKSRC}/uppsrc/ide/Makefile
-
-post-build:
- @${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 = \"-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
- @${ECHO_CMD} "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}/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;)
- @(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;
+pre-build: .SILENT
+ ${REINPLACE_CMD} -e '/^CC =/d;/^CFLAGS =/d;/^CXXFLAGS =/d;/^LDFLAGS =/d' \
+ -e 's|$$(CC)|$$(CXX)|' \
+ -e 's|-Linux-|-BSD-FreeBSD-|' \
+ -e 's|-ldl|-lXau -lXdmcp -lfreetype -lexpat -lxcb -lpng|' \
+ ${BUILD_WRKSRC}/Makefile
+
+post-build: .SILENT
+ ${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_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
+ ${ECHO_CMD} "DEBUG_OPTIONS = \"-O0\";" >> ${WRKSRC}/GCC.bm
+ ${ECHO_CMD} "DEBUG_FLAGS = \"\";" >> ${WRKSRC}/GCC.bm
+ ${ECHO_CMD} "DEBUG_LINK = \"\";" >> ${WRKSRC}/GCC.bm
+ ${ECHO_CMD} "RELEASE_BLITZ = \"0\";" >> ${WRKSRC}/GCC.bm
+ ${ECHO_CMD} "RELEASE_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
+ ${ECHO_CMD} "RELEASE_OPTIONS = \"-O2 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm
+ ${ECHO_CMD} "RELEASE_SIZE_OPTIONS = \"-Os -finline-limit=20 -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/atk-1.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/gdk-pixbuf-2.0;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/include/libpng;/usr/include\";" >> ${WRKSRC}/GCC.bm
+ ${ECHO_CMD} "LIB = \"${LOCALBASE}/lib;/usr/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
+ ${ECHO_CMD} "LINKMODE_LOCK = \"0\";" >> ${WRKSRC}/GCC.bm
+
+do-install: .SILENT
+ ${INSTALL_PROGRAM} ${WRKSRC}/theide ${PREFIX}/bin
+.if !defined(NOPORTDATA)
+ ${MKDIR} ${DATADIR}
+ cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
+.endif
post-install:
- @${ECHO_CMD} bin/theide > ${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}
- @${RM} ${WRKSRC}/*.txt
+ @${ECHO_CMD} bin/theide >> ${TMPPLIST}
.include <bsd.port.post.mk>
diff -ruN upp.orig/distinfo upp/distinfo
--- upp.orig/distinfo 2008-08-13 14:05:35.000000000 +0700
+++ upp/distinfo 2011-01-14 04:26:34.000000000 +0600
@@ -1,3 +1,2 @@
-MD5 (upp-src-2008.1.tar.gz) = fd98b01aac28037060e35295c3256b26
-SHA256 (upp-src-2008.1.tar.gz) = 3c1de9a50a40817c75538b441a4e0a43708d08aff73045e256e2a1ee111407aa
-SIZE (upp-src-2008.1.tar.gz) = 7718090
+SHA256 (upp-x11-src-2791.tar.gz) = d7acb5cfb634ff84d4a09581bbc9fdd477841d5f9ef99c364adb8178bf619ddd
+SIZE (upp-x11-src-2791.tar.gz) = 29275855
diff -ruN upp.orig/files/patch-pngupp.cpp upp/files/patch-pngupp.cpp
--- upp.orig/files/patch-pngupp.cpp 2010-03-30 15:24:05.000000000 +0700
+++ upp/files/patch-pngupp.cpp 1970-01-01 06:00:00.000000000 +0600
@@ -1,11 +0,0 @@
---- uppsrc/plugin/png/pngupp.cpp.orig 2008-07-28 23:01:14.000000000 +0200
-+++ uppsrc/plugin/png/pngupp.cpp 2010-03-30 09:55:38.000000000 +0200
-@@ -427,7 +427,7 @@
- // text_ptr[0].text = "Mona Lisa";
- // text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
- #ifdef PNG_iTXt_SUPPORTED
-- text_ptr[0].lang = NULL;
-+// text_ptr[0].lang = NULL;
- #endif
- // png_set_text(png_ptr, info_ptr, text_ptr, 1);
-
diff -ruN upp.orig/files/patch-uppsrc_ide_Makefile upp/files/patch-uppsrc_ide_Makefile
--- upp.orig/files/patch-uppsrc_ide_Makefile 2010-11-20 21:36:37.000000000 +0600
+++ upp/files/patch-uppsrc_ide_Makefile 1970-01-01 06:00:00.000000000 +0600
@@ -1,11 +0,0 @@
---- uppsrc/ide/Makefile.orig 2010-10-31 16:58:47.000000000 +0100
-+++ uppsrc/ide/Makefile 2010-10-31 16:59:18.000000000 +0100
-@@ -6,7 +6,7 @@
- UPPDIR1 = uppsrc/
- UPPOUT = out/
-
--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
-+CINC = -I$(UPPDIR1) -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I${LOCALBASE}/include/gdk-pixbuf-2.0 -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 -Dflag$(HOSTTYPE)
- CC ?= c++
- C_FLAGS = $(CC) -c -O2 -x c $(CFLAGS)
--------------090101020404090700000505--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D41A776.5060207>