svn commit: r352578 - in head/x11-clocks/emiclock: . files

[Martin Wilke]

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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>

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
- at dirrmtry lib/X11/EmiClock
+ at dirrm lib/X11/EmiClock