From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 15 20:40:10 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1D4A1065674 for ; Sat, 15 Jan 2011 20:40:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 957018FC0A for ; Sat, 15 Jan 2011 20:40:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p0FKeAa0007118 for ; Sat, 15 Jan 2011 20:40:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p0FKeAfi007115; Sat, 15 Jan 2011 20:40:10 GMT (envelope-from gnats) Date: Sat, 15 Jan 2011 20:40:10 GMT Message-Id: <201101152040.p0FKeAfi007115@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Matthias Sund Cc: Subject: Re: ports/153969: [PATCH] devel/upp: Update from 2008.1 to 2791 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Matthias Sund List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jan 2011 20:40:10 -0000 The following reply was made to PR ports/153969; it has been noted by GNATS. From: Matthias Sund To: bug-followup@FreeBSD.org Cc: Edwin Groothuis Subject: Re: ports/153969: [PATCH] devel/upp: Update from 2008.1 to 2791 Date: Sat, 15 Jan 2011 21:01:59 +0100 This is a multi-part message in MIME format. --------------000407000101030504050009 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hello, I attached a new patch version. The differences are: - fixed 'make reinstall' error - discarded 'files' folder Thanks. Kind regards, Matthias On 14.01.2011 03:30, Edwin Groothuis wrote: > Maintainer of devel/upp, > > Please note that PR ports/153969 has just been submitted. > > If it contains a patch for an upgrade, an enhancement or a bug fix > you agree on, reply to this email stating that you approve the patch > and a committer will take care of it. > > The full text of the PR can be found at: > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/153969 > --------------000407000101030504050009 Content-Type: text/plain; name="patch_new.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch_new.txt" diff -ruN upp.orig/Makefile upp/Makefile --- upp.orig/Makefile 2011-01-15 19:49:04.000000000 +0100 +++ upp/Makefile 2011-01-15 19:50:31.000000000 +0100 @@ -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,11 +21,21 @@ 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 + +MAKE_ARGS= Macro="-DflagGUI -DflagGCC -DflagSHARED -DflagPOSIX -DflagBSD -DflagFREEBSD" \ + 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 \ @@ -52,42 +61,42 @@ 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|-Linux-|-BSD-FreeBSD-|' \ + -e 's|-ldl|-lXau -lXdmcp -lfreetype -lexpat -lxcb -lpng|' \ + ${WRKSRC}/uppsrc/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} ${BUILD_WRKSRC}/ide.out ${PREFIX}/bin/theide +.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 diff -ruN upp.orig/distinfo upp/distinfo --- upp.orig/distinfo 2011-01-15 19:49:04.000000000 +0100 +++ upp/distinfo 2011-01-14 21:55:56.000000000 +0100 @@ -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 \ No newline at end of file diff -ruN upp.orig/files/patch-pngupp.cpp upp/files/patch-pngupp.cpp --- upp.orig/files/patch-pngupp.cpp 2011-01-15 19:49:04.000000000 +0100 +++ upp/files/patch-pngupp.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -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 2011-01-15 19:49:04.000000000 +0100 +++ upp/files/patch-uppsrc_ide_Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -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) --------------000407000101030504050009--