Sat Jan 12 11:24:44 2013 UTC ()
wm/fvwm: LDFLAGS.DragonFly+= -lX11


(marino)
diff -r1.21 -r1.22 pkgsrc/wm/fvwm/Makefile
cvs diff -r1.21 -r1.22 pkgsrc/wm/fvwm/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/fvwm/Makefile 2012/10/23 10:24:14 1.21
+++ pkgsrc/wm/fvwm/Makefile 2013/01/12 11:24:43 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.21 2012/10/23 10:24:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.22 2013/01/12 11:24:43 marino Exp $
2 2
3DISTNAME= fvwm-${FVWM_VER} 3DISTNAME= fvwm-${FVWM_VER}
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= x11 wm 5CATEGORIES= x11 wm
6MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ 6MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
7 http://www.fvwm.org/generated/icon_download/ 7 http://www.fvwm.org/generated/icon_download/
8DISTFILES+= fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz 8DISTFILES+= fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.fvwm.org/ 11HOMEPAGE= http://www.fvwm.org/
12COMMENT= Newer version of X11 Virtual window manager 12COMMENT= Newer version of X11 Virtual window manager
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -29,26 +29,28 @@ INSTALLATION_DIRS+= lib/X11/fvwm2 @@ -29,26 +29,28 @@ INSTALLATION_DIRS+= lib/X11/fvwm2
29INSTALLATION_DIRS+= lib/X11/fvwm2/pixmaps 29INSTALLATION_DIRS+= lib/X11/fvwm2/pixmaps
30INSTALLATION_DIRS+= ${PKGMANDIR}/man1 30INSTALLATION_DIRS+= ${PKGMANDIR}/man1
31 31
32EVAL_PREFIX+= XPMDIR=xpm 32EVAL_PREFIX+= XPMDIR=xpm
33CONFIGURE_ARGS+= --without-gnome 33CONFIGURE_ARGS+= --without-gnome
34CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/lib/X11/fvwm2 34CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/lib/X11/fvwm2
35CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/lib/X11 35CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/lib/X11
36CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR:Q}/include 36CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR:Q}/include
37CONFIGURE_ARGS+= --with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}/include/X11/bitmaps:${X11BASE:Q}/include/X11/pixmaps 37CONFIGURE_ARGS+= --with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}/include/X11/bitmaps:${X11BASE:Q}/include/X11/pixmaps
38 38
39# We don't want to have CPP from the buildlink directory 39# We don't want to have CPP from the buildlink directory
40CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q} 40CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q}
41 41
 42LDFLAGS.DragonFly+= -lX11
 43
42post-extract: 44post-extract:
43 mkdir ${WRKDIR:Q}/icons 45 mkdir ${WRKDIR:Q}/icons
44 cd ${WRKDIR:Q}/icons && tar -xzf ${DISTDIR:Q}/fvwm_icons.tgz 46 cd ${WRKDIR:Q}/icons && tar -xzf ${DISTDIR:Q}/fvwm_icons.tgz
45 47
46post-install: 48post-install:
47 ${INSTALL_DATA} \ 49 ${INSTALL_DATA} \
48 ${WRKDIR:Q}/icons/fvwm_icons/*.xpm \ 50 ${WRKDIR:Q}/icons/fvwm_icons/*.xpm \
49 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/pixmaps 51 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/pixmaps
50 ${INSTALL_DATA} \ 52 ${INSTALL_DATA} \
51 ${WRKSRC:Q}/sample.fvwmrc/decor_examples \ 53 ${WRKSRC:Q}/sample.fvwmrc/decor_examples \
52 ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \ 54 ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \
53 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2 55 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2
54 ${INSTALL_DATA} \ 56 ${INSTALL_DATA} \