From 500ad1fed2600f949687936c65958543771ded89 Mon Sep 17 00:00:00 2001 From: minskim Date: Fri, 23 Apr 2004 16:24:14 +0000 Subject: Replace USE_X11BASE with USE_X11 and do not create a symlink in LOCALBASE. Suggested by wiz@. This makes the package pkgviews-ready, so enable pkgviews installation. OK'ed by tron@. --- graphics/imlib/Makefile | 10 ++++------ graphics/imlib/PLIST | 4 +--- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'graphics/imlib') diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 7bd8b435628..eb830640966 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2004/03/13 17:49:03 cube Exp $ +# $NetBSD: Makefile,v 1.86 2004/04/23 16:24:14 minskim Exp $ # DISTNAME= imlib-1.9.14 @@ -10,12 +10,13 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.nl.rasterman.com/imlib.html COMMENT= Image manipulation library for X11 +PKG_INSTALLATION_TYPES= overwrite pkgviews + USE_BUILDLINK3= yes -USE_X11BASE= yes +USE_X11= yes USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= imlib.pc.in GNU_CONFIGURE= yes -PLIST_SUBST+= LOCALBASE=${LOCALBASE} USE_GNU_TOOLS+= make UNLIMIT_RESOURCES= datasize @@ -45,9 +46,6 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imlib cd ${WRKSRC}/doc; ${INSTALL_DATA} *.gif *.html \ ${PREFIX}/share/doc/imlib - ${TEST} ${PREFIX} = ${LOCALBASE} || \ - ${LN} -fs ${PREFIX}/share/aclocal/imlib.m4 \ - ${LOCALBASE}/share/aclocal/imlib.m4 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/graphics/imlib/PLIST b/graphics/imlib/PLIST index 4a703bff246..d024e1b948b 100644 --- a/graphics/imlib/PLIST +++ b/graphics/imlib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2002/12/09 16:01:29 tron Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/04/23 16:24:14 minskim Exp $ bin/imlib_config bin/imlib-config include/gdk_imlib.h @@ -61,6 +61,4 @@ share/examples/imlib/im_palette-small.pal share/examples/imlib/im_palette-tiny.pal @dirrm share/examples/imlib @dirrm share/doc/imlib -@exec test %D = ${LOCALBASE} || ln -fs %D/share/aclocal/imlib.m4 ${LOCALBASE}/share/aclocal/imlib.m4 -@unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/imlib.m4 @unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE} -- cgit v1.2.3