From 28578fba0fac8c74986f245daf00a9f4f46b4eef Mon Sep 17 00:00:00 2001
From: Volker Stolz <vs@FreeBSD.org>
Date: Mon, 14 Mar 2005 11:06:06 +0000
Subject: [PATCH] - Unbreak: Fix & cleanup packaging; use PORTDOCS - Fix typo
 in PORTREVISIOIN

---
 x11-clocks/emiclock/Makefile          | 19 ++++++++++---------
 x11-clocks/emiclock/pkg-plist         |  6 +++---
 x11-clocks/emiclock/pkg-plist.nosound |  6 ------
 3 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 x11-clocks/emiclock/pkg-plist.nosound

diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index 07aa0c8fea57..fc78b1116724 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -7,17 +7,17 @@
 
 PORTNAME=	emiclock
 PORTVERSION=	2.0.2
-PORTREVISIOIN=	1
+PORTREVISION=	1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	ftp://ftp.noge.com/pub/EmiClock/X11/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hyper-animated face analog clock for X11
 
-BROKEN=		Incomplete pkg-plist
-
 .if ${MACHINE_ARCH} != "i386"
-PLIST=		${PKGDIR}/pkg-plist.nosound
+PLIST_SUB=	SOUND="@comment "
+.else
+PLIST_SUB=	SOUND=""
 .endif
 
 USE_IMAKE=	yes
@@ -27,15 +27,16 @@ LANGRES=	resources/R6/EUC/EmiClock.ad
 LANGDIR=	$(X11BASE)/lib/X11/ja_JP.eucJP/app-defaults
 LANGDIR2=	$(X11BASE)/lib/X11/ja_JP.EUC/app-defaults
 EMICLOCKDIR=	$(X11BASE)/lib/X11/EmiClock
-COPYRIGHTS=	COPYRIGHT COPYRIGHT.en
+PORTDOCS=	COPYRIGHT COPYRIGHT.en
 
 pre-install:
-	@if [ ! -d $(EMICLOCKDIR) ] ; then ${MKDIR} $(EMICLOCKDIR); fi
-	@if [ ! -d $(LANGDIR) ] ; then ${MKDIR} $(LANGDIR); fi
-	@if [ ! -d $(LANGDIR2) ] ; then ${MKDIR} $(LANGDIR2); fi
+	@${MKDIR} $(EMICLOCKDIR)
+	@${MKDIR} $(LANGDIR)
+	@${MKDIR} $(LANGDIR2)
 	cd $(WRKSRC); ${INSTALL_DATA} -c -m 0444 $(LANGRES) $(LANGDIR)/EmiClock
 	cd $(WRKSRC); ${INSTALL_DATA} -c -m 0444 $(LANGRES) $(LANGDIR2)/EmiClock
-	cd $(WRKSRC); ${INSTALL_DATA} -c -m 0444 $(COPYRIGHTS) $(EMICLOCKDIR)
+	@${MKDIR} ${DOCSDIR}
+	cd $(WRKSRC); ${INSTALL_DATA} -c -m 0444 ${PORTDOCS} ${DOCSDIR}
 #	cd $(WRKSRC); make install.man
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/emiclock/pkg-plist b/x11-clocks/emiclock/pkg-plist
index 560d65828559..78514310e92f 100644
--- a/x11-clocks/emiclock/pkg-plist
+++ b/x11-clocks/emiclock/pkg-plist
@@ -2,9 +2,9 @@ bin/emiclock
 lib/X11/app-defaults/EmiClock
 lib/X11/ja_JP.EUC/app-defaults/EmiClock
 lib/X11/ja_JP.eucJP/app-defaults/EmiClock
-lib/X11/EmiClock/myu.au
-lib/X11/EmiClock/COPYRIGHT
-lib/X11/EmiClock/COPYRIGHT.en
+%%SOUND%%lib/X11/EmiClock/myu.au
 @dirrm lib/X11/ja_JP.EUC/app-defaults
+@dirrm lib/X11/ja_JP.EUC
 @dirrm lib/X11/ja_JP.eucJP/app-defaults
+@dirrm lib/X11/ja_JP.eucJP
 @dirrm lib/X11/EmiClock
diff --git a/x11-clocks/emiclock/pkg-plist.nosound b/x11-clocks/emiclock/pkg-plist.nosound
deleted file mode 100644
index d78256a9c919..000000000000
--- a/x11-clocks/emiclock/pkg-plist.nosound
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/emiclock
-lib/X11/app-defaults/EmiClock
-lib/X11/ja_JP.EUC/app-defaults/EmiClock
-lib/X11/ja_JP.eucJP/app-defaults/EmiClock
-lib/X11/EmiClock/COPYRIGHT
-lib/X11/EmiClock/COPYRIGHT.en