4 files changed, 28 insertions, 36 deletions

diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index a34e2489c66a..74b5a71eb05c 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pdmenu
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.3
 CATEGORIES=	misc
 MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -12,7 +11,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple console menu program
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
 
@@ -22,40 +20,23 @@ USES=		gettext gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SLANG_H_LOC="${LOCALBASE}/include/slang.h" \
 		SLANG_LIB_LOC="${LOCALBASE}/lib"
+MAKE_ENV=	INSTALL_PREFIX="${STAGEDIR}"
+
+CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
-CFLAGS+=	${CPPFLAGS}
 LIBS+=		-L${LOCALBASE}/lib -lcurses -lintl
 
-PLIST_FILES=	bin/pdmenu \
-		etc/pdmenurc \
-		share/locale/da/LC_MESSAGES/pdmenu.mo \
-		share/locale/es/LC_MESSAGES/pdmenu.mo \
-		share/locale/fr/LC_MESSAGES/pdmenu.mo \
-		share/locale/ru/LC_MESSAGES/pdmenu.mo \
-		man/man1/pdmenu.1.gz \
-		man/man5/pdmenurc.5.gz \
-		%%DATADIR%%/editdir.pl \
-		%%DATADIR%%/showdir.pl
-PLIST_DIRS=	%%DATADIR%%
-
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/^LANGS/s|=.*$$|= da es fr ru|g' ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pdmenu ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/examples/pdmenurc ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_MAN} ${WRKSRC}/doc/pdmenu.man ${STAGEDIR}${MANPREFIX}/man/man1/pdmenu.1
-	${INSTALL_MAN} ${WRKSRC}/doc/pdmenurc.man ${STAGEDIR}${MANPREFIX}/man/man5/pdmenurc.5
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.pl ${STAGEDIR}${DATADIR}
-.for lang in da es fr ru
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
-		${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/pdmenu.mo
-.endfor
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pdmenu
+		'/^LANGS/s|=.*$$|= da es fr ru| ; \
+		 /^LOCALEDIR/s|/usr/share|$$(DATADIR)| ; \
+		 s|\($$(CC)\) \(-MM\)|\1 $$(CFLAGS) \2| ; \
+		 /INSTALL/s| -m 0644|| ; \
+		 /INSTALL/s|\(pdmenurc\)$$|\1.sample| ; \
+		 s|install -m 644|$$(INSTALL)|' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|$${INSTALL}|@INSTALL_PROGRAM@|' \
+		${WRKSRC}/autoconf/makeinfo.in
 
 .include <bsd.port.mk>
diff --git a/misc/pdmenu/distinfo b/misc/pdmenu/distinfo
index 5ea89fce6626..5713be4c7057 100644
--- a/misc/pdmenu/distinfo
+++ b/misc/pdmenu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pdmenu_1.3.2.tar.gz) = 7a7b68d50851a4f0f42467d9c5ee74bdb42591e35687f97ad3d2c915f9607d90
-SIZE (pdmenu_1.3.2.tar.gz) = 160083
+SHA256 (pdmenu_1.3.3.tar.gz) = 3dbf4496f906ea51a2d189914fa449c1c5cf4da520a54c727d8028c67a90df10
+SIZE (pdmenu_1.3.3.tar.gz) = 160840
diff --git a/misc/pdmenu/pkg-descr b/misc/pdmenu/pkg-descr
index fd34256e9f2b..03dfc760f9cd 100644
--- a/misc/pdmenu/pkg-descr
+++ b/misc/pdmenu/pkg-descr
@@ -2,4 +2,4 @@ Pdmenu is a menuing system for Unix. It is designed to be easy to
 use, and is suitable for a login shell for inexperienced users, or
 it can just be ran at the command line as a handy menu.
 
-WWW: http://kitenet.net/~joey/code/pdmenu/
+WWW: http://joeyh.name/code/pdmenu/
diff --git a/misc/pdmenu/pkg-plist b/misc/pdmenu/pkg-plist
new file mode 100644
index 000000000000..9e5e7e320ba6
--- /dev/null
+++ b/misc/pdmenu/pkg-plist
@@ -0,0 +1,11 @@
+bin/pdmenu 
+@sample etc/pdmenurc.sample
+man/man1/pdmenu.1.gz
+man/man5/pdmenurc.5.gz
+share/locale/da/LC_MESSAGES/pdmenu.mo
+share/locale/es/LC_MESSAGES/pdmenu.mo
+share/locale/fr/LC_MESSAGES/pdmenu.mo
+share/locale/ru/LC_MESSAGES/pdmenu.mo
+%%DATADIR%%/editdir.pl
+%%DATADIR%%/showdir.pl
+@dirrm %%DATADIR%%