- Update to 4.11

- Pass maintainership to submitter

PR:		117245
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com>

4 files changed, 58 insertions, 23 deletions

diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile
index 01063fca1211..1461cb1158d1 100644
--- a/sysutils/di/Makefile
+++ b/sysutils/di/Makefile
@@ -6,45 +6,68 @@
 #
 
 PORTNAME=	di
-PORTVERSION=	4.9
+PORTVERSION=	4.11
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.gentoo.com/di/ \
 		http://fresh.t-systems-sfr.com/unix/src/privat2/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Disk Information Utility
 
+MAN1=		di.1
+
+.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
+PLIST_SUB=	NLS=""
+DI_BUILD_NO_NLS=	0
+.else
+DI_BUILD_NO_NLS=	1
+PLIST_SUB=	NLS="@comment "
+.endif
 
-MAN1=		di.1
+USE_PERL5_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e "s|zoneid_t|zoneId_t|g" ${WRKSRC}/di.c
 
 do-configure:
 	(cd ${WRKSRC}; \
-		CC="${CC}" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" prefix="${PREFIX}" \
-		LOCALEDIR="${PREFIX}/share/locale" \
+		${SETENV} ${MAKE_ENV} DI_BUILD_MKCONFIG_PL=1 \
+		CC="${CC}" LDFLAGS="${LDFLAGS}" \
+		prefix="${PREFIX}" LOCALEDIR="${PREFIX}/share/locale" \
+		DI_BUILD_NO_NLS=${DI_BUILD_NO_NLS} \
 		./Build config.h)
 
+post-configure:
+	@${REINPLACE_CMD} -e "s|#define _lib_zone_list 1|#undef _lib_zone_list|" ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e "s|#define _lib_fs_stat_dev 1|#undef _lib_fs_stat_dev|" ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e "s|#define _lib_getvfsstat 1|#undef _lib_getvfsstat|" ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e "s|#define _lib_getmnt 1|#undef _lib_getmnt|" ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e "s|#define _lib_mntctl 1|#undef _lib_mntctl|" ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e "s|#define _lib_GetDiskFreeSpace 1|#undef _lib_GetDiskFreeSpace|" ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e "s|#define _lib_GetDriveType 1|#undef _lib_GetDriveType|" ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e "s|#define _lib_GetLogicalDriveStrings 1|#undef _lib_GetLogicalDriveStrings|" ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e "s|#define _lib_GetVolumeInformation 1|#undef _lib_GetVolumeInformation|" ${WRKSRC}/config.h
+
 do-build:
 	(cd ${WRKSRC}; \
-		CC="${CC}" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" prefix="${PREFIX}" \
-		LOCALEDIR="${PREFIX}/share/locale" \
+		${SETENV} ${MAKE_ENV} \
+		CC="${CC}" LDFLAGS="${LDFLAGS}" \
+		prefix="${PREFIX}" LOCALEDIR="${PREFIX}/share/locale" \
+		DI_BUILD_NO_NLS=${DI_BUILD_NO_NLS} \
 		./Build)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/di ${PREFIX}/bin
 	${LN} -sf ${PREFIX}/bin/di ${PREFIX}/bin/mi
 	${INSTALL_MAN} ${WRKSRC}/di.1 ${PREFIX}/man/man1
+.if !defined(WITHOUT_NLS)
 	(cd ${WRKSRC}; \
-		CC="${CC}" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" prefix="${PREFIX}" \
+		${SETENV} ${MAKE_ENV} \
+		CC="${CC}" LDFLAGS="${LDFLAGS}" \
+		prefix="${PREFIX}" \
 		LOCALEDIR="${PREFIX}/share/locale" \
 		./Build build-po)
 	-(cd ${WRKSRC}/po;for i in *.po; do \
@@ -57,5 +80,6 @@ do-install:
 	${PREFIX}/share/locale/$$j/LC_MESSAGES/di.mo; \
 	${RM} -f $$j.mo; \
 	done)
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/di/distinfo b/sysutils/di/distinfo
index 8ee3a27e6a6b..8bbd664fce2e 100644
--- a/sysutils/di/distinfo
+++ b/sysutils/di/distinfo
@@ -1,3 +1,3 @@
-MD5 (di-4.9.tar.gz) = d71682678fc950b64f9ffff8a7587505
-SHA256 (di-4.9.tar.gz) = bd3cf4cba807011ea94489240efe7d2e3816304a237add37153aab666fde7355
-SIZE (di-4.9.tar.gz) = 70462
+MD5 (di-4.11.tar.gz) = d41461eb23dbe2adab9d074478240b7e
+SHA256 (di-4.11.tar.gz) = 982f35998dbbaf07fe33331eb43e76d8bab2f918b004570029c16adabb9e9aae
+SIZE (di-4.11.tar.gz) = 72003
diff --git a/sysutils/di/files/patch-di.c b/sysutils/di/files/patch-di.c
new file mode 100644
index 000000000000..410dbca28de8
--- /dev/null
+++ b/sysutils/di/files/patch-di.c
@@ -0,0 +1,15 @@
+--- di.c.old	Tue Oct 23 11:48:51 2007
++++ di.c	Tue Oct 23 11:49:19 2007
+@@ -267,10 +267,8 @@
+     char            *disp;
+ } dispTable_t;
+ 
+-#if ! _lib_zone_list
+-# define zoneid_t       int
+-# define ZONENAME_MAX   65
+-#endif
++#define zoneid_t       int
++#define ZONENAME_MAX   65
+ 
+ typedef struct {
+     zoneid_t    zoneid;
diff --git a/sysutils/di/pkg-plist b/sysutils/di/pkg-plist
index accff98e7356..9b4112894b6f 100644
--- a/sysutils/di/pkg-plist
+++ b/sysutils/di/pkg-plist
@@ -1,8 +1,4 @@
 bin/di
 bin/mi
-share/locale/de_DE/LC_MESSAGES/di.mo
-share/locale/en_US/LC_MESSAGES/di.mo
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
+%%NLS%%share/locale/de_DE/LC_MESSAGES/di.mo
+%%NLS%%share/locale/en_US/LC_MESSAGES/di.mo