Support stage

3 files changed, 54 insertions, 64 deletions

diff --git a/audio/gnormalize/Makefile b/audio/gnormalize/Makefile
index 23cd35e5616d..0a682cab3c66 100644
--- a/audio/gnormalize/Makefile
+++ b/audio/gnormalize/Makefile
@@ -14,37 +14,31 @@ RUN_DEPENDS+=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		wavegain:${PORTSDIR}/audio/wavegain
 
 USES=		perl5 shebangfix
-NO_STAGE=	yes
 USE_PERL5=	run
 INSTALLS_ICONS=	yes
 
-SHEBANGFILES=	${PORTNAME}
+SHEBANG_FILES=	${PORTNAME}
 
 NO_BUILD=	yes
 
-MAN1=		gnormalize.1
-
 OPTIONS_DEFINE=	MP3 OGG MP4 CDPARANOIA CDDB CDPLAY PLAC MAC MUSEPACK
 OPTIONS_DEFAULT=	MP3 OGG MP4
 
 MAC_DESC=	Monkey's Audio Encoding and Playback
 CDPLAY_DESC=	CD Playback
 
-.include <bsd.port.options.mk>
+MP3_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
+			p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info
+OGG_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
+MP4_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac \
+			faad:${PORTSDIR}/audio/faad
+CDDB_RUN_DEPENDS=	cddb.pl:${PORTSDIR}/audio/p5-CDDB_get
+CDPLAY_RUN_DEPENDS=	p5-Audio-CD>=0:${PORTSDIR}/audio/p5-Audio-CD
+FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
+MAC_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
+MUSEPACK_RUN_DEPENDS=	mppenc:${PORTSDIR}/audio/musepack
 
-.if ${PORT_OPTIONS:MMP3}
-RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame \
-	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info
-.endif
-
-.if ${PORT_OPTIONS:MOGG}
-RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
-.endif
-
-.if ${PORT_OPTIONS:MMP4}
-RUN_DEPENDS+=	faac:${PORTSDIR}/audio/faac \
-	faad:${PORTSDIR}/audio/faad
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCDPARANOIA} || ${PORT_OPTIONS:MCDDA2WAV}
 RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
@@ -52,26 +46,6 @@ RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
 RUN_DEPENDS+=	cdparanoia:${PORTSDIR}/audio/cdparanoia
 .endif
 
-.if ${PORT_OPTIONS:MCDDB}
-RUN_DEPENDS+=	cddb.pl:${PORTSDIR}/audio/p5-CDDB_get
-.endif
-
-.if ${PORT_OPTIONS:MCDPLAY}
-RUN_DEPENDS+=	p5-Audio-CD>=0:${PORTSDIR}/audio/p5-Audio-CD
-.endif
-
-.if ${PORT_OPTIONS:MFLAC}
-RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
-.endif
-
-.if ${PORT_OPTIONS:MMAC}
-RUN_DEPENDS+=	mac:${PORTSDIR}/audio/mac
-.endif
-
-.if ${PORT_OPTIONS:MMUSEPACK}
-RUN_DEPENDS+=	mppenc:${PORTSDIR}/audio/musepack
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,^PREFIX=.*,PREFIX=${PREFIX},; \
 		s,^MANDIR=.*,MANDIR=${MANPREFIX}/man,; \
diff --git a/audio/gnormalize/files/patch-Makefile b/audio/gnormalize/files/patch-Makefile
index 8f5248d2b7af..8843c6a86ad2 100644
--- a/audio/gnormalize/files/patch-Makefile
+++ b/audio/gnormalize/files/patch-Makefile
@@ -1,52 +1,67 @@
---- Makefile.orig	2008-06-11 09:03:39.000000000 +0800
-+++ Makefile	2008-08-26 02:44:33.000000000 +0800
-@@ -7,9 +7,12 @@
+--- ./Makefile.orig	2008-06-11 03:03:39.000000000 +0200
++++ ./Makefile	2014-04-06 19:58:34.694394244 +0200
+@@ -1,15 +1,18 @@
+-PREFIX=/usr
++PREFIX=/usr/local
+ BINDIR=$(PREFIX)/bin
+ DOCDIR=$(PREFIX)/share/doc/gnormalize
+ ICONDIR=$(PREFIX)/share/icons
+ ICONDIR2=$(PREFIX)/share/pixmaps
+ LICONDIR=$(ICONDIR)/large
  MICONDIR=$(ICONDIR)/mini
- BASE=$(PREFIX)/share/gnormalize
+-BASE=$(PREFIX)/share/gnormalize
++BASE=/usr/local/share/gnormalize
  ANIMDIR=$(BASE)/animations
 -MANDIR=$(PREFIX)/share/man
-+MANDIR=$(PREFIX)/man
-+INSTALL_PROG=install -m 755 -o root -g wheel
-+INSTALL_DATA=install -m 444 -o root -g wheel
++MANDIR=/usr/local/man
++INSTALL_PROG=install -m 755
++INSTALL_DATA=install -m 444
  
  DOCS=README
 +MAN_PAGE=gnormalize.1
  
  all:
  clean:
-@@ -17,21 +20,22 @@
+@@ -17,29 +20,30 @@
  
  
  install: all
-+	cat "$(MAN_PAGE).lzma" | lzma -d -- > "$(MAN_PAGE)"
- 	mkdir -p "$(BINDIR)"
- 	mkdir -p "$(ICONDIR)"
- 	mkdir -p "$(ICONDIR2)"
-+	mkdir -p "$(LICONDIR)"
-+	mkdir -p "$(MICONDIR)"
- 	mkdir -p "$(ANIMDIR)"
+-	mkdir -p "$(BINDIR)"
+-	mkdir -p "$(ICONDIR)"
+-	mkdir -p "$(ICONDIR2)"
+-	mkdir -p "$(ANIMDIR)"
 -	mkdir -p "$(DOCDIR)"
- 	mkdir -p "$(MANDIR)/man1/"
+-	mkdir -p "$(MANDIR)/man1/"
 -	install -Dm 0755 gnormalize "$(BINDIR)/gnormalize"
 -	install -m 0644 $(DOCS) "$(DOCDIR)/"
 -	install -m 0644 $(DOCS) "$(BASE)/"
 -	install -m 0644 gnormalize.1.lzma "$(MANDIR)/man1/gnormalize.1.lzma"
-+	$(INSTALL_PROG) gnormalize "$(BINDIR)/gnormalize"
-+	$(INSTALL_DATA) $(DOCS) "$(BASE)/"
-+	$(INSTALL_DATA) $(MAN_PAGE) "$(MANDIR)/man1/$(MAN_PAGE)"
- 	install -d "$(ANIMDIR)"
+-	install -d "$(ANIMDIR)"
 -	install -m 0644 animations/*.gif "$(ANIMDIR)/"	
 -	install -Dm 0644 icons/gnormalize-32.png "$(ICONDIR)/gnormalize.png"
 -	install -Dm 0644 icons/gnormalize-48.png "$(LICONDIR)/gnormalize.png"
 -	install -Dm 0644 icons/gnormalize-16.png "$(MICONDIR)/gnormalize.png"
-+	$(INSTALL_DATA) animations/*.gif "$(ANIMDIR)/"	
-+	$(INSTALL_DATA) icons/gnormalize-32.png "$(ICONDIR)/gnormalize.png"
-+	$(INSTALL_DATA) icons/gnormalize-48.png "$(LICONDIR)/gnormalize.png"
-+	$(INSTALL_DATA) icons/gnormalize-16.png "$(MICONDIR)/gnormalize.png"
- 	ln -sf "$(ICONDIR)/gnormalize.png" "$(ICONDIR2)/gnormalize.png"
+-	ln -sf "$(ICONDIR)/gnormalize.png" "$(ICONDIR2)/gnormalize.png"
++	cat "$(MAN_PAGE).lzma" | lzma -d -- > "$(MAN_PAGE)"
++	mkdir -p "$(DESTDIR)$(BINDIR)"
++	mkdir -p "$(DESTDIR)$(ICONDIR)"
++	mkdir -p "$(DESTDIR)$(ICONDIR2)"
++	mkdir -p "$(DESTDIR)$(LICONDIR)"
++	mkdir -p "$(DESTDIR)$(MICONDIR)"
++	mkdir -p "$(DESTDIR)$(ANIMDIR)"
++	mkdir -p "$(DESTDIR)$(MANDIR)/man1/"
++	$(INSTALL_PROG) gnormalize "$(DESTDIR)$(BINDIR)/gnormalize"
++	$(INSTALL_DATA) $(DOCS) "$(DESTDIR)$(BASE)/"
++	$(INSTALL_DATA) $(MAN_PAGE) "$(DESTDIR)$(MANDIR)/man1/$(MAN_PAGE)"
++	install -d "$(DESTDIR)$(ANIMDIR)"
++	$(INSTALL_DATA) animations/*.gif "$(DESTDIR)$(ANIMDIR)/"
++	$(INSTALL_DATA) icons/gnormalize-32.png "$(DESTDIR)$(ICONDIR)/gnormalize.png"
++	$(INSTALL_DATA) icons/gnormalize-48.png "$(DESTDIR)$(LICONDIR)/gnormalize.png"
++	$(INSTALL_DATA) icons/gnormalize-16.png "$(DESTDIR)$(MICONDIR)/gnormalize.png"
++	ln -sf "$(ICONDIR)/gnormalize.png" "$(DESTDIR)$(ICONDIR2)/gnormalize.png"
  
  postinstall:
-@@ -39,7 +43,7 @@
+ 	update-menus
  
  uninstall:
  	rm -f "$(BINDIR)/gnormalize"
diff --git a/audio/gnormalize/pkg-plist b/audio/gnormalize/pkg-plist
index 2f589aea3096..f78f2530c625 100644
--- a/audio/gnormalize/pkg-plist
+++ b/audio/gnormalize/pkg-plist
@@ -1,4 +1,5 @@
 bin/gnormalize
+man/man1/gnormalize.1.gz
 %%DATADIR%%/animations/dancing_penguin.gif
 %%DATADIR%%/animations/penguin_cold.gif
 %%DATADIR%%/animations/penguin_ice.gif