Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Sep 2014 10:28:40 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368258 - head/x11/gdkxft
Message-ID:  <201409151028.s8FASeUK006848@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409151028.s8FASeUK006848>