5 files changed, 36 insertions, 248 deletions

diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 02fe2b9e64b3..9019f9d55d0b 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -5,34 +5,50 @@
 # $FreeBSD$
 
 PORTNAME=	pdmenu
-PORTVERSION=	1.2.90
+PORTVERSION=	1.2.93
 CATEGORIES=	misc
-MASTER_SITES=	http://www.powertrip.co.za/distfiles/pdmenu/ \
-				http://dev.powertrip.co.za/distfiles/pdmenu/ \
-				${MASTER_SITE_DEBIAN_POOL}
-DISTNAME=	pdmenu_${PORTVERSION}
+MASTER_SITES=	DEBIAN
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple console menu program
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 
-BROKEN=		Does not fetch
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnometarget
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/pdmenu
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	SLANG_H_LOC="${LOCALBASE}/include/slang.h" \
+		SLANG_LIB_LOC="${LOCALBASE}/lib" \
+		LIBS="-lcurses -lintl"
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 MAN1=		pdmenu.1
 MAN5=		pdmenurc.5
-
-CC+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
-
-CONFIGURE_ENV=	SLANG_LIB_LOC='${PREFIX}/lib' \
-		SLANG_H_LOC='${PREFIX}/include/slang.h'
-
-pre-install:
-	${MKDIR} ${PREFIX}/lib/pdmenu
-	${MKDIR} ${PREFIX}/share/pdmenu
+PLIST_FILES=	bin/pdmenu \
+		etc/pdmenurc \
+		share/locale/fr/LC_MESSAGES/pdmenu.mo \
+		%%DATADIR%%/editdir.pl \
+		%%DATADIR%%/showdir.pl
+PLIST_DIRS=	%%DATADIR%%
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/pdmenu ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/examples/pdmenurc ${PREFIX}/etc
+	${INSTALL_MAN} ${WRKSRC}/doc/pdmenu.man ${MANPREFIX}/man/man1/pdmenu.1
+	${INSTALL_MAN} ${WRKSRC}/doc/pdmenurc.man ${MAN5PREFIX}/man/man5/pdmenurc.5
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.pl ${DATADIR}
+.for lang in fr
+	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
+		${PREFIX}/share/locale/${lang}/LC_MESSAGES/pdmenu.mo
+.endfor
+
+post-install:
+	@${STRIP_CMD} ${PREFIX}/bin/pdmenu
 
 .include <bsd.port.mk>
diff --git a/misc/pdmenu/distinfo b/misc/pdmenu/distinfo
index a37e844d6898..daa76d1c18d7 100644
--- a/misc/pdmenu/distinfo
+++ b/misc/pdmenu/distinfo
@@ -1,3 +1,3 @@
-MD5 (pdmenu_1.2.90.tar.gz) = a85a2041aba6ab3f254a5266e9fa57b4
-SHA256 (pdmenu_1.2.90.tar.gz) = dfda5e59c41eb96263e37ddd2c938859773a708dc4753823ea5e193c006a1dd4
-SIZE (pdmenu_1.2.90.tar.gz) = 150359
+MD5 (pdmenu_1.2.93.tar.gz) = 5177eaafc65e27abbdfa45c4d8f5c850
+SHA256 (pdmenu_1.2.93.tar.gz) = cac07ce100dbfec48e882ffb607f798d0163a1f7d80063940742a72d53e1db52
+SIZE (pdmenu_1.2.93.tar.gz) = 152256
diff --git a/misc/pdmenu/files/patch-ab b/misc/pdmenu/files/patch-ab
deleted file mode 100644
index cf3ac0ddfd9d..000000000000
--- a/misc/pdmenu/files/patch-ab
+++ /dev/null
@@ -1,197 +0,0 @@
---- configure.old	Fri Jun 11 20:27:26 2004
-+++ configure	Sat Jun 12 16:03:51 2004
-@@ -6442,6 +6442,92 @@
- 	CFLAGS="-L$SLANG_LIB_LOC $CFLAGS"
- fi
- 
-+Terminfo_Dirs="/usr/lib/terminfo \
-+	/usr/share/lib/terminfo \
-+	/usr/local/lib/terminfo"
-+TERMCAP=yes
-+echo "$as_me:$LINENO: checking for terminfo" >&5
-+echo $ECHO_N "checking for terminfo... $ECHO_C" >&6
-+for terminfo_dir in $Terminfo_Dirs
-+do
-+	if test -d $terminfo_dir; then
-+		echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6
-+		TERMCAP=""
-+		break
-+	fi
-+done
-+if test "$TERMCAP"; then
-+	echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6
-+
-+echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
-+echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
-+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltermcap  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char tgetent ();
-+int
-+main ()
-+{
-+tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_termcap_tgetent=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_termcap_tgetent=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
-+echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
-+if test $ac_cv_lib_termcap_tgetent = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBTERMCAP 1
-+_ACEOF
-+
-+  LIBS="-ltermcap $LIBS"
-+
-+fi
-+
-+	# Note that if this fails, we continue and make probably dies with
-+	# an error. Unless terminfo is hiding somewhere else..
-+fi
-+
- 
- echo "$as_me:$LINENO: checking for SLsig_block_signals in -lslang" >&5
- echo $ECHO_N "checking for SLsig_block_signals in -lslang... $ECHO_C" >&6
-@@ -8095,101 +8181,6 @@
- 		{ echo "$as_me:$LINENO: WARNING: pdmenu will be built without GPM mouse support." >&5
- echo "$as_me: WARNING: pdmenu will be built without GPM mouse support." >&2;}
- 	fi
--fi
--
--Terminfo_Dirs="/usr/lib/terminfo \
--	/usr/share/lib/terminfo \
--	/usr/local/lib/terminfo"
--TERMCAP=yes
--echo "$as_me:$LINENO: checking for terminfo" >&5
--echo $ECHO_N "checking for terminfo... $ECHO_C" >&6
--for terminfo_dir in $Terminfo_Dirs
--do
--	if test -d $terminfo_dir; then
--		echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
--		TERMCAP=""
--		break
--	fi
--done
--if test "$TERMCAP"; then
--	echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--
--echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
--echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
--if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltermcap  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char tgetent ();
--int
--main ()
--{
--tgetent ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_termcap_tgetent=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_termcap_tgetent=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
--echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
--if test $ac_cv_lib_termcap_tgetent = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBTERMCAP 1
--_ACEOF
--
--  LIBS="-ltermcap $LIBS"
--
--fi
--
--	# Note that if this fails, we continue and make probably dies with
--	# an error. Unless terminfo is hiding somewhere else..
- fi
- 
- # Extract the first word of "date", so it can be a program name with args.
diff --git a/misc/pdmenu/files/patch-ad b/misc/pdmenu/files/patch-ad
deleted file mode 100644
index cc258cabf9bf..000000000000
--- a/misc/pdmenu/files/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
-@@ -13,7 +13,7 @@
- include makeinfo
- 
- pdmenu: .dep $(OBJFILES)
--	${CC} -o pdmenu $(OBJFILES) $(CFLAGS) $(LIBS)
-+	${CC} -o pdmenu $(OBJFILES) $(CFLAGS) $(LIBS) -lintl
- 
- depend: .dep
- dep: .dep
-@@ -57,8 +57,7 @@
- 	$(INSTALL) examples/showdir.pl $(INSTALL_PREFIX)/$(DATADIR)/pdmenu
- 	cd $(INSTALL_PREFIX)/$(DATADIR)/pdmenu && $(LN_S) -f showdir.pl editdir.pl
- 	for lang in $(LANGS); do \
--		[ ! -d $(LOCALEDIR)/$$lang/LC_MESSAGES/ ] && mkdir -p $(LOCALEDIR)/$$lang/LC_MESSAGES/; \
--		install -m 644 po/$$lang.mo $(LOCALEDIR)/$$lang/LC_MESSAGES/pdmenu.mo; \
-+		install -m 644 po/$$lang.mo $(PREFIX)/share/locale/$$lang/LC_MESSAGES/pdmenu.mo; \
- 	done
- 
- test: pdmenu
diff --git a/misc/pdmenu/pkg-plist b/misc/pdmenu/pkg-plist
deleted file mode 100644
index 4565f2e6b432..000000000000
--- a/misc/pdmenu/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/pdmenu
-etc/pdmenurc
-share/locale/fr/LC_MESSAGES/pdmenu.mo
-%%DATADIR%%/editdir.pl
-%%DATADIR%%/showdir.pl
-@dirrm %%DATADIR%%
-@dirrm lib/pdmenu