From owner-svn-ports-all@FreeBSD.ORG  Mon Sep 15 10:28:41 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 34FC9A6C;
 Mon, 15 Sep 2014 10:28:41 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 20B49CF1;
 Mon, 15 Sep 2014 10:28:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8FASejd006849;
 Mon, 15 Sep 2014 10:28:40 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8FASeUK006848;
 Mon, 15 Sep 2014 10:28:40 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201409151028.s8FASeUK006848@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org
 using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Mon, 15 Sep 2014 10:28:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r368258 - head/x11/gdkxft
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Sep 2014 10:28:41 -0000

Author: tijl
Date: Mon Sep 15 10:28:40 2014
New Revision: 368258
URL: http://svnweb.freebsd.org/changeset/ports/368258
QAT: https://qat.redports.org/buildarchive/r368258/

Log:
  - Fix build after r368108 (x11-toolkits/gtk12 library name change)
  - Convert to INSTALL_TARGET=install-strip
  
  Reported by:	antoine

Modified:
  head/x11/gdkxft/Makefile

Modified: head/x11/gdkxft/Makefile
==============================================================================
--- head/x11/gdkxft/Makefile	Mon Sep 15 09:04:02 2014	(r368257)
+++ head/x11/gdkxft/Makefile	Mon Sep 15 10:28:40 2014	(r368258)
@@ -19,30 +19,20 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex 
 CFLAGS+=	`pkg-config xft --cflags`
 CONFIGURE_ARGS=	--sbindir=${PREFIX}/bin \
 		--without-gnome
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|gtk-config --prefix|$$GTK_CONFIG --prefix|g ; \
-		 s|libgdk.la|libgdk-12.so|g ; \
-		 s|libgdk.so|libgdk-12.so|g ; \
-		 s|GDK_DLOPEN_NAME=.*$$|GDK_DLOPEN_NAME="libgdk-12.so"|g' \
-			${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|src capplet|src @BUILD_CAPPLET_TRUE@capplet|g ; \
 		 s|DESTDIR)\$$(datadir|DESTDIR)\$$(pkgdatadir|g ; \
 		 s|la_LDFLAGS =.*$$|la_LDFLAGS = -module -avoid-version|g'
-.for file in gdkxft_sysinstall.in gdkxft.c generate.pl
-	@${REINPLACE_CMD} -e 's|<regex.h>|<gnuregex.h>|g ; \
-		 s|gtk-config |${GTK_CONFIG:T} |g' ${WRKSRC}/src/${file}
-.endfor
+	@${REINPLACE_CMD} 's/<regex\.h>/<gnuregex.h>/' ${WRKSRC}/src/gdkxft.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdkxft.so
 
 .include <bsd.port.mk>