ports/153969: [PATCH] devel/upp: Update from 2008.1 to 2791

Fri Jan 14 02:30:10 UTC 2011

>Number:         153969
>Category:       ports
>Synopsis:       [PATCH] devel/upp: Update from 2008.1 to 2791
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 14 02:30:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Sender Ghost
>Release:        FreeBSD 8.1-RELEASE
>Organization:
>Environment:
>Description:
Patch to update devel/upp port from 2008.1 to 2791 version.

- Added desktop entry for TheIDE.
- Added license configuration.
- Changed auto-generation of package list file.
- Changed include and library directories.
- Deleted hardcoded compiler name and its options from distributed Makefile (possible to use different compiler).
- Deleted MD5 hash line from distinfo file.
- Enabled MAKE_JOBS_SAFE.

Look following link for changes:
http://www.ultimatepp.org/www$uppweb$Roadmap$en-us.html
>How-To-Repeat:

>Fix:
Use attached diff from /usr/ports/devel directory and delete upp/files directory.

Patch attached with submission follows:

diff -ruN upp.orig/Makefile upp/Makefile

--- upp.orig/Makefile	2010-03-28 13:33:43.000000000 +0700
+++ upp/Makefile	2011-01-14 05:30:55.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 at 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,43 @@
 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;
-
-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
+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
+	${RM} -rf ${BUILD_WRKSRC}/_out ${BUILD_WRKSRC}/ide.out ${BUILD_WRKSRC}/Makefile*
+.if !defined(NOPORTDATA)
+	${MKDIR} ${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
+.endif
+
+post-install: .SILENT
+	${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


>Release-Note:
>Audit-Trail:
>Unformatted:

