Update: xzgv
Update of xzgv to new version 0.9
- uses gtk+2 now
- $HOMEPAGE and $MASTER_SITES have changed
- get rid of some fixes that should be sent to original author
please test and commit.
Regards,
Julian
Index: Makefile
===
RCS file: /cvs/ports/graphics/xzgv/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile17 Jul 2007 12:45:49 - 1.5
+++ Makefile24 Feb 2009 13:03:45 -
@@ -1,39 +1,35 @@
# $OpenBSD: Makefile,v 1.5 2007/07/17 12:45:49 ajacoutot Exp $
COMMENT= picture viewer for X, with thumbnail-based file selector
-DISTNAME= xzgv-0.8
-PKGNAME= ${DISTNAME}p1
+DISTNAME= xzgv-0.9
CATEGORIES=graphics
-HOMEPAGE= http://rus.members.beeb.net/xzgv.html
+HOMEPAGE= http://xzgv.sourceforge.net/
MAINTAINER=Julian Leyh jul...@vgai.de
-PATCHFILES=xzgv-0.8-integer-overflow-fix.diff:0
-PATCH_DIST_STRIP= -p1
-
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/
-MASTER_SITES0= http://rus.members.beeb.net/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xzgv/}
MODULES= devel/gettext
-LIB_DEPENDS= gdk_imlib.=19::graphics/imlib
+LIB_DEPENDS+=
gdk-x11-2.0.=0.11,gdk_pixbuf-2.0.=0.11,gtk-x11-2.0.=0.11::x11/gtk+2
+
+WANTLIB+= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB+= Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
+WANTLIB+= freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m
pango-1.0
+WANTLIB+= pangocairo-1.0 pangoft2-1.0 pixman-1 png z
-WANTLIB= X11 Xext Xi c gdk glib gmodule gtk jpeg m png tiff \
- ungif z
USE_X11= Yes
NO_REGRESS=Yes
pre-configure:
- @perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g;' \
- -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
- ${WRKSRC}/doc/xzgv.1 ${WRKSRC}/doc/xzgv.texi
+ @${SUBST_CMD} ${WRKSRC}/doc/xzgv.1 ${WRKSRC}/doc/xzgv.texi
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/graphics/xzgv/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo17 Jul 2007 12:45:49 - 1.4
+++ distinfo24 Feb 2009 13:03:45 -
@@ -1,10 +1,5 @@
-MD5 (xzgv-0.8-integer-overflow-fix.diff) = lJXoIweUXAhZmgvZ/8L09g==
-MD5 (xzgv-0.8.tar.gz) = 45InfxRHB2QC3y49nngssg==
-RMD160 (xzgv-0.8-integer-overflow-fix.diff) = vXXIfPbyDk+idXr+RyER4iU8tkA=
-RMD160 (xzgv-0.8.tar.gz) = 42RmpzwnYWYQ/QMrOpKJjZWlWhc=
-SHA1 (xzgv-0.8-integer-overflow-fix.diff) = sY39qv4pXixCdk9ZeEtrYgG0ieo=
-SHA1 (xzgv-0.8.tar.gz) = GqITNuJWKEnm9fmEy7/LdFSJ3zs=
-SHA256 (xzgv-0.8-integer-overflow-fix.diff) =
yKAeI0zAzjoLnxuZ03gb4OrsZcKE3DdSpoy5KaHa9x8=
-SHA256 (xzgv-0.8.tar.gz) = T2JHZl38Pk03b0Vzebnkx3wqhIZZ/ysN1Td8CqCeWIQ=
-SIZE (xzgv-0.8-integer-overflow-fix.diff) = 6374
-SIZE (xzgv-0.8.tar.gz) = 302801
+MD5 (xzgv-0.9.tar.gz) = fi361ZXJfCq7s5K2HqafGw==
+RMD160 (xzgv-0.9.tar.gz) = fDKE6sWgo2jbG+Lth/iC4m05+rc=
+SHA1 (xzgv-0.9.tar.gz) = XYEVyHvjg22e0126d3zR3EhUFxU=
+SHA256 (xzgv-0.9.tar.gz) = xXFplCkN+kla1SKQScUQMy1q/ToHJ7Nd45Q2trU9EJE=
+SIZE (xzgv-0.9.tar.gz) = 235367
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/graphics/xzgv/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 22 May 2005 11:32:11 - 1.1.1.1
+++ patches/patch-Makefile 24 Feb 2009 13:03:45 -
@@ -1,24 +1,17 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2005/05/22 11:32:11 alek Exp $
Makefile.orig Tue Sep 16 14:58:30 2003
-+++ Makefile Thu May 12 16:00:02 2005
-@@ -24,30 +24,24 @@ VERS=0.8
+$OpenBSD$
+--- Makefile.orig Sun Sep 9 20:12:48 2007
Makefile Wed Oct 22 09:17:28 2008
+@@ -23,7 +23,7 @@ VERS=0.9
--all: src man infowarn
+-all: src man
+all: src man info
--src: xzgv src/install-info
-+src: xzgv
+ src: xzgv
- # We try this the whole time, as the dependancies are a bit
- # complicated to duplicate here.
- xzgv:
- cd src $(MAKE) xzgv
+@@ -37,14 +37,11 @@ src/install-info: src/install-info.c
--src/install-info: src/install-info.c
-- cd src $(MAKE) install-info
--
man: doc/xzgv.1
-doc/xzgv.1: doc/xzgv.texi doc/makeman.awk
@@ -26,8 +19,6 @@
-
# Like in GNU stuff, info files aren't automatically remade,
# as I don't want to assume everyone has texinfo's `makeinfo' handy.
- # So the `infowarn' below is mainly to warn me if the info gets
- # out of date. :-)
-info: doc/xzgv.gz
+info: doc/xzgv.info
@@ -35,4 +26,4 @@
+doc/xzgv.info: doc/xzgv.texi
cd doc $(MAKE) info
- # Warn if the info is out of date. This *is* automatically done.
+ clean:
Index: patches/patch-config_mk
Re: Update: xzgv 0.9
Whoops.. forgot -N. new patch attached.
Correct homepage this time, too.
Antoine Jacoutot wrote:
File to patch:
No file found--skip this patch? [n] y
1 out of 1 hunks ignored--saving rejects to Oops.rej
*** patch-src_install-info_c did not apply cleanly
File to patch:
No file found--skip this patch? [n] y
1 out of 1 hunks ignored--saving rejects to Oops.rej
*** patch-src_logoconv_c did not apply cleanly
Index: Makefile
===
RCS file: /cvs/ports/graphics/xzgv/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile17 Jul 2007 12:45:49 - 1.5
+++ Makefile30 Oct 2008 06:01:12 -
@@ -1,39 +1,35 @@
# $OpenBSD: Makefile,v 1.5 2007/07/17 12:45:49 ajacoutot Exp $
COMMENT= picture viewer for X, with thumbnail-based file selector
-DISTNAME= xzgv-0.8
-PKGNAME= ${DISTNAME}p1
+DISTNAME= xzgv-0.9
CATEGORIES=graphics
-HOMEPAGE= http://rus.members.beeb.net/xzgv.html
+HOMEPAGE= http://xzgv.sourceforge.net/
MAINTAINER=Julian Leyh [EMAIL PROTECTED]
-PATCHFILES=xzgv-0.8-integer-overflow-fix.diff:0
-PATCH_DIST_STRIP= -p1
-
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/
-MASTER_SITES0= http://rus.members.beeb.net/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xzgv/}
MODULES= devel/gettext
-LIB_DEPENDS= gdk_imlib.=19::graphics/imlib
+LIB_DEPENDS+=
gdk-x11-2.0.=0.11,gdk_pixbuf-2.0.=0.11,gtk-x11-2.0.=0.11::x11/gtk+2
+
+WANTLIB+= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB+= Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
+WANTLIB+= freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0
+WANTLIB+= pangocairo-1.0 pangoft2-1.0 pixman-1 png z
-WANTLIB= X11 Xext Xi c gdk glib gmodule gtk jpeg m png tiff \
- ungif z
USE_X11= Yes
NO_REGRESS=Yes
pre-configure:
- @perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g;' \
- -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
- ${WRKSRC}/doc/xzgv.1 ${WRKSRC}/doc/xzgv.texi
+ @${SUBST_CMD} ${WRKSRC}/doc/xzgv.1 ${WRKSRC}/doc/xzgv.texi
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/graphics/xzgv/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo17 Jul 2007 12:45:49 - 1.4
+++ distinfo30 Oct 2008 06:01:12 -
@@ -1,10 +1,5 @@
-MD5 (xzgv-0.8-integer-overflow-fix.diff) = lJXoIweUXAhZmgvZ/8L09g==
-MD5 (xzgv-0.8.tar.gz) = 45InfxRHB2QC3y49nngssg==
-RMD160 (xzgv-0.8-integer-overflow-fix.diff) = vXXIfPbyDk+idXr+RyER4iU8tkA=
-RMD160 (xzgv-0.8.tar.gz) = 42RmpzwnYWYQ/QMrOpKJjZWlWhc=
-SHA1 (xzgv-0.8-integer-overflow-fix.diff) = sY39qv4pXixCdk9ZeEtrYgG0ieo=
-SHA1 (xzgv-0.8.tar.gz) = GqITNuJWKEnm9fmEy7/LdFSJ3zs=
-SHA256 (xzgv-0.8-integer-overflow-fix.diff) =
yKAeI0zAzjoLnxuZ03gb4OrsZcKE3DdSpoy5KaHa9x8=
-SHA256 (xzgv-0.8.tar.gz) = T2JHZl38Pk03b0Vzebnkx3wqhIZZ/ysN1Td8CqCeWIQ=
-SIZE (xzgv-0.8-integer-overflow-fix.diff) = 6374
-SIZE (xzgv-0.8.tar.gz) = 302801
+MD5 (xzgv-0.9.tar.gz) = fi361ZXJfCq7s5K2HqafGw==
+RMD160 (xzgv-0.9.tar.gz) = fDKE6sWgo2jbG+Lth/iC4m05+rc=
+SHA1 (xzgv-0.9.tar.gz) = XYEVyHvjg22e0126d3zR3EhUFxU=
+SHA256 (xzgv-0.9.tar.gz) = xXFplCkN+kla1SKQScUQMy1q/ToHJ7Nd45Q2trU9EJE=
+SIZE (xzgv-0.9.tar.gz) = 235367
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/graphics/xzgv/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 22 May 2005 11:32:11 - 1.1.1.1
+++ patches/patch-Makefile 30 Oct 2008 06:01:12 -
@@ -1,24 +1,17 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2005/05/22 11:32:11 alek Exp $
Makefile.orig Tue Sep 16 14:58:30 2003
-+++ Makefile Thu May 12 16:00:02 2005
-@@ -24,30 +24,24 @@ VERS=0.8
+$OpenBSD$
+--- Makefile.orig Sun Sep 9 20:12:48 2007
Makefile Wed Oct 22 09:17:28 2008
+@@ -23,7 +23,7 @@ VERS=0.9
--all: src man infowarn
+-all: src man
+all: src man info
--src: xzgv src/install-info
-+src: xzgv
+ src: xzgv
- # We try this the whole time, as the dependancies are a bit
- # complicated to duplicate here.
- xzgv:
- cd src $(MAKE) xzgv
+@@ -37,14 +37,11 @@ src/install-info: src/install-info.c
--src/install-info: src/install-info.c
-- cd src $(MAKE) install-info
--
man: doc/xzgv.1
-doc/xzgv.1: doc/xzgv.texi doc/makeman.awk
@@ -26,8 +19,6 @@
-
# Like in GNU stuff, info files aren't automatically remade,
# as I don't want to assume everyone has texinfo's `makeinfo' handy.
- # So the `infowarn' below is mainly to warn me if the info gets
- # out of date. :-)
-info: doc/xzgv.gz
+info: doc/xzgv.info
@@ -35,4 +26,4 @@
Update: xzgv 0.9
Here is an update for xzgv:
o update to version 0.9
o update HOMEPAGE
o update MASTER_SITES
o moved to gtk+ 2.x
o use SUBST_CMD
o fix some malloc/strcpy/strcat/sprintf (previous port resulted in
truncated filenames)
o @bin in plist
please test and comment. if nobody finds bad things, please commit.
tested on i386, copying/moving files works now without error.
small question regarding this:
should ports really patch all those string functions?
regards,
Julian
Index: Makefile
===
RCS file: /cvs/ports/graphics/xzgv/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile17 Jul 2007 12:45:49 - 1.5
+++ Makefile29 Oct 2008 13:49:51 -
@@ -1,39 +1,35 @@
# $OpenBSD: Makefile,v 1.5 2007/07/17 12:45:49 ajacoutot Exp $
COMMENT= picture viewer for X, with thumbnail-based file selector
-DISTNAME= xzgv-0.8
-PKGNAME= ${DISTNAME}p1
+DISTNAME= xzgv-0.9
CATEGORIES=graphics
-HOMEPAGE= http://rus.members.beeb.net/xzgv.html
+HOMEPAGE= http://sourceforge.net/xzgv
MAINTAINER=Julian Leyh [EMAIL PROTECTED]
-PATCHFILES=xzgv-0.8-integer-overflow-fix.diff:0
-PATCH_DIST_STRIP= -p1
-
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/
-MASTER_SITES0= http://rus.members.beeb.net/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xzgv/}
MODULES= devel/gettext
-LIB_DEPENDS= gdk_imlib.=19::graphics/imlib
+LIB_DEPENDS+=
gdk-x11-2.0.=0.11,gdk_pixbuf-2.0.=0.11,gtk-x11-2.0.=0.11::x11/gtk+2
+
+WANTLIB+= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB+= Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
+WANTLIB+= freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0
+WANTLIB+= pangocairo-1.0 pangoft2-1.0 pixman-1 png z
-WANTLIB= X11 Xext Xi c gdk glib gmodule gtk jpeg m png tiff \
- ungif z
USE_X11= Yes
NO_REGRESS=Yes
pre-configure:
- @perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g;' \
- -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
- ${WRKSRC}/doc/xzgv.1 ${WRKSRC}/doc/xzgv.texi
+ @${SUBST_CMD} ${WRKSRC}/doc/xzgv.1 ${WRKSRC}/doc/xzgv.texi
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/graphics/xzgv/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo17 Jul 2007 12:45:49 - 1.4
+++ distinfo29 Oct 2008 13:49:51 -
@@ -1,10 +1,5 @@
-MD5 (xzgv-0.8-integer-overflow-fix.diff) = lJXoIweUXAhZmgvZ/8L09g==
-MD5 (xzgv-0.8.tar.gz) = 45InfxRHB2QC3y49nngssg==
-RMD160 (xzgv-0.8-integer-overflow-fix.diff) = vXXIfPbyDk+idXr+RyER4iU8tkA=
-RMD160 (xzgv-0.8.tar.gz) = 42RmpzwnYWYQ/QMrOpKJjZWlWhc=
-SHA1 (xzgv-0.8-integer-overflow-fix.diff) = sY39qv4pXixCdk9ZeEtrYgG0ieo=
-SHA1 (xzgv-0.8.tar.gz) = GqITNuJWKEnm9fmEy7/LdFSJ3zs=
-SHA256 (xzgv-0.8-integer-overflow-fix.diff) =
yKAeI0zAzjoLnxuZ03gb4OrsZcKE3DdSpoy5KaHa9x8=
-SHA256 (xzgv-0.8.tar.gz) = T2JHZl38Pk03b0Vzebnkx3wqhIZZ/ysN1Td8CqCeWIQ=
-SIZE (xzgv-0.8-integer-overflow-fix.diff) = 6374
-SIZE (xzgv-0.8.tar.gz) = 302801
+MD5 (xzgv-0.9.tar.gz) = fi361ZXJfCq7s5K2HqafGw==
+RMD160 (xzgv-0.9.tar.gz) = fDKE6sWgo2jbG+Lth/iC4m05+rc=
+SHA1 (xzgv-0.9.tar.gz) = XYEVyHvjg22e0126d3zR3EhUFxU=
+SHA256 (xzgv-0.9.tar.gz) = xXFplCkN+kla1SKQScUQMy1q/ToHJ7Nd45Q2trU9EJE=
+SIZE (xzgv-0.9.tar.gz) = 235367
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/graphics/xzgv/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 22 May 2005 11:32:11 - 1.1.1.1
+++ patches/patch-Makefile 29 Oct 2008 13:49:51 -
@@ -1,24 +1,17 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2005/05/22 11:32:11 alek Exp $
Makefile.orig Tue Sep 16 14:58:30 2003
-+++ Makefile Thu May 12 16:00:02 2005
-@@ -24,30 +24,24 @@ VERS=0.8
+$OpenBSD$
+--- Makefile.orig Sun Sep 9 20:12:48 2007
Makefile Wed Oct 22 09:17:28 2008
+@@ -23,7 +23,7 @@ VERS=0.9
--all: src man infowarn
+-all: src man
+all: src man info
--src: xzgv src/install-info
-+src: xzgv
+ src: xzgv
- # We try this the whole time, as the dependancies are a bit
- # complicated to duplicate here.
- xzgv:
- cd src $(MAKE) xzgv
+@@ -37,14 +37,11 @@ src/install-info: src/install-info.c
--src/install-info: src/install-info.c
-- cd src $(MAKE) install-info
--
man: doc/xzgv.1
-doc/xzgv.1: doc/xzgv.texi doc/makeman.awk
@@ -26,8 +19,6 @@
-
# Like in GNU stuff, info files aren't automatically remade,
# as I don't want to assume everyone has texinfo's `makeinfo' handy.
- # So the `infowarn' below is mainly to warn me if the info gets
- # out of date. :-)
-info:
Re: Update: xzgv 0.9
On Wed, 29 Oct 2008, Julian Leyh wrote: Here is an update for xzgv: o update to version 0.9 o update HOMEPAGE o update MASTER_SITES o moved to gtk+ 2.x o use SUBST_CMD o fix some malloc/strcpy/strcat/sprintf (previous port resulted in truncated filenames) o @bin in plist please test and comment. if nobody finds bad things, please commit. File to patch: No file found--skip this patch? [n] y 1 out of 1 hunks ignored--saving rejects to Oops.rej *** patch-src_install-info_c did not apply cleanly File to patch: No file found--skip this patch? [n] y 1 out of 1 hunks ignored--saving rejects to Oops.rej *** patch-src_logoconv_c did not apply cleanly -- Antoine
