From owner-svn-ports-all@FreeBSD.ORG Tue Apr 29 06:01:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A240BE48; Tue, 29 Apr 2014 06:01:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82B6515E2; Tue, 29 Apr 2014 06:01:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3T61HqC065051; Tue, 29 Apr 2014 06:01:17 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3T61HZk065049; Tue, 29 Apr 2014 06:01:17 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201404290601.s3T61HZk065049@svn.freebsd.org> From: Martin Wilke Date: Tue, 29 Apr 2014 06:01:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352578 - in head/x11-clocks/emiclock: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2014 06:01:17 -0000 Author: miwi Date: Tue Apr 29 06:01:16 2014 New Revision: 352578 URL: http://svnweb.freebsd.org/changeset/ports/352578 QAT: https://qat.redports.org/buildarchive/r352578/ Log: - Fix build on i386 - Enable sound support for all ARCH PR: 187494 Submitted by: ports fury Deleted: head/x11-clocks/emiclock/files/ Modified: head/x11-clocks/emiclock/Makefile head/x11-clocks/emiclock/pkg-plist Modified: head/x11-clocks/emiclock/Makefile ============================================================================== --- head/x11-clocks/emiclock/Makefile Tue Apr 29 06:00:06 2014 (r352577) +++ head/x11-clocks/emiclock/Makefile Tue Apr 29 06:01:16 2014 (r352578) @@ -3,7 +3,7 @@ PORTNAME= emiclock PORTVERSION= 2.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-clocks MASTER_SITES= http://ftp.vector.co.jp/pack/unix/personal/tokei/ @@ -13,28 +13,31 @@ COMMENT= Hyper-animated face analog cloc USES= imake USE_XORG= ice sm x11 xaw xext xmu xpm xt +OPTIONS_DEFINE= DOCS + LANGRES= resources/R6/EUC/EmiClock.ad -LANGDIR= ${LOCALBASE}/lib/X11/ja_JP.eucJP/app-defaults -LANGDIR2= ${LOCALBASE}/lib/X11/ja_JP.EUC/app-defaults -EMICLOCKDIR= ${LOCALBASE}/lib/X11/EmiClock - -PORTDOCS= COPYRIGHT COPYRIGHT.en - -.include - -.if ${ARCH} != "i386" -PLIST_SUB= SOUND="@comment " -.else -PLIST_SUB= SOUND="" -.endif +LANGDIR= ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults +LANGDIR2= ${PREFIX}/lib/X11/ja_JP.EUC/app-defaults + +post-patch: + @${REINPLACE_CMD} -e \ + 's|^#if defined.*\(FreeBSDArchitecture\).*|#ifdef \1| ; \ + /MakeDir/s|EmiClockLib|$$(DESTDIR)&| ; \ + /INSTALL/s|EmiClockLib|$$(DESTDIR)&|' ${WRKSRC}/Imakefile + @${REINPLACE_CMD} -e \ + '/USE_SOUND/s|#undef|#define|' ${WRKSRC}/config.h + @${REINPLACE_CMD} -e \ + '/soundcard.h/s|machine|sys|' ${WRKSRC}/include/sound.h post-install: - @${MKDIR} ${STAGEDIR}${EMICLOCKDIR} @${MKDIR} ${STAGEDIR}${LANGDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${LANGRES} \ + ${STAGEDIR}${LANGDIR}/EmiClock) @${MKDIR} ${STAGEDIR}${LANGDIR2} - cd ${WRKSRC} && ${INSTALL_DATA} ${LANGRES} ${STAGEDIR}${LANGDIR}/EmiClock - cd ${WRKSRC} && ${INSTALL_DATA} ${LANGRES} ${STAGEDIR}${LANGDIR2}/EmiClock + ${LN} -sf ../../ja_JP.eucJP/app-defaults/EmiClock \ + ${STAGEDIR}${LANGDIR2}/EmiClock @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} COPYRIGHT COPYRIGHT.en \ + ${STAGEDIR}${DOCSDIR}) .include Modified: head/x11-clocks/emiclock/pkg-plist ============================================================================== --- head/x11-clocks/emiclock/pkg-plist Tue Apr 29 06:00:06 2014 (r352577) +++ head/x11-clocks/emiclock/pkg-plist Tue Apr 29 06:01:16 2014 (r352578) @@ -1,11 +1,14 @@ bin/emiclock -%%SOUND%%lib/X11/EmiClock/myu.au +lib/X11/EmiClock/myu.au lib/X11/app-defaults/EmiClock lib/X11/ja_JP.EUC/app-defaults/EmiClock lib/X11/ja_JP.eucJP/app-defaults/EmiClock man/man1/emiclock.1.gz +%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.en +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry lib/X11/ja_JP.eucJP/app-defaults @dirrmtry lib/X11/ja_JP.eucJP @dirrmtry lib/X11/ja_JP.EUC/app-defaults @dirrmtry lib/X11/ja_JP.EUC -@dirrmtry lib/X11/EmiClock +@dirrm lib/X11/EmiClock