Date: Thu, 1 Nov 2012 09:06:40 +0000 (UTC) From: Ruslan Mahmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306787 - head/devel/upp Message-ID: <201211010906.qA196eYf056123@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Thu Nov 1 09:06:40 2012 New Revision: 306787 URL: http://svn.freebsd.org/changeset/ports/306787 Log: - update to 5485 while here: - trim Makefile header - remove shlib versions (portlint warning) - convert to optionsng (and rename GL option to OPENGL to pick existing option description from bsd.options.desc.mk) - break an overly long line PR: 173199 Submitted by: Matthias Sund <m.sund at arcor dot de> (maintainer) Feature safe: yes Modified: head/devel/upp/Makefile head/devel/upp/distinfo Modified: head/devel/upp/Makefile ============================================================================== --- head/devel/upp/Makefile Thu Nov 1 08:53:01 2012 (r306786) +++ head/devel/upp/Makefile Thu Nov 1 09:06:40 2012 (r306787) @@ -1,13 +1,8 @@ -# New ports collection makefile for: upp -# Date created: February, 8th 2006 -# Whom: Matthias Sund <m.sund@arcor.de> -# +# Created by: Matthias Sund <m.sund@arcor.de> # $FreeBSD$ -# PORTNAME= upp -PORTVERSION= 4193 -PORTREVISION= 2 +PORTVERSION= 5485 CATEGORIES= devel x11-toolkits MASTER_SITES= SF DISTNAME= ${PORTNAME}-x11-src-${PORTVERSION} @@ -17,52 +12,53 @@ COMMENT= Ultimate++, a BSD-licensed, cro LICENSE= BSD -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - expat.6:${PORTSDIR}/textproc/expat2 \ - notify.4:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ + expat:${PORTSDIR}/textproc/expat2 \ + notify:${PORTSDIR}/devel/libnotify USE_XORG= xft USE_GNOME= gtk20 USE_GMAKE= yes -WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/${DISTNAME} BUILD_WRKSRC= ${WRKSRC}/uppsrc 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" + 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} + "${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 \ - USEMALLOC "Compile without U++ heap allocator" off +OPTIONS_DEFINE= SDL OPENGL MYSQL PGSQL USEMALLOC +USEMALLOC_DESC= Compile without U++ heap allocator -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL= sdl .endif -.if defined(WITH_GL) +.if ${PORT_OPTIONS:MOPENGL} USE_GL= gl .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes .endif -.if defined(WITH_USEMALLOC) +.if ${PORT_OPTIONS:MUSEMALLOC} MACRO_FLAGS+= -DflagUSEMALLOC .endif @@ -71,6 +67,7 @@ BROKEN= Does not compile on ia64, power .endif pre-build: .SILENT + ${MV} ${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -e '/^CC =/d;/^CFLAGS =/d;/^CXXFLAGS =/d;/^LDFLAGS =/d' \ -e 's|$$(CC)|$$(CXX)|' \ -e 's|-Linux-|-BSD-FreeBSD-|' \ @@ -109,4 +106,4 @@ do-install: .SILENT post-install: @${ECHO_CMD} bin/theide >> ${TMPPLIST} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/upp/distinfo ============================================================================== --- head/devel/upp/distinfo Thu Nov 1 08:53:01 2012 (r306786) +++ head/devel/upp/distinfo Thu Nov 1 09:06:40 2012 (r306787) @@ -1,2 +1,2 @@ -SHA256 (upp-x11-src-4193.tar.gz) = 9e738d22543e8ece3cba2560b09f5a5245937b4af2980398f1480bf69197a555 -SIZE (upp-x11-src-4193.tar.gz) = 38477841 +SHA256 (upp-x11-src-5485.tar.gz) = d6f9c5991c7aceb9df71d5723fd3b591c3201c05b05795eb063bc634dc5a0bb1 +SIZE (upp-x11-src-5485.tar.gz) = 36693193
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211010906.qA196eYf056123>