- Enable all port options by default [1]

- Add license
- Stage support
- Use shebangfix
- Re-word the description for the transparency option
- Use new LIB_DEPENDS syntax
- Bump PORTREVISION

PR:		ports/185095 [1]
Submitted by:	José García Juanino <jjuanino@gmail.com>

2 files changed, 41 insertions, 42 deletions

diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 47435e4..6134c28 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mrxvt-devel
 PORTVERSION=	0.5.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11
 MASTER_SITES=	SF/materm/mrxvt%20source/${PORTVERSION}
 DISTNAME=	mrxvt-${PORTVERSION}
@@ -11,11 +11,14 @@ DISTNAME=	mrxvt-${PORTVERSION}
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Development version of mrxvt
 
+LICENSE=	GPLv2
+
 CONFLICTS=	mrxvt-0.4.*
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
-MAN1=		mrxvt.1
+USES=		shebangfix
+SHEBANG_FILES=  ${WRKSRC}/share/scripts/mrxvtset.pl
 
 SUB_FILES+=	pkg-message
 
@@ -25,10 +28,11 @@ DESKTOP_ENTRIES=	"mrxvt" "mrxvt terminal emulator" \
 			false
 
 OPTIONS_DEFINE=	XFT BACKGROUND JPEG PNG TRANSPARENCY SWAPSCREEN JAPANESE 24BITS \
-		MENUBAR TEXTSHADOW FRILLS DOCS EXAMPLES
-OPTIONS_DEFAULT=	BACKGROUND JPEG PNG TRANSPARENCY SWAPSCREEN 24BITS MENUBAR
+		MENUBAR TEXTSHADOW FRILLS
+OPTIONS_DEFAULT=	BACKGROUND JPEG PNG TRANSPARENCY SWAPSCREEN 24BITS \
+			MENUBAR XFT JAPANESE FRILLS TEXTSHADOW
 BACKGROUND_DESC=	Background images
-TRANSPARENCY_DESC=	transparency
+TRANSPARENCY_DESC=	Transparent background
 SWAPSCREEN_DESC=	Swapscreen
 JAPANESE_DESC=		Support for Japanese language
 24BITS_DESC=		Prefer 24 bits color
@@ -36,14 +40,13 @@ MENUBAR_DESC=		Menubar
 TEXTSHADOW_DESC=	Text shadow
 FRILLS_DESC=		Internal borders and smart resizing
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	--enable-utempter
 .if ${OSVERSION} >= 900004
 CONFIGURE_ARGS+=	--disable-lastlog
 .else
-LIB_DEPENDS+=		utempter.0:${PORTSDIR}/sysutils/libutempter
+LIB_DEPENDS+=		libutempter.so:${PORTSDIR}/sysutils/libutempter
 .endif
 
 .if ${PORT_OPTIONS:MJAPANESE}
@@ -66,13 +69,13 @@ CONFIGURE_ARGS+=	--disable-xpm
 .if ! ${PORT_OPTIONS:MJPEG} || ! ${PORT_OPTIONS:MBACKGROUND}
 CONFIGURE_ARGS+=	--disable-jpeg
 .else
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 .endif
 
 .if ! ${PORT_OPTIONS:MPNG} || ! ${PORT_OPTIONS:MBACKGROUND}
 CONFIGURE_ARGS+=	--disable-png
 .else
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
 .endif
 
 .if ! ${PORT_OPTIONS:MTRANSPARENCY}
@@ -122,25 +125,20 @@ CONFIGURE_ARGS+=	--with-tab-radius=${TAB_RADIUS:M[0-9]*}
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${STAGEDIR}${PREFIX}/bin
 	@for pixmap in ${WRKSRC}/share/pixmaps/* ; \
-	do ${INSTALL_DATA} $$pixmap ${PREFIX}/share/pixmaps/ ; \
+	do ${INSTALL_DATA} $$pixmap ${STAGEDIR}${PREFIX}/share/pixmaps/ ; \
 	done
-	${MKDIR} ${PREFIX}/etc/mrxvt
-	${INSTALL_DATA} ${WRKSRC}/share/mrxvtrc ${PREFIX}/etc/mrxvt/mrxvtrc.sample
-	${INSTALL_DATA} ${WRKSRC}/share/default.menu ${PREFIX}/etc/mrxvt/default.menu.sample
-	${INSTALL_DATA} ${WRKSRC}/share/submenus.menu ${PREFIX}/etc/mrxvt/submenus.menu.sample
-	${INSTALL_MAN} ${WRKSRC}/doc/mrxvt.1 ${MANPREFIX}/man/man1
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/scripts
-	${INSTALL_DATA} ${WRKSRC}/share/scripts/mrxvtset.pl ${EXAMPLESDIR}/scripts
-	${INSTALL_DATA} ${WRKSRC}/share/scripts/settitle.c ${EXAMPLESDIR}/scripts
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${CP} ${WRKSRC}/doc/*.bz2 ${DOCSDIR}
-	${BZIP2_CMD} -d ${DOCSDIR}/*.bz2
-.endif
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mrxvt
+	${INSTALL_DATA} ${WRKSRC}/share/mrxvtrc ${STAGEDIR}${PREFIX}/etc/mrxvt/mrxvtrc.sample
+	${INSTALL_DATA} ${WRKSRC}/share/default.menu ${STAGEDIR}${PREFIX}/etc/mrxvt/default.menu.sample
+	${INSTALL_DATA} ${WRKSRC}/share/submenus.menu ${STAGEDIR}${PREFIX}/etc/mrxvt/submenus.menu.sample
+	${INSTALL_MAN} ${WRKSRC}/doc/mrxvt.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts
+	${INSTALL_DATA} ${WRKSRC}/share/scripts/mrxvtset.pl ${STAGEDIR}${EXAMPLESDIR}/scripts
+	${INSTALL_DATA} ${WRKSRC}/share/scripts/settitle.c ${STAGEDIR}${EXAMPLESDIR}/scripts
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${CP} ${WRKSRC}/doc/*.bz2 ${STAGEDIR}${DOCSDIR}
+	${BZIP2_CMD} -d ${STAGEDIR}${DOCSDIR}/*.bz2
 
 .include <bsd.port.mk>
diff --git a/x11/mrxvt-devel/pkg-plist b/x11/mrxvt-devel/pkg-plist
index f482a65..fab1e5b 100644
--- a/x11/mrxvt-devel/pkg-plist
+++ b/x11/mrxvt-devel/pkg-plist
@@ -1,24 +1,25 @@
 bin/mrxvt
-share/pixmaps/mrxvt-csh.png
-share/pixmaps/mrxvt-csh.xpm
-share/pixmaps/mrxvt-root.png
-share/pixmaps/mrxvt-root.xpm
-share/pixmaps/mrxvt.png
-share/pixmaps/mrxvt.xpm
-etc/mrxvt/mrxvtrc.sample
 etc/mrxvt/default.menu.sample
+etc/mrxvt/mrxvtrc.sample
 etc/mrxvt/submenus.menu.sample
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/mrxvtset.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/settitle.c
+man/man1/mrxvt.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README.greek
-%%PORTDOCS%%%%DOCSDIR%%/README.xvt
-%%PORTDOCS%%%%DOCSDIR%%/hack-mrxvt.txt
-%%PORTDOCS%%%%DOCSDIR%%/rxvtRef.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.menu
+%%PORTDOCS%%%%DOCSDIR%%/README.xvt
 %%PORTDOCS%%%%DOCSDIR%%/behind_mrxvt.txt
+%%PORTDOCS%%%%DOCSDIR%%/hack-mrxvt.txt
 %%PORTDOCS%%%%DOCSDIR%%/mrxvt_seq.txt
+%%PORTDOCS%%%%DOCSDIR%%/rxvtRef.txt
 %%PORTDOCS%%%%DOCSDIR%%/xterm-ctlseqs.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/mrxvtset.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/settitle.c
+share/pixmaps/mrxvt-csh.png
+share/pixmaps/mrxvt-csh.xpm
+share/pixmaps/mrxvt-root.png
+share/pixmaps/mrxvt-root.xpm
+share/pixmaps/mrxvt.png
+share/pixmaps/mrxvt.xpm
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/scripts
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry etc/mrxvt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/scripts
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%