ports/188866: sysutils/isomaster: Update to version 1.3.11
KATO Tsuguru
tkato432 at yahoo.com
Mon Apr 21 18:10:04 UTC 2014
>Number: 188866
>Category: ports
>Synopsis: sysutils/isomaster: Update to version 1.3.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 21 18:10:04 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p8 i386
>Organization:
>Environment:
>Description:
- Update to version 1.3.11
Remove file:
files/patch-bk__bk.h
files/patch-bk__bkCache.c
files/patch-bk__bkMisc.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/sysutils/isomaster/Makefile sysutils/isomaster/Makefile
--- /usr/ports/sysutils/isomaster/Makefile 2013-11-06 21:54:18.000000000 +0900
+++ sysutils/isomaster/Makefile 2014-04-22 00:00:00.000000000 +0900
@@ -2,7 +2,7 @@
# $FreeBSD: head/sysutils/isomaster/Makefile 327772 2013-09-20 23:05:58Z bapt $
PORTNAME= isomaster
-PORTVERSION= 1.3.9
+PORTVERSION= 1.3.11
CATEGORIES= sysutils
MASTER_SITES= http://littlesvr.ca/isomaster/releases/
@@ -14,39 +14,39 @@
LIB_DEPENDS= iniparser:${PORTSDIR}/devel/iniparser
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
-USE_BZIP2= yes
-USE_GNOME= intlhack gnomehier gtk20
-USES= desktop-file-utils gettext gmake pkgconfig
+USES= desktop-file-utils gettext gmake pkgconfig tar:bzip2
+USE_GNOME= gtk20
MAKE_ENV= DEFAULT_VIEWER="xdg-open" USE_SYSTEM_INIPARSER=1
CPPFLAGS+= -I${LOCALBASE}/include -Diniparser_setstr=iniparser_set
LDFLAGS+= -L${LOCALBASE}/lib -lintl
-PLIST_SUB= DESKTOPDIR="${DESKTOPDIR:S,^${PREFIX}/,,}"
-
-MAN1= isomaster.1
-
-NO_STAGE= yes
post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|<time.h>|<sys/time.h>|' ${WRKSRC}/bk/bkMisc.c
@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
's|@$$(CC)|$$(CC)|'
do-install:
- (cd ${WRKSRC} && ${INSTALL_PROGRAM} isomaster ${PREFIX}/bin)
- (cd ${WRKSRC} && ${INSTALL_MAN} isomaster.1 ${MANPREFIX}/man/man1)
- @${MKDIR} ${DATADIR}/icons
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} isomaster \
+ ${STAGEDIR}${PREFIX}/bin)
+ (cd ${WRKSRC} && ${INSTALL_MAN} isomaster.1 \
+ ${STAGEDIR}${MANPREFIX}/man/man1)
+ @${MKDIR} ${STAGEDIR}${DATADIR}/icons
.for i in add2-kearone.png delete-kearone.png extract2-kearone.png \
folder-new-kearone.png go-back-kearone.png isomaster.png
- (cd ${WRKSRC}/icons && ${INSTALL_DATA} ${i} ${DATADIR}/icons)
+ (cd ${WRKSRC}/icons && ${INSTALL_DATA} ${i} \
+ ${STAGEDIR}${DATADIR}/icons)
.endfor
-.for i in ar be at latin bg ca cs da de el es et fi fo fr he hr hu id it ja \
- lt lv nb nl nn pl pt pt_BR ro ru sk sl sq sr sr at Latn sr at latin sv \
- tr uk ur_PK zh_CN zh_TW
- @${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES
+.for i in ar be at latin bg bn_IN ca cs da de el es et fi fo fr gl he hr hu \
+ id it ja lt lv nb nl nn pl pt pt_BR ro ru sk sl sq sr sr at Latn \
+ sr at latin sv tr uk ur_PK zh_CN zh_TW
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
(cd ${WRKSRC}/po && ${INSTALL_DATA} ${i}.mo \
- ${PREFIX}/share/locale/${i}/LC_MESSAGES/isomaster.mo)
+ ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/isomaster.mo)
.endfor
- @${MKDIR} ${DESKTOPDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} isomaster.desktop ${DESKTOPDIR})
+ @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+ (cd ${WRKSRC} && ${INSTALL_DATA} isomaster.desktop \
+ ${STAGEDIR}${DESKTOPDIR})
.include <bsd.port.mk>
diff -urN /usr/ports/sysutils/isomaster/distinfo sysutils/isomaster/distinfo
--- /usr/ports/sysutils/isomaster/distinfo 2013-11-06 21:54:18.000000000 +0900
+++ sysutils/isomaster/distinfo 2014-04-22 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (isomaster-1.3.9.tar.bz2) = 2bf798a19af43113391144c4a3f2f3b33366f640c5695d356c151e83c49dc853
-SIZE (isomaster-1.3.9.tar.bz2) = 223514
+SHA256 (isomaster-1.3.11.tar.bz2) = ab8c334d6df1996fc1872affc01e82aa3917b9d3ae37300e41491b7b2666b857
+SIZE (isomaster-1.3.11.tar.bz2) = 232153
diff -urN /usr/ports/sysutils/isomaster/files/patch-bk__bk.h sysutils/isomaster/files/patch-bk__bk.h
--- /usr/ports/sysutils/isomaster/files/patch-bk__bk.h 2013-11-06 21:54:18.000000000 +0900
+++ sysutils/isomaster/files/patch-bk__bk.h 1970-01-01 09:00:00.000000000 +0900
@@ -1,20 +0,0 @@
---- bk/bk.h.orig
-+++ bk/bk.h
-@@ -30,7 +30,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <limits.h>
--#include <sys/timeb.h>
-+#include <sys/time.h>
- #include <stdio.h>
-
- #include "bkError.h"
-@@ -186,7 +186,7 @@
- int imageForWriting;
- void(*progressFunction)(struct VolInfo*);
- void(*writeProgressFunction)(struct VolInfo*, double);
-- struct timeb lastTimeCalledProgress;
-+ struct timeval lastTimeCalledProgress;
- bk_off_t estimatedIsoSize;
- BkHardLink* fileLocations; /* list of where to find regular files */
- char readWriteBuffer[READ_WRITE_BUFFER_SIZE];
diff -urN /usr/ports/sysutils/isomaster/files/patch-bk__bkCache.c sysutils/isomaster/files/patch-bk__bkCache.c
--- /usr/ports/sysutils/isomaster/files/patch-bk__bkCache.c 2013-11-06 21:54:18.000000000 +0900
+++ sysutils/isomaster/files/patch-bk__bkCache.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,27 +0,0 @@
---- bk/bkCache.c.orig
-+++ bk/bkCache.c
-@@ -21,7 +21,7 @@
-
- #include <string.h>
- #include <stdio.h>
--#include <sys/timeb.h>
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-
-@@ -57,11 +57,11 @@
-
- if(volInfo->writeProgressFunction != NULL)
- {
-- struct timeb timeNow;
-- ftime(&timeNow);
-+ struct timeval timeNow;
-+ gettimeofday(&timeNow, NULL);
-
-- if(timeNow.time - volInfo->lastTimeCalledProgress.time >= 1 ||
-- timeNow.millitm - volInfo->lastTimeCalledProgress.millitm >= 100)
-+ if(timeNow.tv_sec - volInfo->lastTimeCalledProgress.tv_sec >= 1 ||
-+ timeNow.tv_usec/1000 - volInfo->lastTimeCalledProgress.tv_usec/1000 >= 100)
- {
- BkStatStruct statStruct;
- double percentComplete;
diff -urN /usr/ports/sysutils/isomaster/files/patch-bk__bkMisc.c sysutils/isomaster/files/patch-bk__bkMisc.c
--- /usr/ports/sysutils/isomaster/files/patch-bk__bkMisc.c 2013-11-06 21:54:18.000000000 +0900
+++ sysutils/isomaster/files/patch-bk__bkMisc.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,30 +0,0 @@
---- bk/bkMisc.c.orig
-+++ bk/bkMisc.c
-@@ -12,22 +12,22 @@
- *
- ******************************************************************************/
-
--#include <time.h>
-+#include <sys/time.h>
-
- #include "bkInternal.h"
- #include "bkMisc.h"
-
- void maybeUpdateProgress(VolInfo* volInfo)
- {
-- struct timeb timeNow;
-+ struct timeval timeNow;
-
- if(volInfo->progressFunction == NULL)
- return;
-
-- ftime(&timeNow);
-+ gettimeofday(&timeNow, NULL);
-
-- if(timeNow.time - volInfo->lastTimeCalledProgress.time >= 1 ||
-- timeNow.millitm - volInfo->lastTimeCalledProgress.millitm >= 100)
-+ if(timeNow.tv_sec - volInfo->lastTimeCalledProgress.tv_sec >= 1 ||
-+ timeNow.tv_usec/1000 - volInfo->lastTimeCalledProgress.tv_usec/1000 >= 100)
- {
- volInfo->progressFunction(volInfo);
-
diff -urN /usr/ports/sysutils/isomaster/pkg-plist sysutils/isomaster/pkg-plist
--- /usr/ports/sysutils/isomaster/pkg-plist 2013-11-06 21:54:18.000000000 +0900
+++ sysutils/isomaster/pkg-plist 2014-04-22 00:00:00.000000000 +0900
@@ -1,5 +1,6 @@
bin/isomaster
-%%DESKTOPDIR%%/isomaster.desktop
+man/man1/isomaster.1.gz
+share/applications/isomaster.desktop
%%DATADIR%%/icons/add2-kearone.png
%%DATADIR%%/icons/delete-kearone.png
%%DATADIR%%/icons/extract2-kearone.png
@@ -9,6 +10,7 @@
share/locale/ar/LC_MESSAGES/isomaster.mo
share/locale/be at latin/LC_MESSAGES/isomaster.mo
share/locale/bg/LC_MESSAGES/isomaster.mo
+share/locale/bn_IN/LC_MESSAGES/isomaster.mo
share/locale/ca/LC_MESSAGES/isomaster.mo
share/locale/cs/LC_MESSAGES/isomaster.mo
share/locale/da/LC_MESSAGES/isomaster.mo
@@ -19,6 +21,7 @@
share/locale/fi/LC_MESSAGES/isomaster.mo
share/locale/fo/LC_MESSAGES/isomaster.mo
share/locale/fr/LC_MESSAGES/isomaster.mo
+share/locale/gl/LC_MESSAGES/isomaster.mo
share/locale/he/LC_MESSAGES/isomaster.mo
share/locale/hr/LC_MESSAGES/isomaster.mo
share/locale/hu/LC_MESSAGES/isomaster.mo
@@ -49,12 +52,7 @@
share/locale/zh_TW/LC_MESSAGES/isomaster.mo
@dirrmtry share/locale/ur_PK/LC_MESSAGES
@dirrmtry share/locale/ur_PK
- at dirrmtry share/locale/sr at latin/LC_MESSAGES
- at dirrmtry share/locale/sr at latin
@dirrmtry share/locale/fo/LC_MESSAGES
@dirrmtry share/locale/fo
- at dirrmtry share/locale/be at latin/LC_MESSAGES
- at dirrmtry share/locale/be at latin
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
- at dirrmtry %%DESKTOPDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list