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!
--
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/isomaster/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 15 Mar 2008 11:54:24 -0000 1.4
+++ Makefile 28 Mar 2008 11:10:16 -0000
@@ -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 <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/isomaster/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 15 Mar 2008 11:54:24 -0000 1.4
+++ distinfo 28 Mar 2008 11:10:16 -0000
@@ -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 -0000 1.4
+++ patches/patch-Makefile 28 Mar 2008 11:10:16 -0000
@@ -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_Makefile 30 Jun 2007 21:52:02 -0000 1.1.1.1
+++ patches/patch-icons_Makefile 28 Mar 2008 11:10:16 -0000
@@ -1,19 +1,16 @@
$OpenBSD: patch-icons_Makefile,v 1.1.1.1 2007/06/30 21:52:02 kili Exp $
--- icons/Makefile.orig Thu 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-kearone.png extract2-kearone.png delete-kearone.png
-
+@@ -5,10 +5,10 @@ ICONS = isomaster.png go-back-kearone.png folder-new-k
install:
-- $(INSTALL) -d $(DESTDIR)$(ICONPATH)
-+ $(INSTALL) -d $(ICONPATH)
+ $(INSTALL) -d $(DESTDIR)$(ICONPATH)
for NAME in $(ICONS); do \
- $(INSTALL) -v -m 644 $$NAME $(DESTDIR)$(ICONPATH); \
-+ $(INSTALL) -m 644 $$NAME $(ICONPATH); \
++ $(INSTALL) -m 644 $$NAME $(DESTDIR)$(ICONPATH); \
done
uninstall:
for NAME in $(ICONS); do \
- $(RM) -v $(DESTDIR)$(ICONPATH)/$$NAME; \
-+ $(RM) -v $(ICONPATH)/$$NAME; \
++ $(RM) $(DESTDIR)$(ICONPATH)/$$NAME; \
done
Index: patches/patch-po_Makefile
===================================================================
RCS file: /cvs/ports/x11/isomaster/patches/patch-po_Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-po_Makefile
--- patches/patch-po_Makefile 3 Sep 2007 15:07:35 -0000 1.2
+++ patches/patch-po_Makefile 28 Mar 2008 11:10:16 -0000
@@ -7,12 +7,12 @@
for NAME in $(MOFILES); do \
- $(INSTALL) -v -d $(DESTDIR)$(LOCALEDIR)/`basename $$NAME
.mo`/LC_MESSAGES; \
- $(INSTALL) -v -m 644 $$NAME $(DESTDIR)$(LOCALEDIR)/`basename $$NAME
.mo`/LC_MESSAGES/isomaster.mo; \
-+ $(INSTALL) -d $(LOCALEDIR)/`basename $$NAME .mo`/LC_MESSAGES; \
-+ $(INSTALL) -m 644 $$NAME $(LOCALEDIR)/`basename $$NAME
.mo`/LC_MESSAGES/isomaster.mo; \
++ $(INSTALL) -d $(DESTDIR)$(LOCALEDIR)/`basename $$NAME
.mo`/LC_MESSAGES; \
++ $(INSTALL) -m 644 $$NAME $(DESTDIR)$(LOCALEDIR)/`basename $$NAME
.mo`/LC_MESSAGES/isomaster.mo; \
done
uninstall:
for NAME in $(MOFILES); do \
- $(RM) -v $(DESTDIR)$(LOCALEDIR)/`basename $$NAME
.mo`/LC_MESSAGES/isomaster.mo; \
-+ $(RM) -v $(LOCALEDIR)/`basename $$NAME .mo`/LC_MESSAGES/isomaster.mo;
\
++ $(RM) $(DESTDIR)$(LOCALEDIR)/`basename $$NAME
.mo`/LC_MESSAGES/isomaster.mo; \
done
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/isomaster/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 15 Mar 2008 11:54:24 -0000 1.4
+++ pkg/PLIST 28 Mar 2008 11:10:16 -0000
@@ -10,12 +10,16 @@
share/isomaster/icons/folder-new-kearone.png
share/isomaster/icons/go-back-kearone.png
share/isomaster/icons/isomaster.png
+share/locale/[EMAIL PROTECTED]/
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
+share/locale/[EMAIL PROTECTED]/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/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/
share/locale/fo/LC_MESSAGES/
