From 4bfcc34161358d51d868f816c923eb93f927a412 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 25 Aug 2002 21:50:52 +0000 Subject: Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. --- wm/enlightenment/Makefile | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) (limited to 'wm/enlightenment') diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile index 86385fa114f..dab7babf82e 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:46 fredb Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:31 jlam Exp $ DISTNAME= enlightenment-0.16.4 PKGREVISION= 1 @@ -9,27 +9,13 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.enlightenment.org/ COMMENT= Window manager for X -USE_BUILDLINK_ONLY= yes -USE_PERL5= yes +USE_BUILDLINK2= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-fsstd MAKE_ENV+= USER=${SHAREOWN}:${SHAREGRP} -# Remove -I$(includedir) from the INCLUDES passed to the compiler as this -# defeats buildlink. -# -post-patch: - cd ${WRKSRC}; \ - files=`${FIND} . -name "Makefile.in" -print`; \ - for file in $${files}; do \ - ${MV} -f $${file} $${file}.fixme; \ - ${SED} -e "/^INCLUDES.*=.*/s|[ ]*-I\$$(includedir)||" \ - $${file}.fixme > $${file}; \ - ${RM} $${file}.fixme; \ - done - post-install: for FILE in `${GREP} "\.directory$$" ${PKGDIR}/PLIST`; do \ ${TOUCH} ${PREFIX}/$${FILE}; \ @@ -39,10 +25,11 @@ post-install: ${FIND} ${PREFIX}/share/enlightenment/themes -type f | \ ${XARGS} ${CHMOD} ${NONBINMODE} -.include "../../audio/esound/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../graphics/fnlib/buildlink.mk" -.include "../../graphics/freetype-lib/buildlink.mk" -.include "../../www/libghttp/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../audio/esound/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/fnlib/buildlink2.mk" +.include "../../graphics/freetype-lib/buildlink2.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../www/libghttp/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3