- Update to 2.3

- Use INFO macro
- Add proper CFLAGS/LDFLAGS for USE_GETTEXT

PR:		ports/118311
Submitted by:	Philip M. Gollucci <pgollucci at p6m7g8.com>
Approved by:	maintainer timeout (10 weeks)

3 files changed, 27 insertions, 9 deletions

diff --git a/misc/hello/Makefile b/misc/hello/Makefile
index afc1f68a3dba..e01032d14cfc 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hello
-PORTVERSION=	2.1.1
-PORTREVISION=	2
+PORTVERSION=	2.3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	hello
@@ -20,13 +19,22 @@ GNU_CONFIGURE=	YES
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		hello.1
+INFO=		hello
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=--disable-nls
+CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+pre-install:
+	${CHMOD} a+x ${WRKSRC}/build-aux/install-sh
+
 .include <bsd.port.mk>
diff --git a/misc/hello/distinfo b/misc/hello/distinfo
index 487c3cb3d65d..c06684fe9113 100644
--- a/misc/hello/distinfo
+++ b/misc/hello/distinfo
@@ -1,3 +1,3 @@
-MD5 (hello-2.1.1.tar.gz) = 70c9ccf9fac07f762c24f2df2290784d
-SHA256 (hello-2.1.1.tar.gz) = c510e3ad0200517e3a14534e494b37dc0770efd733fc35ce2f445dd49c96a7d5
-SIZE (hello-2.1.1.tar.gz) = 389363
+MD5 (hello-2.3.tar.gz) = de3187eac06baf5f0506c06935a1fd29
+SHA256 (hello-2.3.tar.gz) = 429c779083c7c51ece716ae2f69e66caf383537a23119f9e200baf0f54c71c7a
+SIZE (hello-2.3.tar.gz) = 431983
diff --git a/misc/hello/pkg-plist b/misc/hello/pkg-plist
index c4a214a16f06..e1cd552d5a06 100644
--- a/misc/hello/pkg-plist
+++ b/misc/hello/pkg-plist
@@ -1,7 +1,5 @@
 bin/hello
-@unexec install-info --delete %D/info/hello.info %D/info/dir
-info/hello.info
-@exec install-info --dir-file=%D/info/dir --entry="* Hello: (hello).		Hello Reference Manual." %D/info/hello.info
+%%NLS%%share/locale/bg/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/da/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/de/LC_MESSAGES/hello.mo
@@ -9,9 +7,13 @@ info/hello.info
 %%NLS%%share/locale/el/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/es/LC_MESSAGES/hello.mo
+%%NLS%%share/locale/es_AR/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/et/LC_MESSAGES/hello.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/hello.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/hello.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/he/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/hello.mo
@@ -19,6 +21,7 @@ info/hello.info
 %%NLS%%share/locale/id/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/it/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/hello.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/hello.mo
@@ -27,11 +30,18 @@ info/hello.info
 %%NLS%%share/locale/pl/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/hello.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/hello.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/hello.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/hello.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/hello.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/hello.mo
+%%NLS%%@dirrmtry share/locale/es_AR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es_AR
 %%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/de_DE