- Fix install

- Fix timidity directory
- Add pkg-message with information on timidity configuration

4 files changed, 16 insertions, 11 deletions

diff --git a/audio/eawpats/Makefile b/audio/eawpats/Makefile
index 3e0b07424c89..34c7ed68609e 100644
--- a/audio/eawpats/Makefile
+++ b/audio/eawpats/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	eawpats
 PORTVERSION=	12
 PORTREVISION=	3
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	GENTOO/distfiles
 DISTNAME=	eawpats12_full
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,17 +14,17 @@ COMMENT=	Eric A. Welsh's collection of Gravis Ultrasound MIDI patches
 RESTRICTED=	Some of the patches are marked no-commercial-use
 
 NO_BUILD=	yes
+NO_ARCH=	yes
+SUB_FILES=	pkg-message
 
 PATCH_SUBDIRS=	ethnic mazpat/fx gsdrum08 gsdrum25 gsdrum40 gus power sfx wime
 DOC_SUBDIRS=	ethnic gsdrum08 gsdrum25 gsdrum40 power wime
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-TIMIDITY_DATADIR=	${PREFIX}/share/timidity
+TIMIDITY_DATADIR=	${PREFIX}/lib/timidity
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/home/user/eawpats|${DATADIR}|' ${WRKSRC}/linuxconfig/timidity.cfg
 
@@ -38,8 +37,6 @@ do-install:
 .endfor
 	${MKDIR} ${STAGEDIR}${TIMIDITY_DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/linuxconfig/timidity.cfg ${STAGEDIR}${TIMIDITY_DATADIR}/timidity.cfg-eawpats
-	[ -f ${STAGEDIR}${TIMIDITY_DATADIR}/timidity.cfg ] || \
-		${INSTALL_DATA} ${WRKSRC}/linuxconfig/timidity.cfg ${STAGEDIR}${TIMIDITY_DATADIR}/timidity.cfg
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/*.txt ${WRKSRC}/*.hlp ${STAGEDIR}${DOCSDIR}
 .for subdir in ${DOC_SUBDIRS}
diff --git a/audio/eawpats/files/pkg-message.in b/audio/eawpats/files/pkg-message.in
new file mode 100644
index 000000000000..3bafd0dcdf1c
--- /dev/null
+++ b/audio/eawpats/files/pkg-message.in
@@ -0,0 +1,11 @@
+===========================================================================
+
+To use eawpats you'll need to replace your
+
+%%LOCALBASE%%/lib/timidity/timidity.cfg
+
+with
+
+%%PREFIX%%/lib/timidity/timidity.cfg-eawpats
+
+===========================================================================
diff --git a/audio/eawpats/pkg-descr b/audio/eawpats/pkg-descr
index ff70f225af67..eb719968c3da 100644
--- a/audio/eawpats/pkg-descr
+++ b/audio/eawpats/pkg-descr
@@ -1,4 +1,3 @@
 This is Eric A. Welsh's collection of Gravis UltraSound MIDI patches,
 configured for use with the TiMidity++ MIDI player.  A configuration file
 for TiMidity++ to use these patches is also included.
-
diff --git a/audio/eawpats/pkg-plist b/audio/eawpats/pkg-plist
index 207157b95caf..e490e002881f 100644
--- a/audio/eawpats/pkg-plist
+++ b/audio/eawpats/pkg-plist
@@ -356,9 +356,7 @@
 %%DATADIR%%/woodflut.pat
 %%DATADIR%%/xgmap2.cfg
 %%DATADIR%%/xylophon.pat
-@unexec if cmp -s %D/share/timidity/timidity.cfg %D/share/timidity/timidity.cfg-eawpats; then rm -f %D/share/timidity/timidity.cfg; fi
-share/timidity/timidity.cfg-eawpats
-@exec [ ! -f %B/timidity.cfg ] && cp -p %B/%f %B/timidity.cfg
+lib/timidity/timidity.cfg-eawpats
 %%PORTDOCS%%%%DOCSDIR%%/changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/copyrigh.txt
 %%PORTDOCS%%%%DOCSDIR%%/drumsfx.txt