DESTDIR and modular Xorg support.

4 files changed, 15 insertions, 11 deletions

diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index d29d6c94514..981f9a529bb 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2006/06/01 13:14:18 joerg Exp $
+# $NetBSD: Makefile,v 1.61 2007/01/02 12:42:45 joerg Exp $
 
 DISTNAME=	fltk-1.1.7-source
 PKGNAME=	${DISTNAME:S/-source//}
@@ -18,6 +18,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.fltk.org/
 COMMENT=	Fast Light Tool Kit for graphical user interfaces
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
@@ -28,6 +30,7 @@ PTHREAD_OPTS+=		require
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-libtool=${LIBTOOL:Q}
 CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ARGS+=	ac_cv_have_overlay=yes
 .if exists(./descr)
 PLIST_SUBST+=           WITH_LINKS="@comment "
 .else
@@ -39,6 +42,7 @@ PLIST_SUBST+=           WITH_LINKS=""
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index 7adf06d8478..b7d419490b1 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2007/01/02 12:42:45 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FLTK_BUILDLINK3_MK:=	${FLTK_BUILDLINK3_MK}+
@@ -21,6 +21,6 @@ BUILDLINK_FILES.fltk+=		include/Fl/*
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index ad9cc25b445..c9647381a6c 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2006/06/01 13:14:18 joerg Exp $
+$NetBSD: distinfo,v 1.16 2007/01/02 12:42:45 joerg Exp $
 
 SHA1 (fltk-1.1.7-source.tar.bz2) = 16b174522920403af1e4ccddd36daaefda3765c8
 RMD160 (fltk-1.1.7-source.tar.bz2) = a539a1c6bb3363e54bc82c7995037c5d8ede9dd7
@@ -9,4 +9,4 @@ SHA1 (patch-ac) = f2fee36611abc95e470a76e6596f84bd3f33523a
 SHA1 (patch-ad) = 96eab6558675067ae5eae3e176066c653eee957d
 SHA1 (patch-ae) = 2a7183e8668787c9fd79d22a10001a56c401e35a
 SHA1 (patch-af) = 0f46220ebb5bfa5b87ac070036f21663dea47cb6
-SHA1 (patch-ag) = 3676310862feca1feb5369cfa5d3756cfd040934
+SHA1 (patch-ag) = fc8986996438a87eac959ca850237cd8f473ff71
diff --git a/x11/fltk/patches/patch-ag b/x11/fltk/patches/patch-ag
index 9bfcf36b48a..2dc7cfdaa83 100644
--- a/x11/fltk/patches/patch-ag
+++ b/x11/fltk/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2006/01/22 11:11:34 wiz Exp $
+$NetBSD: patch-ag,v 1.6 2007/01/02 12:42:45 joerg Exp $
 
 --- src/Makefile.orig	2005-08-08 02:54:30.000000000 +0200
 +++ src/Makefile
@@ -51,7 +51,7 @@ $NetBSD: patch-ag,v 1.5 2006/01/22 11:11:34 wiz Exp $
  	fi
  	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
 +	if test x$(DSONAME) = xlibfltk.la; then\
-+		$(INSTALL_LIB) libfltk.la $(libdir); \
++		$(INSTALL_LIB) libfltk.la $(DESTDIR)$(libdir); \
 +	fi
  	if test x$(DSONAME) = xlibfltk.so.1.1; then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
@@ -61,7 +61,7 @@ $NetBSD: patch-ag,v 1.5 2006/01/22 11:11:34 wiz Exp $
  		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_s.a; \
  	fi
 +	if test x$(FLDSONAME) = xlibfltk_forms.la; then\
-+		$(INSTALL_LIB) libfltk_forms.la $(libdir); \
++		$(INSTALL_LIB) libfltk_forms.la $(DESTDIR)$(libdir); \
 +	fi
  	if test x$(DSONAME) = xcygfltknox-1.1.dll; then\
  		$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
@@ -71,7 +71,7 @@ $NetBSD: patch-ag,v 1.5 2006/01/22 11:11:34 wiz Exp $
  		$(LN) libfltk_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\
  	fi
 +	if test x$(GLDSONAME) = xlibfltk_gl.la; then\
-+		$(INSTALL_LIB) libfltk_gl.la $(libdir); \
++		$(INSTALL_LIB) libfltk_gl.la $(DESTDIR)$(libdir); \
 +	fi
  	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
@@ -81,7 +81,7 @@ $NetBSD: patch-ag,v 1.5 2006/01/22 11:11:34 wiz Exp $
  		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.dll.a; \
  	fi
 +	if test x$(IMGDSONAME) = xlibfltk_images.la; then\
-+		$(INSTALL_LIB) libfltk_images.la $(libdir); \
++		$(INSTALL_LIB) libfltk_images.la $(DESTDIR)$(libdir); \
 +	fi
  	if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\