pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/squeak Modular Xorg and DESTDIR support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3602771df50c
branches:  trunk
changeset: 532391:3602771df50c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Aug 17 22:13:56 2007 +0000

description:
Modular Xorg and DESTDIR support.

diffstat:

 lang/squeak/Makefile |  27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diffs (74 lines):

diff -r c23843fa71a9 -r 3602771df50c lang/squeak/Makefile
--- a/lang/squeak/Makefile      Fri Aug 17 22:11:35 2007 +0000
+++ b/lang/squeak/Makefile      Fri Aug 17 22:13:56 2007 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2007/03/25 05:31:57 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/08/17 22:13:56 joerg Exp $
 #
 
 DISTNAME=      Squeak-3.6-3
 PKGNAME=       squeak-3.6.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  http://squeakvm.org/unix/release/
 DISTFILES=     Squeak-3.6-3.src.tar.gz Squeak-3.6-5429.image.tar.gz
@@ -13,6 +13,8 @@
 HOMEPAGE=      http://squeakvm.org/unix/
 COMMENT=       Full Smalltalk 80 with portability to UN*X, Mac, and Windows
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    automake14
@@ -24,7 +26,6 @@
 CONFIGURE_DIRS=                ${WRKDIR}/build
 CONFIGURE_SCRIPT=      ${WRKSRC}/platforms/unix/config/configure
 DIST_SUBDIR=           squeak
-INSTALLATION_DIRS=     ${WRKDIR}/build
 
 ONLY_FOR_PLATFORM=     NetBSD-*-*
 
@@ -32,19 +33,22 @@
 SQUEAK_IMAGE=  ${DISTNAME}/usr/local/lib/squeak/Squeak3.6-5429.image.gz
 SQUEAK_SOURCES=        Squeak-3/usr/local/lib/squeak/SqueakV3.sources
 
+INSTALLATION_DIRS=     bin lib/squeak
+INSTALL_ENV+=  ROOT=${DESTDIR:Q}
+
 pre-configure:
        cd ${WRKSRC}/platforms/unix/config                              \
            && ${SETENV} PATH=${PREFIX}/bin:${PATH} ${MAKE} configure
        ${MKDIR} ${CONFIGURE_DIRS}
 
 post-install:
-       ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_CHANGES} ${PREFIX}/lib/squeak/
-       ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_IMAGE} ${PREFIX}/lib/squeak/
-       ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SOURCES} ${PREFIX}/lib/squeak/
-       cd ${PREFIX}/lib/squeak                                         \
+       ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_CHANGES} ${DESTDIR}${PREFIX}/lib/squeak/
+       ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_IMAGE} ${DESTDIR}${PREFIX}/lib/squeak/
+       ${INSTALL_DATA} ${WRKDIR}/${SQUEAK_SOURCES} ${DESTDIR}${PREFIX}/lib/squeak/
+       cd ${DESTDIR}${PREFIX}/lib/squeak                                               \
            && ${LN} -s ${SQUEAK_CHANGES:C/.*\///} squeak.changes.gz    \
            && ${LN} -s ${SQUEAK_IMAGE:C/.*\///} squeak.image.gz
-       ${INSTALL_SCRIPT} ${INSTALLATION_DIRS}/inisqueak ${PREFIX}/bin/
+       ${INSTALL_SCRIPT} ${WRKDIR}/build/inisqueak ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -52,7 +56,12 @@
 CONFIGURE_ARGS+=       --enable-mpg-mmx
 .endif
 
+CONFIGURE_ARGS+=       --x-libraries=${X11BASE}
+
 .include "../../audio/nas/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index