cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 1.3.9

Browse Source 
PR:		176528
Submitted by:	ports fury
This commit is contained in:
Martin Wilke 2013-03-02 05:46:45 +00:00
parent 3e7fcd5444
commit 01a5abbde4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=313192
8 changed files with 167 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
sysutils/isomaster/Makefile
View File

@ -1,61 +1,54 @@
# New ports collection makefile for: isomaster
# Date created: 2006-12-11
# Whom: Babak Farrokhi <farrokhi@FreeBSD.org>
#
# Created by: Babak Farrokhi <farrokhi@FreeBSD.org>
# $FreeBSD$
#
PORTNAME= isomaster
PORTVERSION= 1.3.7
PORTREVISION= 4
PORTVERSION= 1.3.9
CATEGORIES= sysutils
MASTER_SITES= http://littlesvr.ca/isomaster/releases/
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK2 (bootable) CD ISO Image editor
LICENSE= GPLv2
LIB_DEPENDS= iniparser:${PORTSDIR}/devel/iniparser
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
USE_BZIP2= yes
USE_GNOME= gtk20 pkgconfig intlhack gnomehier desktopfileutils
USE_GMAKE= yes
MAKE_ENV= DESKTOPPATH=${DESKTOPDIR}
MAKE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CFLAGS+= -std=c99 \
`pkg-config --cflags gtk+-2.0` \
-DICONPATH=\\\"${DATADIR}/icons\\\"
LDFLAGS+= -lcompat
.if !defined(WITHOUT_NLS)
USE_GNOME= desktopfileutils intlhack gnomehier gtk20
USE_GETTEXT= yes
CFLAGS+= -DLOCALEDIR=\\\"${PREFIX}/share/locale\\\" -DENABLE_NLS
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
.endif
PLIST_SUB+= DESKTOPDIR="${DESKTOPDIR:S,^${PREFIX}/,,}"
USE_GMAKE= yes
MAKE_ENV= DEFAULT_VIEWER="xdg-open" USE_SYSTEM_INIPARSER=1
MAKE_JOBS_SAFE= yes
MAN1= isomaster.1
CPPFLAGS+= -I${LOCALBASE}/include -Diniparser_setstr=iniparser_set
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= DESKTOPDIR="${DESKTOPDIR:S,^${PREFIX}/,,}"
MAN1= isomaster.1
post-patch:
${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
${REINPLACE_CMD} -e 's|CC *=|CC ?=|g'
@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
's|@$$(CC)|$$(CC)|'
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
(cd ${WRKSRC} && ${INSTALL_PROGRAM} isomaster ${PREFIX}/bin)
(cd ${WRKSRC} && ${INSTALL_MAN} isomaster.1 ${MANPREFIX}/man/man1)
@${MKDIR} ${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)
.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 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
.for i in ar be@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@Latn sr@latin sv \
tr uk ur_PK zh_CN zh_TW
@${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES
(cd ${WRKSRC}/po && ${INSTALL_DATA} ${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}
@${MKDIR} ${DESKTOPDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} isomaster.desktop ${DESKTOPDIR})
post-install:
@-update-desktop-database

4
sysutils/isomaster/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (isomaster-1.3.7.tar.bz2) = 258b1ce0a9da35dc172c7d44866056c6873bd2992984af1e84deb25f4a7b47f7
SIZE (isomaster-1.3.7.tar.bz2) = 211673
SHA256 (isomaster-1.3.9.tar.bz2) = 2bf798a19af43113391144c4a3f2f3b33366f640c5695d356c151e83c49dc853
SIZE (isomaster-1.3.9.tar.bz2) = 223514

11
sysutils/isomaster/files/patch-bk-bkCache.c
View File

@ -1,11 +0,0 @@
--- bk/bkCache.c.orig Thu Jan 24 22:54:28 2008
+++ bk/bkCache.c Thu Jan 24 22:54:47 2008
@@ -21,8 +21,6 @@
#include <string.h>
#include <stdio.h>
-#include <sys/timeb.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include "bkInternal.h"

20
sysutils/isomaster/files/patch-bk__bk.h Normal file
View File

@ -0,0 +1,20 @@
--- 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];

27
sysutils/isomaster/files/patch-bk__bkCache.c Normal file
View File

@ -0,0 +1,27 @@
--- 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;

30
sysutils/isomaster/files/patch-bk__bkMisc.c Normal file
View File

@ -0,0 +1,30 @@
--- 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);

12
sysutils/isomaster/pkg-descr
View File

@ -1,8 +1,8 @@
ISO Master is an open-source, graphical CD image editor
that runs on Linux; and bkisofs, the underlying library
used for reading, modifying and writing ISO images.
ISO Master is an open-source, graphical CD image editor; and bkisofs,
the underlying library used for reading, modifying and writing ISO
images.
Basically you can use this program to extract files from
an ISO, add files to an ISO and create bootable ISOs.
Basically you can use this program to extract files from an ISO, add
files to an ISO and create bootable ISOs.
WWW: http://littlesvr.ca/isomaster/
WWW: http://littlesvr.ca/isomaster/

94
sysutils/isomaster/pkg-plist
View File

@ -6,53 +6,57 @@ bin/isomaster
%%DATADIR%%/icons/folder-new-kearone.png
%%DATADIR%%/icons/go-back-kearone.png
%%DATADIR%%/icons/isomaster.png
%%NLS%%share/locale/ar/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/be@latin/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/bg/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/ca/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/cs/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/da/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/de/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/el/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/es/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/et/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/fi/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/fo/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/fr/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/he/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/hr/LC_MESSAGES/isomaster.mo
%%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
%%NLS%%share/locale/pl/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/pt/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/pt_BR/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/sl/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/sq/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/sr/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/sr@Latn/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/sv/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/tr/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/uk/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/isomaster.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/isomaster.mo
share/locale/ar/LC_MESSAGES/isomaster.mo
share/locale/be@latin/LC_MESSAGES/isomaster.mo
share/locale/bg/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
share/locale/de/LC_MESSAGES/isomaster.mo
share/locale/el/LC_MESSAGES/isomaster.mo
share/locale/es/LC_MESSAGES/isomaster.mo
share/locale/et/LC_MESSAGES/isomaster.mo
share/locale/fi/LC_MESSAGES/isomaster.mo
share/locale/fo/LC_MESSAGES/isomaster.mo
share/locale/fr/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
share/locale/id/LC_MESSAGES/isomaster.mo
share/locale/it/LC_MESSAGES/isomaster.mo
share/locale/ja/LC_MESSAGES/isomaster.mo
share/locale/lt/LC_MESSAGES/isomaster.mo
share/locale/lv/LC_MESSAGES/isomaster.mo
share/locale/nb/LC_MESSAGES/isomaster.mo
share/locale/nl/LC_MESSAGES/isomaster.mo
share/locale/nn/LC_MESSAGES/isomaster.mo
share/locale/pl/LC_MESSAGES/isomaster.mo
share/locale/pt/LC_MESSAGES/isomaster.mo
share/locale/pt_BR/LC_MESSAGES/isomaster.mo
share/locale/ro/LC_MESSAGES/isomaster.mo
share/locale/ru/LC_MESSAGES/isomaster.mo
share/locale/sk/LC_MESSAGES/isomaster.mo
share/locale/sl/LC_MESSAGES/isomaster.mo
share/locale/sq/LC_MESSAGES/isomaster.mo
share/locale/sr/LC_MESSAGES/isomaster.mo
share/locale/sr@Latn/LC_MESSAGES/isomaster.mo
share/locale/sr@latin/LC_MESSAGES/isomaster.mo
share/locale/sv/LC_MESSAGES/isomaster.mo
share/locale/tr/LC_MESSAGES/isomaster.mo
share/locale/uk/LC_MESSAGES/isomaster.mo
share/locale/ur_PK/LC_MESSAGES/isomaster.mo
share/locale/zh_CN/LC_MESSAGES/isomaster.mo
share/locale/zh_TW/LC_MESSAGES/isomaster.mo
@dirrmtry share/locale/ur_PK/LC_MESSAGES
@dirrmtry share/locale/ur_PK
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/fo/LC_MESSAGES
@dirrmtry share/locale/fo
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
@dirrmtry %%DESKTOPDIR%%
@dirrmtry %%NLS%%share/locale/be@latin/LC_MESSAGES
@dirrmtry %%NLS%%share/locale/be@latin
@dirrmtry %%NLS%%share/locale/fo/LC_MESSAGES
@dirrmtry %%NLS%%share/locale/fo
@dirrmtry %%NLS%%share/locale/sr@latin/LC_MESSAGES
@dirrmtry %%NLS%%share/locale/sr@latin
@dirrmtry share/applications
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true