- Support CFLAGS/CXXFLAGS properly

- Utilize NOPORTDOCS
bump portrevision

PR:		38991
Submitted by:	Ports Fury

3 files changed, 30 insertions, 39 deletions

diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index b154d287f1de..feebca38d557 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	muse
 PORTVERSION=	0.7.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://freesoftware.fsf.org/download/muse/ \
 		http://muse.dyne.org/releases/
@@ -15,19 +16,32 @@ DISTNAME=	MuSE-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	mp3lame:${PORTSDIR}/audio/lame \
-		ogg:${PORTSDIR}/audio/libogg \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
+		vorbis.1:${PORTSDIR}/audio/libvorbis \
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_GTK=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
-USE_GMAKE=	yes
+CONFIGURE_ARGS=	--disable-debug
 
 post-patch:
-	@${PERL} -pi -e "s,-lgthread,-lgthread12,g" ${WRKSRC}/configure
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/Makefile.in
+	@${PERL} -pi -e 's|-O3|\$$CFLAGS|g ; \
+		 s|\$$GTK_LIBS -lgthread|\$$GTK_LIBS \$$GLIB_LIBS|g ; \
+		 s|\$$GTK_FLAGS|\$$GTK_CFLAGS \$$GLIB_CFLAGS|g' \
+			${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lpthread||g' ${WRKSRC}/Makefile.in
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/muse ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in AUTHORS ChangeLog KNOWN-BUGS NEWS README TODO USAGE
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/muse/files/patch-Makefile.in b/audio/muse/files/patch-Makefile.in
deleted file mode 100644
index 9266bd8a6b97..000000000000
--- a/audio/muse/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Fri Jun  7 02:45:04 2002
-+++ Makefile.in	Fri Jun  7 02:46:00 2002
-@@ -98,7 +98,7 @@
- 
- 
- docs_DATA = README COPYING USAGE AUTHORS NEWS KNOWN-BUGS ChangeLog TODO
--docsdir = ${prefix}/doc/MuSE
-+docsdir = ${prefix}/share/doc/MuSE
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
-@@ -197,8 +197,8 @@
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed 's/$$/$(EXEEXT)/'`"; \
-+	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed 's/$$/$(EXEEXT)/'`; \
- 	  else :; fi; \
- 	done
- 
diff --git a/audio/muse/pkg-plist b/audio/muse/pkg-plist
index e8180d0fa6cb..348ac6ff2557 100644
--- a/audio/muse/pkg-plist
+++ b/audio/muse/pkg-plist
@@ -1,10 +1,9 @@
 bin/muse
-share/doc/MuSE/AUTHORS
-share/doc/MuSE/COPYING
-share/doc/MuSE/ChangeLog
-share/doc/MuSE/KNOWN-BUGS
-share/doc/MuSE/NEWS
-share/doc/MuSE/README
-share/doc/MuSE/TODO
-share/doc/MuSE/USAGE
-@dirrm share/doc/MuSE
+%%PORTDOCS%%share/doc/muse/AUTHORS
+%%PORTDOCS%%share/doc/muse/ChangeLog
+%%PORTDOCS%%share/doc/muse/KNOWN-BUGS
+%%PORTDOCS%%share/doc/muse/NEWS
+%%PORTDOCS%%share/doc/muse/README
+%%PORTDOCS%%share/doc/muse/TODO
+%%PORTDOCS%%share/doc/muse/USAGE
+%%PORTDOCS%%@dirrm share/doc/muse