- Update to 1.3.6

- Take maintainership

Approved by:	tabthorpe (mentor)
Feature safe:	yes

4 files changed, 16 insertions, 22 deletions

diff --git a/sysutils/isomaster/Makefile b/sysutils/isomaster/Makefile
index ada5cf62f60e..30cf10744fc1 100644
--- a/sysutils/isomaster/Makefile
+++ b/sysutils/isomaster/Makefile
@@ -6,25 +6,26 @@
 #
 
 PORTNAME=	isomaster
-PORTVERSION=	1.3.5
-PORTREVISION=	1
+PORTVERSION=	1.3.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://littlesvr.ca/isomaster/releases/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	avl@FreeBSD.org
 COMMENT=	GTK2 (bootable) CD ISO Image editor
 
 USE_BZIP2=	yes
-USE_GNOME=	gtk20 pkgconfig intlhack gnomehier
+USE_GNOME=	gtk20 pkgconfig intlhack gnomehier desktopfileutils
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 
 MAKE_ENV=	DESKTOPPATH=${DESKTOPDIR}
-MAKE_ARGS=	CFLAGS="${CFLAGS}"
-CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g} \
+MAKE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+CFLAGS+=	-std=c99 ${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g} \
 		`pkg-config --cflags gtk+-2.0` \
 		-DICONPATH=\\\"${DATADIR}/icons\\\"
+LDFLAGS+=	${PTHREAD_LIBS} -lcompat
+
 .if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
 CFLAGS+=	-DLOCALEDIR=\\\"${PREFIX}/share/locale\\\" -DENABLE_NLS
 PLIST_SUB+=	NLS=""
 .else
@@ -41,7 +42,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/icons/${i} ${DATADIR}/icons
 .endfor
 .if !defined(WITHOUT_NLS)
-.for i in ar be@latin bg ca cs da de el es et fi fo fr he hr hu id it nb nl nn pl pt pt_BR ro ru sk sl sq sr sr@Latn sr@latin sv tr uk zh_CN zh_TW
+.for i in ar be@latin bg ca cs da de el es et fi fo fr he hr hu id it lv nb nl nn pl pt pt_BR ro ru sk sl sq sr sr@Latn sr@latin sv tr uk zh_CN zh_TW
 	test -d ${PREFIX}/share/locale/${i} || ${MKDIR} ${PREFIX}/share/locale/${i}
 	test -d ${PREFIX}/share/locale/${i}/LC_MESSAGES ||  ${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${i}.mo ${PREFIX}/share/locale/${i}/LC_MESSAGES/isomaster.mo
@@ -51,4 +52,7 @@ do-install:
 	${MKDIR} ${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/isomaster.desktop ${DESKTOPDIR}
 
+post-install:
+	@-update-desktop-database
+
 .include <bsd.port.mk>
diff --git a/sysutils/isomaster/distinfo b/sysutils/isomaster/distinfo
index 6571b60151a0..8705f4da1133 100644
--- a/sysutils/isomaster/distinfo
+++ b/sysutils/isomaster/distinfo
@@ -1,3 +1,3 @@
-MD5 (isomaster-1.3.5.tar.bz2) = ceec3c0034d443f4d514558256038dcd
-SHA256 (isomaster-1.3.5.tar.bz2) = 27b9b53d5e361b56a6e302131af2dc97f7135f74786637e6244e075606226597
-SIZE (isomaster-1.3.5.tar.bz2) = 196042
+MD5 (isomaster-1.3.6.tar.bz2) = 3643f2d41a78fe89cd1b4a1df2936cb4
+SHA256 (isomaster-1.3.6.tar.bz2) = a6fbb94fe3dcdf5f465851a52b9fa76bf88a224f87219a2d987d22c73fbf26ba
+SIZE (isomaster-1.3.6.tar.bz2) = 208056
diff --git a/sysutils/isomaster/files/patch-Makefile b/sysutils/isomaster/files/patch-Makefile
deleted file mode 100644
index 79feea4004d0..000000000000
--- a/sysutils/isomaster/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Thu Jan 24 22:52:24 2008
-+++ Makefile	Thu Jan 24 22:52:52 2008
-@@ -64,7 +64,7 @@
- 
- isomaster: $(OBJECTS) lib iniparser
- 	@echo 'Linking isomaster'
--	@$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
-+	@$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(CFLAGS) $(CPPFLAGS) -lcompat `pkg-config --libs gtk+-2.0` -o isomaster
- 
- # static pattern rule
- $(OBJECTS): %.o: %.c %.h bk/bk.h Makefile
diff --git a/sysutils/isomaster/pkg-plist b/sysutils/isomaster/pkg-plist
index a8782d7da407..2f204886e35a 100644
--- a/sysutils/isomaster/pkg-plist
+++ b/sysutils/isomaster/pkg-plist
@@ -24,6 +24,7 @@ bin/isomaster
 %%NLS%%share/locale/hu/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/id/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/it/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/isomaster.mo