svn commit: r336754 - in branches/2014Q1: devel/generate editors/vim

[Baptiste Daroussin]

Author: bapt
Date: Tue Dec 17 18:52:19 2013
New Revision: 336754
URL: http://svnweb.freebsd.org/changeset/ports/336754

Log:
  MFH: r336753
  
  Fix build after gtk update

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 18:37:45 2013	(r336753)
+++ branches/2014Q1/devel/generate/Makefile	Tue Dec 17 18:52:19 2013	(r336754)
@@ -10,12 +10,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	darcy at druid.net
 COMMENT=	Simple text pre-processor
 
-USE_GMAKE=	yes
-MAN1=		generate.1
+USES=		gmake
 
-PLIST_FILES=	bin/generate bin/rgenerate
+PLIST_FILES=	bin/generate bin/rgenerate \
+		man/man1/generate.1.gz
+
+MAKE_ARGS+=	MANDIR=${STAGEDIR}${MAN1PREFIX}/man \
+		BINDIR=${STAGEDIR}${PREFIX}/bin
 
-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 18:37:45 2013	(r336753)
+++ branches/2014Q1/editors/vim/Makefile	Tue Dec 17 18:52:19 2013	(r336754)
@@ -12,7 +12,7 @@ PORTNAME=	vim
 #		! PATCHLEVEL to that level.
 PATCHLEVEL=	110
 PORTVERSION=	7.4.${PATCHLEVEL}
-PORTREVISION?=	1
+PORTREVISION?=	2
 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) -lXt"
+MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lX11 -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) -lXt"
+MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lX11 -lXt"
 USE_XORG+=	xt glproto
 . endif