Import of pkgsrc-2016Q3

time/xalarm/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2013/04/06 13:01:28 rodent Exp $
+# $NetBSD: Makefile,v 1.20 2015/12/08 21:02:11 rillig Exp $
 
 DISTNAME=	xalarm-3.06
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	time
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 
@@ -11,12 +11,19 @@ COMMENT=	X11 interactive alarm clock
 DEPENDS+=	skill>=4.0:../../sysutils/skill
 
 USE_IMAKE=	yes
-XAW_TYPE?=	3d
 
 FORTUNE=	"Sorry, xfortune is unavailable - no fortune!"
 YOW=		"Sorry, xyow is unavailable - no yow!"
 KILL=		/bin/kill # should this be in bsd.pkg.mk ?
 
+# does not directly support Xaw3d
+BUILDLINK_TRANSFORM+=	l:Xaw:Xaw3d
+.PHONY: buildlink-Xaw3d-inc-hack
+pre-configure: buildlink-Xaw3d-inc-hack
+
+buildlink-Xaw3d-inc-hack: buildlink-directories
+	cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(XALARM_USE_YOW)
@@ -24,35 +31,35 @@ DEPENDS+=	emacs20>=20.7:../../editors/emacs
 .endif
 
 .if ${OPSYS} == "NetBSD"
-.if exists(/usr/games/fortune)
+.  if exists(/usr/games/fortune)
 FORTUNE=	`/usr/games/fortune`
-.endif
+.  endif
 MAKE_FLAGS+=	EXTRA_DEFINES=-DFORKRETURNSPID_T
 .endif
 
 pre-configure:
 .if defined(XALARM_USE_YOW)
 	# if multiple version emacs of emacs are there, take the higher one...
-	YOW=`${FIND} ${LOCALBASE}/libexec/emacs -name yow -print 2>/dev/null | ${SORT} -rn | ${HEAD} -1` ;  \
-	if ${TEST} x$${YOW} = x ; then \
-		YOW=${YOW} ; \
-	fi ; ${SETENV} YOW=$${YOW} \
+	${RUN}YOW=`${FIND} ${LOCALBASE}/libexec/emacs -name yow -print 2>/dev/null | ${SORT} -rn | ${HEAD} -1` ;  \
+	if ${TEST} "x$${YOW}" = "x" ; then \
+		YOW=${YOW:Q} ; \
+	fi ; ${SETENV} YOW="$${YOW}" \
 	${SED}  -e "s|@PRG@|\`$${YOW}\`|" \
 		-e 's|@XPRG@|xyow|' \
 		${FILESDIR}/xprg > ${WRKSRC}/xyow
 .else
-	${SED}  -e 's|@PRG@|${YOW}|' \
+	${RUN}${SED}  -e 's|@PRG@|${YOW}|' \
 		-e 's|@XPRG@|xyow|' \
 		${FILESDIR}/xprg > ${WRKSRC}/xyow
 .endif
-	${SED}  -e 's|@PRG@|${FORTUNE}|' \
+	${RUN}${SED}  -e 's|@PRG@|${FORTUNE}|' \
 		-e 's|@XPRG@|xfortune|' \
 		${FILESDIR}/xprg > ${WRKSRC}/xfortune
-	${SED}  -e 's|@SKILL@|${LOCALBASE}/bin/skill|' \
+	${RUN}${SED}  -e 's|@SKILL@|${LOCALBASE}/bin/skill|' \
 		-e 's|@GREP@|${GREP}|' \
 		-e 's|@KILL@|${KILL}|' ${FILESDIR}/fns.h.in > ${WRKSRC}/fns.h
-	${CP} ${FILESDIR}/XAlarm-color.ad ${WRKSRC}/
+	${RUN}${CP} ${FILESDIR}/XAlarm-color.ad ${WRKSRC}/
 
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/xaw.buildlink3.mk"
+.include "../../x11/libXaw3d/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

time/xalarm/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2013/01/15 16:21:35 morr Exp $
+$NetBSD: distinfo,v 1.7 2015/11/02 23:31:46 agc Exp $
 
 SHA1 (xalarm-3.06.tar.gz) = a4365224c14491d1f089f4a30722d8e33ccccad5
 RMD160 (xalarm-3.06.tar.gz) = 9a9a6fd67669e6464729bdba2210ef38265dd5ea
+SHA512 (xalarm-3.06.tar.gz) = 699cf024a29b857e055dbf6ff96adda730370d1bd970cf7f294269a556f0cc98f2cf4ca15feb29effd065a2e2b98b8a5267188abc84d91965a6b4eafb4f5e845
 Size (xalarm-3.06.tar.gz) = 55351 bytes
 SHA1 (patch-aa) = 0da8a64ac4cb0399f38ddfd8901b1455c351eeb2
 SHA1 (patch-ab) = f9890acefcef2111da7284f2c96f21875bf27d29