From owner-svn-ports-all@FreeBSD.ORG Sun Jan 19 18:17:54 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF653930; Sun, 19 Jan 2014 18:17:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A34981155; Sun, 19 Jan 2014 18:17:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0JIHsqv034939; Sun, 19 Jan 2014 18:17:54 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0JIHsgk034937; Sun, 19 Jan 2014 18:17:54 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401191817.s0JIHsgk034937@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 19 Jan 2014 18:17:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340329 - head/devel/upp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jan 2014 18:17:54 -0000 Author: bapt Date: Sun Jan 19 18:17:54 2014 New Revision: 340329 URL: http://svnweb.freebsd.org/changeset/ports/340329 QAT: https://qat.redports.org/buildarchive/r340329/ Log: Support stage Use options helpers Unsilent install Remove references to NOPORTDATA Modified: head/devel/upp/Makefile Modified: head/devel/upp/Makefile ============================================================================== --- head/devel/upp/Makefile Sun Jan 19 18:16:46 2014 (r340328) +++ head/devel/upp/Makefile Sun Jan 19 18:17:54 2014 (r340329) @@ -11,15 +11,15 @@ DISTNAME= ${PORTNAME}-x11-src-${PORTVERS MAINTAINER= m.sund@arcor.de COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite -LICENSE= BSD +LICENSE= BSD2CLAUSE -LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ - expat:${PORTSDIR}/textproc/expat2 \ - notify:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ + libexpat.so:${PORTSDIR}/textproc/expat2 \ + libnotify.so:${PORTSDIR}/devel/libnotify +USES= gmake USE_XORG= xft USE_GNOME= gtk20 -USE_GMAKE= yes WRKSRC= ${WRKDIR}/${DISTNAME} BUILD_WRKSRC= ${WRKSRC}/uppsrc @@ -44,21 +44,15 @@ DESKTOP_ENTRIES="TheIDE" "IDE for cross- OPTIONS_DEFINE= SDL OPENGL MYSQL PGSQL USEMALLOC USEMALLOC_DESC= Compile without U++ heap allocator -NO_STAGE= yes +PLIST_FILES= bin/theide + +SDL_USE= sql +OPENGL_USE= gl +MYSQL_USE= mysql=yes +PHSQL_USE= pgsql=yes + .include -.if ${PORT_OPTIONS:MSDL} -USE_SDL= sdl -.endif -.if ${PORT_OPTIONS:MOPENGL} -USE_GL= gl -.endif -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -.endif -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -.endif .if ${PORT_OPTIONS:MUSEMALLOC} MACRO_FLAGS+= -DflagUSEMALLOC .endif @@ -97,14 +91,9 @@ post-build: .SILENT ${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} +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR} .include