- Update to 8.1

PR:             110501
Submitted by:   Eric P. Scott <eps+pbug0703@ana.com>
Approved by:    maintainer implicit

5 files changed, 35 insertions, 60 deletions

diff --git a/sysutils/isomaster/Makefile b/sysutils/isomaster/Makefile
index e71bec31ef5f..8eae98a371e2 100644
--- a/sysutils/isomaster/Makefile
+++ b/sysutils/isomaster/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	isomaster
-PORTVERSION=	0.7.1
+PORTVERSION=	0.8.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://littlesvr.ca/isomaster/releases/
 
@@ -17,24 +17,35 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk20 pkgconfig intlhack gnomehier
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-INSTALLS_ICON=	yes
 
-MAKE_ENV=	PREFIX=${PREFIX}
+MAKE_ENV=	PREFIX=${PREFIX} DESKTOPPATH=${DESKTOPDIR}
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 CFLAGS+=	${PTHREAD_CFLAGS} ${PTHREAD_LIBS:S/"//g} \
 		`pkg-config --cflags gtk+-2.0` \
 		-DICONPATH=\\\"${DATADIR}/icons\\\"
 .if !defined(WITHOUT_NLS)
-CFLAGS+=	-DLOCALEDIR=\\\"${PREFIX}/share/locale\\\"
+CFLAGS+=	-DLOCALEDIR=\\\"${PREFIX}/share/locale\\\" -DENABLE_NLS
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
+PLIST_SUB+=	DESKTOPDIR="${DESKTOPDIR:S,^${TARGETDIR}/,,}"
 
-post-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${FILESDIR}/isomaster.desktop ${PREFIX}/share/applications
-	${MKDIR} ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/icons/isomaster.png ${PREFIX}/share/pixmaps/isomaster.png
+MAN1=	isomaster.1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/isomaster ${PREFIX}/bin
+	${MKDIR} ${DATADIR}/icons
+.for i in isomaster.png go-back-kearone.png folder-new-kearone.png add2-kearone.png extract2-kearone.png delete-kearone.png
+	${INSTALL_DATA} ${WRKSRC}/icons/${i} ${DATADIR}/icons
+.endfor
+.if !defined(WITHOUT_NLS)
+.for i in bg de es fr it nl pl pt ro ru sk sq zh_CN zh_TW
+	${INSTALL_DATA} ${WRKSRC}/po/${i}.mo ${PREFIX}/share/locale/${i}/LC_MESSAGES/isomaster.mo
+.endfor
+.endif
+	${INSTALL_MAN} ${WRKSRC}/isomaster.1 ${MAN1PREFIX}/man/man1
+	${MKDIR} ${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/isomaster.desktop ${DESKTOPDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/isomaster/distinfo b/sysutils/isomaster/distinfo
index 169a36158c8e..3810bb86f004 100644
--- a/sysutils/isomaster/distinfo
+++ b/sysutils/isomaster/distinfo
@@ -1,3 +1,3 @@
-MD5 (isomaster-0.7.1.tar.bz2) = abc8b7bcd415084ace00854cca6248f0
-SHA256 (isomaster-0.7.1.tar.bz2) = 4caeb25be0a5d4cd18028469387fce5e15009304296c162b238f199b66f1c78a
-SIZE (isomaster-0.7.1.tar.bz2) = 161217
+MD5 (isomaster-0.8.1.tar.bz2) = 32066d9358f7f2601c3dc5344687f572
+SHA256 (isomaster-0.8.1.tar.bz2) = 19647b3b9bf798b82793b81aad22e5824ec13418a5fb429bdd8c70f67a9a9e21
+SIZE (isomaster-0.8.1.tar.bz2) = 205535
diff --git a/sysutils/isomaster/files/isomaster.desktop b/sysutils/isomaster/files/isomaster.desktop
deleted file mode 100644
index e425c3996713..000000000000
--- a/sysutils/isomaster/files/isomaster.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=ISO Master
-Type=Application
-Exec=isomaster
-Icon=isomaster.png
-GenericName=CD image editor
-Comment=CD image editor
-Terminal=false
-MimeType=application/x-iso;
-X-KDE-StartupNotify=true
-Categories=Application;AudioVideo;DiscBurning;
diff --git a/sysutils/isomaster/files/patch-Makefile b/sysutils/isomaster/files/patch-Makefile
deleted file mode 100644
index 735249aeb67d..000000000000
--- a/sysutils/isomaster/files/patch-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -47,7 +47,7 @@
- 
- OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o
- 
--all: lib iniparser translations isomaster man
-+all: lib iniparser translations isomaster
- 
- isomaster: $(OBJECTS) bk/bk.a iniparser-2.15/libiniparser.a
- 	$(CC) $(OBJECTS) bk/bk.a iniparser-2.15/libiniparser.a $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0`-o isomaster
-@@ -91,15 +91,15 @@
- ifndef WITHOUT_NLS
- 	cd po && $(MAKE) install
- endif
--	$(INSTALL) -d $(DESTDIR)$(MYMANPATH)
--	$(INSTALL) -m 644 isomaster.1.gz $(DESTDIR)$(MYMANPATH)
-+#	$(INSTALL) -d $(DESTDIR)$(MYMANPATH)
-+#	$(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH)
- 
- uninstall: 
- 	$(RM) $(DESTDIR)$(BINPATH)/isomaster
- 	$(RM) $(DESTDIR)$(ICONPATH)/isomaster.png
- 	$(RM) $(DESTDIR)$(ICONPATH)/folder-new-tango.png
- 	$(RM) $(DESTDIR)$(ICONPATH)/add2-kearone.png
--	$(RM) $(DESTDIR)$(ICONPATH)/extract-kearone.png
-+	$(RM) $(DESTDIR)$(ICONPATH)/extract2-kearone.png
- ifndef WITHOUT_NLS
- 	cd po && $(MAKE) uninstall
- endif
diff --git a/sysutils/isomaster/pkg-plist b/sysutils/isomaster/pkg-plist
index 0ccb8f1fb1b6..f357d423f0be 100644
--- a/sysutils/isomaster/pkg-plist
+++ b/sysutils/isomaster/pkg-plist
@@ -1,18 +1,25 @@
 bin/isomaster
-share/applications/isomaster.desktop
+%%DESKTOPDIR%%/isomaster.desktop
 %%DATADIR%%/icons/add2-kearone.png
+%%DATADIR%%/icons/delete-kearone.png
 %%DATADIR%%/icons/extract2-kearone.png
-%%DATADIR%%/icons/folder-new-tango.png
+%%DATADIR%%/icons/folder-new-kearone.png
+%%DATADIR%%/icons/go-back-kearone.png
 %%DATADIR%%/icons/isomaster.png
 %%NLS%%share/locale/bg/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/de/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/es/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/it/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/isomaster.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/isomaster.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/isomaster.mo
-share/pixmaps/isomaster.png
-@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
+@dirrmtry %%DESKTOPDIR%%