From owner-svn-ports-all@FreeBSD.ORG Tue Dec 17 20:40:25 2013 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 9A8F4A4D; Tue, 17 Dec 2013 20:40:25 +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 6D20B1929; Tue, 17 Dec 2013 20:40:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKePYA035342; Tue, 17 Dec 2013 20:40:25 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKeP1D035340; Tue, 17 Dec 2013 20:40:25 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312172040.rBHKeP1D035340@svn.freebsd.org> From: Bryan Drewery Date: Tue, 17 Dec 2013 20:40:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336763 - in branches/2014Q1: devel/generate editors/vim X-SVN-Group: ports-branches 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: Tue, 17 Dec 2013 20:40:25 -0000 Author: bdrewery Date: Tue Dec 17 20:40:24 2013 New Revision: 336763 URL: http://svnweb.freebsd.org/changeset/ports/336763 Log: Revert r336754 Requested by: bapt Modified: branches/2014Q1/devel/generate/Makefile branches/2014Q1/editors/vim/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/generate/Makefile ============================================================================== --- branches/2014Q1/devel/generate/Makefile Tue Dec 17 20:36:38 2013 (r336762) +++ branches/2014Q1/devel/generate/Makefile Tue Dec 17 20:40:24 2013 (r336763) @@ -10,14 +10,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= darcy@druid.net COMMENT= Simple text pre-processor -USES= gmake +USE_GMAKE= yes +MAN1= generate.1 -PLIST_FILES= bin/generate bin/rgenerate \ - man/man1/generate.1.gz - -MAKE_ARGS+= MANDIR=${STAGEDIR}${MAN1PREFIX}/man \ - BINDIR=${STAGEDIR}${PREFIX}/bin +PLIST_FILES= bin/generate bin/rgenerate +NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's,^CFLAGS *=,CFLAGS +=,' \ ${WRKSRC}/Makefile Modified: branches/2014Q1/editors/vim/Makefile ============================================================================== --- branches/2014Q1/editors/vim/Makefile Tue Dec 17 20:36:38 2013 (r336762) +++ branches/2014Q1/editors/vim/Makefile Tue Dec 17 20:40:24 2013 (r336763) @@ -12,7 +12,7 @@ PORTNAME= vim # ! PATCHLEVEL to that level. PATCHLEVEL= 110 PORTVERSION= 7.4.${PATCHLEVEL} -PORTREVISION?= 2 +PORTREVISION?= 1 CATEGORIES?= editors MASTER_SITES= VIM DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -141,7 +141,7 @@ USE_XORG+= xaw . if ${PORT_OPTIONS:MGTK2} USE_GNOME= gtk20 CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lX11 -lXt" +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" USE_XORG+= xt . endif @@ -149,7 +149,7 @@ USE_XORG+= xt USE_GNOME= libgnomeui PKGNAMESUFFIX= -gnome2 CONF_OPT_GUI= "--enable-gui=gnome2" -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lX11 -lXt" +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" USE_XORG+= xt glproto . endif