Re: UPDATE: x11/isomaster
Giovanni Bechis wrote:
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/Makefile
> + @perl -pi -e 's/@\$$\(/\$$\(/g' ${WRKSRC}/Makefile \
> + ${WRKSRC}/bk/Makefile ${WRKSRC}/iniparser-2.17/Makefile
Hmm. You still have chunks to the same effect in patch-Makefile.
> +-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 - volInfo->lastTimeCalledProgress.tv_usec >= 100)
Wait. You are changing "at least 100 milliseconds have passed" into
"at least 100 microseconds have passed".
> + gotGoodChar = false;
> + while(!gotGoodChar)
> + {
> ++#ifdef HAVE_ARC4RANDOM
> ++oneRandomChar = arc4random();
> ++#else
> + oneRandomChar = random();
> ++#endif
> + if(64 < oneRandomChar && oneRandomChar < 91)
> + {
> + gotGoodChar = true;
That whole loop could be rewritten as just
oneRandomChar = arc4random_uniform('Z'-'A'+1) + 'A';
or some such.
--
Christian "naddy" Weisgerber na...@mips.inka.de
Re: UPDATE: x11/isomaster
Giovanni Bechis wrote: Trivial update to latest version. Cheers Giovanni Works for me on amd64 (ISO burned with cdrecord). Thomas
Re: UPDATE: x11/isomaster
Le Mon, 25 Aug 2008 08:55:47 +0200, Giovanni Bechis <[EMAIL PROTECTED]> a écrit : > Trivial update to latest version. > Cheers >Giovanni Tested on @i386 with success (created an iso and burned it with cdrecord). Regards, -- Pierre-Emmanuel André GPG key: 0x7AE329DC
Re: UPDATE: x11/isomaster
Le Thu, 03 Jul 2008 09:03:18 +0200, Giovanni Bechis <[EMAIL PROTECTED]> a __crit : > Trivial update to isomaster 1.3.3, wantlib fixed while here. > Cheers >Giovanni Tested on @i386 with success. Regards, -- Pierre-Emmanuel Andr__ GPG key: 0x7AE329DC
Re: UPDATE: x11/isomaster
On Fri, 28 Mar 2008, Giovanni Bechis wrote:
> Little update to latest version (bug fix release).
I came up with this patch instead.
Is this OK to you?
Cheers!
--
AntoineIndex: Makefile
===
RCS file: /cvs/ports/x11/isomaster/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile15 Mar 2008 11:54:24 - 1.4
+++ Makefile28 Mar 2008 11:10:16 -
@@ -2,13 +2,13 @@
COMMENT= gui cd image editor
-DISTNAME= isomaster-1.3
+DISTNAME= isomaster-1.3.1
CATEGORIES=x11
HOMEPAGE= http://littlesvr.ca/isomaster/
MAINTAINER=Giovanni Bechis <[EMAIL PROTECTED]>
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
@@ -30,5 +30,8 @@
USE_X11= Yes
USE_GMAKE= Yes
NO_REGRESS=Yes
+
+FAKE_FLAGS=MYMANPATH=${WRKINST}/${TRUEPREFIX}/man/man1 \
+ DESTDIR=""
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/isomaster/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo15 Mar 2008 11:54:24 - 1.4
+++ distinfo28 Mar 2008 11:10:16 -
@@ -1,5 +1,5 @@
-MD5 (isomaster-1.3.tar.bz2) = CRaJMC3EFwVwbaAyPE/r8w==
-RMD160 (isomaster-1.3.tar.bz2) = UV0WUxmnFANc6zXmlzwe6n8eo4E=
-SHA1 (isomaster-1.3.tar.bz2) = 2aHpf0d0EzCmH/zf0S77O7+GECM=
-SHA256 (isomaster-1.3.tar.bz2) = W1v6p/R6ie/e9ao5hUQsKW/lFibiuc/whoXs5QYSKDE=
-SIZE (isomaster-1.3.tar.bz2) = 191258
+MD5 (isomaster-1.3.1.tar.bz2) = 6GECkZEFZiBjrClL7+GEcg==
+RMD160 (isomaster-1.3.1.tar.bz2) = 6giHk3+2Ag+JbrmbbxYymEw/Vl8=
+SHA1 (isomaster-1.3.1.tar.bz2) = RKF1+hcqMRrFt/lXYu22gfLuV44=
+SHA256 (isomaster-1.3.1.tar.bz2) = WSYowL0AbJq0TIyevKcfvTXv9KuB7Ksso0g2SkCGtcE=
+SIZE (isomaster-1.3.1.tar.bz2) = 194619
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/isomaster/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile
--- patches/patch-Makefile 15 Mar 2008 11:54:24 - 1.4
+++ patches/patch-Makefile 28 Mar 2008 11:10:16 -
@@ -1,22 +1,6 @@
$OpenBSD: patch-Makefile,v 1.4 2008/03/15 11:54:24 steven Exp $
--- Makefile.orig Wed Dec 12 22:48:16 2007
+++ Makefile Sat Mar 15 12:50:37 2008
-@@ -1,5 +1,5 @@
- # Other paths are relative to this.
--PREFIX ?= /usr/local
-+PREFIX ?= ${PREFIX}
-
- # Where to install the executable.
- BINPATH ?= $(PREFIX)/bin
-@@ -14,7 +14,7 @@ export ICONPATH ?= $(PREFIX)/share/isomaster/icons
- export LOCALEDIR ?= $(PREFIX)/share/locale
-
- # Where to install the man page.
--MYMANPATH ?= $(PREFIX)/share/man/man1
-+MYMANPATH ?= $(PREFIX)/man/man1
-
- # Where to install the .desktop file
- DESKTOPPATH ?= $(PREFIX)/share/applications
@@ -64,7 +64,7 @@ all: translations isomaster.desktop isomaster
isomaster: $(OBJECTS) lib iniparser
@@ -26,35 +10,3 @@
# static pattern rule
$(OBJECTS): %.o: %.c %.h bk/bk.h Makefile
-@@ -97,22 +97,22 @@ endif
- # for info about DESTDIR see
http://www.gnu.org/prep/standards/html_node/DESTDIR.html
-
- install: all
-- $(INSTALL) -d $(DESTDIR)$(BINPATH)
-- $(INSTALL) isomaster $(DESTDIR)$(BINPATH)
-+ $(INSTALL) -d $(BINPATH)
-+ $(INSTALL) isomaster $(BINPATH)
- cd icons && $(MAKE) install
- ifndef WITHOUT_NLS
- cd po && $(MAKE) install
- endif
-- $(INSTALL) -d $(DESTDIR)$(MYMANPATH)
-- $(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH)
-- $(INSTALL) -d $(DESTDIR)$(DESKTOPPATH)
-- $(INSTALL) -m 644 isomaster.desktop $(DESTDIR)$(DESKTOPPATH)
-+ $(INSTALL) -d $(MYMANPATH)
-+ $(INSTALL) -m 644 isomaster.1 $(MYMANPATH)
-+ $(INSTALL) -d $(DESKTOPPATH)
-+ $(INSTALL) -m 644 isomaster.desktop $(DESKTOPPATH)
-
- uninstall:
-- $(RM) $(DESTDIR)$(BINPATH)/isomaster
-+ $(RM) $(BINPATH)/isomaster
- cd icons && $(MAKE) uninstall
- ifndef WITHOUT_NLS
- cd po && $(MAKE) uninstall
- endif
-- $(RM) $(DESTDIR)$(MYMANPATH)/isomaster.1
-- $(RM) $(DESTDIR)$(DESKTOPPATH)/isomaster.desktop
-+ $(RM) $(MYMANPATH)/isomaster.1
-+ $(RM) $(DESKTOPPATH)/isomaster.desktop
Index: patches/patch-icons_Makefile
===
RCS file: /cvs/ports/x11/isomaster/patches/patch-icons_Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-icons_Makefile
--- patches/patch-icons_Makefile30 Jun 2007 21:52:02 - 1.1.1.1
+++ patches/patch-icons_Makefile28 Mar 2008 11:10:16 -
@@ -1,19 +1,16 @@
$OpenBSD: patch-icons_Makefile,v 1.1.1.1 2007/06/30 21:52:02 kili Exp $
--- icons/Makefile.origThu Jan 18 20:45:09 2007
+++ icons/Makefile Fri Jun 22 22:04:31 2007
-@@ -3,12 +3,12 @@
- ICONS = isomaster.png go-back-kearone.png folder-new-kearone.png
add2-k
Re: UPDATE: x11/isomaster
WANTLIB fix after gtk+2 update.
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/x11/isomaster/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile3 Sep 2007 15:07:35 - 1.2
+++ Makefile4 Nov 2007 08:57:40 -
@@ -2,7 +2,7 @@
COMMENT= gui cd image editor
-DISTNAME= isomaster-1.1
+DISTNAME= isomaster-1.2
PKGNAME= ${DISTNAME}
CATEGORIES=x11
HOMEPAGE= http://littlesvr.ca/isomaster/
@@ -24,7 +24,8 @@
WANTLIB= c iconv intl m X11 Xau Xcursor Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender expat fontconfig freetype \
atk-1.0 glib-2.0 gmodule-2.0 gobject-2.0 glitz png \
- pango-1.0 pangoft2-1.0 pangocairo-1.0 cairo z
+ pango-1.0 pangoft2-1.0 pangocairo-1.0 cairo z \
+ Xcomposite Xdamage
USE_X11= Yes
USE_GMAKE= Yes
Index: distinfo
===
RCS file: /cvs/ports/x11/isomaster/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo3 Sep 2007 15:07:35 - 1.2
+++ distinfo4 Nov 2007 08:57:40 -
@@ -1,5 +1,5 @@
-MD5 (isomaster-1.1.tar.bz2) = 8cVM8W/7zjCy+XzcIe0PmQ==
-RMD160 (isomaster-1.1.tar.bz2) = XgUOD59mNnD7qjMo/aqXTuSmF/s=
-SHA1 (isomaster-1.1.tar.bz2) = lDjELzZ1p+S+5oTF7qws4opQkeA=
-SHA256 (isomaster-1.1.tar.bz2) = 7+RdmSfFiYNh/W5JyAm02jYV+ZYJutB+3uCHFw+VtSs=
-SIZE (isomaster-1.1.tar.bz2) = 167869
+MD5 (isomaster-1.2.tar.bz2) = rPqSJv9DWIZbgzYsXcB9ew==
+RMD160 (isomaster-1.2.tar.bz2) = QRrJiRGmCA3/rvWoM1OUXa7w81A=
+SHA1 (isomaster-1.2.tar.bz2) = kvqMw55aFpDTgcbjpYwMhtQwCcs=
+SHA256 (isomaster-1.2.tar.bz2) = YJQyMeZKtOn38aBt0ZVXCWy5h7L15nBkIGMMkNyRGk0=
+SIZE (isomaster-1.2.tar.bz2) = 183654
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/isomaster/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile
--- patches/patch-Makefile 3 Sep 2007 15:07:35 - 1.2
+++ patches/patch-Makefile 4 Nov 2007 08:57:40 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.2 2007/09/03 15:07:35 kili Exp $
Makefile.orig Mon Aug 27 12:43:22 2007
-+++ Makefile Sun Sep 2 11:15:09 2007
+--- Makefile.orig Fri Oct 19 00:27:00 2007
Makefile Sun Oct 28 11:02:26 2007
@@ -1,5 +1,5 @@
# Other paths are relative to this.
-PREFIX ?= /usr/local
@@ -17,6 +17,15 @@
# Where to install the .desktop file
DESKTOPPATH ?= $(PREFIX)/share/applications
+@@ -62,7 +62,7 @@ all: translations isomaster.desktop isomaster
+
+ 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 bk/bk.h Makefile
@@ -95,22 +95,22 @@ endif
# for info about DESTDIR see
http://www.gnu.org/prep/standards/html_node/DESTDIR.html
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/isomaster/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 3 Sep 2007 15:07:35 - 1.2
+++ pkg/PLIST 4 Nov 2007 08:57:40 -
@@ -33,12 +33,18 @@
share/locale/fi/
share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/isomaster.mo
+share/locale/fo/
+share/locale/fo/LC_MESSAGES/
+share/locale/fo/LC_MESSAGES/isomaster.mo
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/isomaster.mo
share/locale/hr/
share/locale/hr/LC_MESSAGES/
share/locale/hr/LC_MESSAGES/isomaster.mo
+share/locale/hu/
+share/locale/hu/LC_MESSAGES/
+share/locale/hu/LC_MESSAGES/isomaster.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/isomaster.mo
@@ -66,6 +72,9 @@
share/locale/sk/
share/locale/sk/LC_MESSAGES/
share/locale/sk/LC_MESSAGES/isomaster.mo
+share/locale/sl/
+share/locale/sl/LC_MESSAGES/
+share/locale/sl/LC_MESSAGES/isomaster.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/isomaster.mo
Re: UPDATE: x11/isomaster
On Sun, Sep 02, 2007 at 09:24:47PM +0200, Matthias Kilian wrote:
[...]
> Anyway, I'll look at the update later and put it if there're no
> other problems.
>
Errors fixed, now it should be fine.
Cheers and thanks
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/x11/isomaster/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile30 Jun 2007 21:52:02 - 1.1.1.1
+++ Makefile3 Sep 2007 07:05:05 -
@@ -1,6 +1,8 @@
-COMMENT= "gui cd image editor"
+# $OpenBSD$
-DISTNAME= isomaster-1.0
+COMMENT= gui cd image editor
+
+DISTNAME= isomaster-1.1
PKGNAME= ${DISTNAME}
CATEGORIES=x11
HOMEPAGE= http://littlesvr.ca/isomaster/
Index: distinfo
===
RCS file: /cvs/ports/x11/isomaster/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo30 Jun 2007 21:52:02 - 1.1.1.1
+++ distinfo3 Sep 2007 07:05:05 -
@@ -1,5 +1,5 @@
-MD5 (isomaster-1.0.tar.bz2) = a7t4GhtzSZ08DG2WFSHNnQ==
-RMD160 (isomaster-1.0.tar.bz2) = ZpnvRSEpQyT4aC7bh3PnD1dZg5I=
-SHA1 (isomaster-1.0.tar.bz2) = rvpI0jXqu6YKclthmLriNH3Af4s=
-SHA256 (isomaster-1.0.tar.bz2) = cDPW/FxGdMYsPuqqXrT5gJ561oQYFIAjI/I9pdLiUeE=
-SIZE (isomaster-1.0.tar.bz2) = 149982
+MD5 (isomaster-1.1.tar.bz2) = 8cVM8W/7zjCy+XzcIe0PmQ==
+RMD160 (isomaster-1.1.tar.bz2) = XgUOD59mNnD7qjMo/aqXTuSmF/s=
+SHA1 (isomaster-1.1.tar.bz2) = lDjELzZ1p+S+5oTF7qws4opQkeA=
+SHA256 (isomaster-1.1.tar.bz2) = 7+RdmSfFiYNh/W5JyAm02jYV+ZYJutB+3uCHFw+VtSs=
+SIZE (isomaster-1.1.tar.bz2) = 167869
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/isomaster/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 30 Jun 2007 21:52:02 - 1.1.1.1
+++ patches/patch-Makefile 3 Sep 2007 07:05:05 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2007/06/30 21:52:02 kili Exp $
Makefile.orig Mon May 28 02:50:20 2007
-+++ Makefile Fri Jun 22 22:25:37 2007
+--- Makefile.orig Mon Aug 27 12:43:22 2007
Makefile Sun Sep 2 11:15:09 2007
@@ -1,5 +1,5 @@
# Other paths are relative to this.
-PREFIX ?= /usr/local
@@ -17,16 +17,7 @@
# Where to install the .desktop file
DESKTOPPATH ?= $(PREFIX)/share/applications
-@@ -50,7 +50,7 @@ OBJECTS = isomaster.o window.o browser.o fsbrowser.o i
- all: isomaster translations isomaster.desktop
-
- isomaster: $(OBJECTS) lib iniparser
-- $(CC) $(OBJECTS) bk/bk.a iniparser-2.15/libiniparser.a $(CFLAGS)
$(CPPFLAGS) `pkg-config --libs gtk+-2.0`-o isomaster
-+ $(CC) $(OBJECTS) bk/bk.a iniparser-2.15/libiniparser.a $(CFLAGS)
$(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
-
- # static pattern rule
- $(OBJECTS): %.o: %.c bk/bk.h Makefile
-@@ -82,22 +82,22 @@ endif
+@@ -95,22 +95,22 @@ endif
# for info about DESTDIR see
http://www.gnu.org/prep/standards/html_node/DESTDIR.html
install: all
Index: patches/patch-po_Makefile
===
RCS file: /cvs/ports/x11/isomaster/patches/patch-po_Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-po_Makefile
--- patches/patch-po_Makefile 30 Jun 2007 21:52:02 - 1.1.1.1
+++ patches/patch-po_Makefile 3 Sep 2007 07:05:05 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-po_Makefile,v 1.1.1.1 2007/06/30 21:52:02 kili Exp $
po/Makefile.orig Sat Jun 9 22:36:06 2007
-+++ po/MakefileFri Jun 22 22:04:09 2007
-@@ -15,11 +15,11 @@ clean:
+--- po/Makefile.orig Fri Jul 27 07:53:11 2007
po/MakefileSun Sep 2 11:03:50 2007
+@@ -16,11 +16,11 @@ clean:
install: all
for NAME in $(MOFILES); do \
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/isomaster/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 30 Jun 2007 21:52:02 - 1.1.1.1
+++ pkg/PLIST 3 Sep 2007 07:05:05 -
@@ -69,6 +69,9 @@
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/isomaster.mo
+share/locale/sr/
+share/locale/sr/LC_MESSAGES/
+share/locale/sr/LC_MESSAGES/isomaster.mo
share/locale/[EMAIL PROTECTED]/
share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
share/locale/[EMAIL PROTECTED]/LC_MESSAGES/isomaster.mo
@@ -78,6 +81,9 @@
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/isomaster.mo
+share/locale/tr/
+share/locale/tr/LC_MESSAGES/
+share/locale/tr/LC_MESSAGES/isomaster.mo
share/locale/uk/
share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/isomaster.mo
Re: UPDATE: x11/isomaster
On Sun, Sep 02, 2007 at 11:21:53AM +0200, Giovanni Bechis wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/isomaster/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 Makefile
> --- Makefile 30 Jun 2007 21:52:02 - 1.1.1.1
> +++ Makefile 2 Sep 2007 09:19:30 -
> @@ -1,6 +1,6 @@
> -COMMENT= "gui cd image editor"
> +COMMENT= gui cd image editor
Oops! This Makefile doesn't have the
# $OpenBSD$
line. My fault, since I didn't spot it during the import of
isomaster-1.0.
> @@ -15,7 +15,7 @@
>
> EXTRACT_SUFX=.tar.bz2
>
> -MASTER_SITES=${HOMEPAGE}/releases/
> +MASTER_SITES=${HOMEPAGE}/releases
This should read ${HOMEPAGE}releases/, right? Changing MASTER_SITES
and forgetting to remove the distfiles and to try to refetch is a
classical error (at least for me) ;-)
Anyway, I'll look at the update later and put it if there're no
other problems.
Ciao,
Kili
