Attached patch updates xcursorgen to the version 1.0.2 shipped with
X.Org 7.3.
Changelog:
Set version string in man page
Use strdup instead of malloc/strlen/strcpy
Correct help flag in usage message (-?, not -h)
Add options/flags to man page & other man page cleanups
Remove unused AC_TYPE_SIGNAL from configure.ac
Use PACKAGE_VERSION for --version output
Replace static ChangeLog with dist-hook to generate from git log
Change xcursorgen_CFLAGS to AM_CFLAGS to make automake-1.10 happier
Coverity #624: RESOURCE_LEAK: Returned without freeing storage "fp"
renamed: .cvsignore -> .gitignore
Coverity #621: RESOURCE_LEAK: Returned without freeing storage "curr"
free(curr) in error path when second malloc fails.
ok?
--
Matthieu Herrb
Index: Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/xcursorgen/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 16 Dec 2006 12:22:36 -0000 1.14
+++ Makefile 13 Sep 2007 22:34:18 -0000
@@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2006/12/16 12:22:36 espie Exp $
-COMMENT= "X11 Cursors themes generator"
-DISTNAME= xcursorgen-X11R7.1-1.0.1
-PKGNAME= xcursorgen-7.1
+COMMENT= X11 Cursors themes generator
+DIST_VERS= 1.0.2
+XORG_VERS= 7.3
+DISTNAME= xcursorgen-${DIST_VERS}
+PKGNAME= xcursorgen-${XORG_VERS}
CATEGORIES= x11
HOMEPAGE= http://wiki.X.Org/
@@ -17,16 +19,20 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ftp://ftp.x.org/pub/X11R7.1/src/app/ \
- ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R7.1/src/app/
+MASTER_SITES= ftp://ftp.x.org/pub/X11R${XORG_VERS}/src/app/ \
+
ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R${XORG_VERS}/src/app/
WANTLIB= X11 Xcursor c m z
SEPARATE_BUILD= concurrent
USE_X11= Yes
+AUTOCONF_VERSION= 2.59
+AUTOMAKE_VERSION= 1.9
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= XCURSORGEN_CFLAGS="-I${X11BASE}/include
-I${LOCALBASE}/include/libpng" \
- XCURSORGEN_LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib
-lX11 -lXcursor -lpng -lz -lm"
+CONFIGURE_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
+CONFIGURE_SCRIPT= autogen.sh
NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/x11/xcursorgen/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 5 Apr 2007 17:36:26 -0000 1.7
+++ distinfo 13 Sep 2007 22:34:18 -0000
@@ -1,5 +1,5 @@
-MD5 (xcursorgen-X11R7.1-1.0.1.tar.gz) = 91kK26d21Fh+CtaWWa+/EQ==
-RMD160 (xcursorgen-X11R7.1-1.0.1.tar.gz) = Lkelwa/YMbLblKo2JQueKVd8fn8=
-SHA1 (xcursorgen-X11R7.1-1.0.1.tar.gz) = novmX+M7gt8AEDWje02ABczCJG4=
-SHA256 (xcursorgen-X11R7.1-1.0.1.tar.gz) =
wJ6YkvwKcGQQ4nEKQ/rjU8xU3rbYYluNUZfTwzhA0Go=
-SIZE (xcursorgen-X11R7.1-1.0.1.tar.gz) = 99351
+MD5 (xcursorgen-1.0.2.tar.gz) = Xy+AOnj3Ub1SMtKO4TveKA==
+RMD160 (xcursorgen-1.0.2.tar.gz) = 8BREtdCpGck8m2URBNDyqd9lMM4=
+SHA1 (xcursorgen-1.0.2.tar.gz) = QEQZYg7e3U9CSikL7agrQpqfDOs=
+SHA256 (xcursorgen-1.0.2.tar.gz) = UTD++QuHiJyohanawIkPr/r4lzym+K6snLpoGHT5hWA=
+SIZE (xcursorgen-1.0.2.tar.gz) = 106798
Index: files/host.def
===================================================================
RCS file: files/host.def
diff -N files/host.def
--- files/host.def 24 Apr 2003 21:42:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-/* $OpenBSD: host.def,v 1.1 2003/04/24 21:42:38 matthieu Exp $ */
-
-#define HasLibpng YES
-#define LibpngDir @LOCALBASE@
-#define LibpngDirStandard NO
-#define LibpngIncDir @LOCALBASE@/include/libpng
-#define LibpngIncDirStandard NO
-#define LibpngLibDir @LOCALBASE@/lib
-#define LibpngLibDirStandard NO
-
-#define DontPreprocessManPages NO
-
-
--- /dev/null Fri Sep 14 00:34:20 2007
+++ patches/patch-configure_ac Fri Sep 14 00:19:14 2007
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Fri Sep 14 00:17:46 2007
++++ configure.ac Fri Sep 14 00:17:46 2007
+@@ -11,7 +11,7 @@
+ AC_PROG_INSTALL
+
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng12)
++PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng)
+ AC_SUBST(XCURSOR_CFLAGS)
+ AC_SUBST(XCURSOR_LIBS)
+
