Import of pkgsrc-2016Q3

wm/fvwm/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2015/07/04 16:18:41 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2016/07/24 20:12:34 rillig Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -27,12 +27,11 @@ INSTALLATION_DIRS+=	lib/X11/fvwm2
 INSTALLATION_DIRS+=	lib/X11/fvwm2/pixmaps
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
-EVAL_PREFIX+=		XPMDIR=xpm
 CONFIGURE_ARGS+=	--without-gnome
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX:Q}/lib/X11/fvwm2
-CONFIGURE_ARGS+=	--libexecdir=${PREFIX:Q}/lib/X11
-CONFIGURE_ARGS+=	--with-xpm-includes=${XPMDIR:Q}/include
-CONFIGURE_ARGS+=	--with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}/include/X11/bitmaps:${X11BASE:Q}/include/X11/pixmaps
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib/X11
+CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.libXpm:Q}/include
+CONFIGURE_ARGS+=	--with-imagepath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
 
 # We don't want to have CPP from the buildlink directory
 CONFIGURE_ENV+=		ac_cv_path_FVWM_CPP=${CPP:Q}
@@ -40,24 +39,24 @@ CONFIGURE_ENV+=		ac_cv_path_FVWM_CPP=${CPP:Q}
 CONFIGURE_ENV+=         ac_cv_path_PERL=${PERL5:Q}
 
 post-extract:
-	mkdir ${WRKDIR:Q}/icons
-	cd ${WRKDIR:Q}/icons && tar -xzf ${DISTDIR:Q}/fvwm_icons.tgz
+	mkdir ${WRKDIR}/icons
+	cd ${WRKDIR}/icons && tar -xzf ${DISTDIR}/fvwm_icons.tgz
 
 post-install:
 	${INSTALL_DATA} \
-		${WRKDIR:Q}/icons/fvwm_icons/*.xpm \
-		${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/pixmaps
+		${WRKDIR}/icons/fvwm_icons/*.xpm \
+		${DESTDIR}${PREFIX}/lib/X11/fvwm2/pixmaps
 	${INSTALL_DATA} \
-		${WRKSRC:Q}/sample.fvwmrc/decor_examples \
-		${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \
-		${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2
+		${WRKSRC}/sample.fvwmrc/decor_examples \
+		${WRKSRC}/sample.fvwmrc/system.fvwm2rc-sample-* \
+		${DESTDIR}${PREFIX}/lib/X11/fvwm2
 	${INSTALL_DATA} \
-		${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc \
-		${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example
-	if [ ! -f ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ]; then \
+		${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+		${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example
+	if [ ! -f ${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ]; then \
 		${INSTALL_DATA} \
-			${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example \
-			${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ; \
+			${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example \
+			${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
 	fi
 
 .include "options.mk"

wm/fvwm/distinfo

@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.5 2013/01/20 07:09:29 mef Exp $
+$NetBSD: distinfo,v 1.6 2015/11/02 23:42:52 agc Exp $
 
 SHA1 (fvwm-2.6.5.tar.gz) = c200e9647d11d1a8b4938c419a987fea4aec6606
 RMD160 (fvwm-2.6.5.tar.gz) = 39f3154b4ae71d935bfbb8715eb2b5dc76cccb23
+SHA512 (fvwm-2.6.5.tar.gz) = 02af6738f75061a2c86ebb6e0ebd411cf59d1741784e85323c15f8faac694fb53c9e9581b612b0bf92ed2feb3a350588e1ab016edb5ace3e2145403e9a19711b
 Size (fvwm-2.6.5.tar.gz) = 3449177 bytes
 SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
 RMD160 (fvwm_icons.tgz) = a5aa60994e64aab939f94b4620d79ea4fcb156f3
+SHA512 (fvwm_icons.tgz) = c0ca8bb2a6cdce8030dbf93797dc9c10c11f69bfa482f748ae09d44bc40abb58a7a5ad35d05a87f2c4d64188bf78c28b80d841e4e74f5ace62138f25420ff7fc
 Size (fvwm_icons.tgz) = 363406 bytes
 SHA1 (patch-ab) = b38e1b58a2001b844321d204229ab0d9b07c7542
 SHA1 (patch-ad) = 4a36153af9cab68746d097e83599d5f39764f46f