Mike Erdely wrote:
> On Fri, Sep 14, 2007 at 12:45:06AM +0200, Matthieu Herrb wrote:
>> Attached patch updates xcursorgen to the version 1.0.2 shipped with
>> X.Org 7.3.
> <snip>
>> ok?
>
> I had to make a few changes to make it work.
> xcursorgen wanted autoconf-2.61, needed to add to WANTLIB, added
> changed CONFIGURE_STYLE to autoconf automake.
Yup, sorry to have forgotten to re-check WANTLIB. I more or less
expected it to have been fixed for Xenocara already :)
About automake stuff, I struggled with that just to try to fix png
detection. The full story is that using XCURSORGEN_CFLAGS/_LIBS
variables doesn't work anymore to find libpng for some reason.
Regenerating the build infrastructure with automake 1.9/autoconf 2.59
seemed to fix it in my Xenocara tree.
But in a port it still wouldn't work, so I decided to patch configure.ac
to check for 'libpng' instead of 'libpng12' (which is the name under
which the pkgconfig file for libpng is installed on Linux).
So this morning, reading your comments, I realized that automake is not
needed anymore for the build here. Updated patch attached.
--
Matthieu Herrb
? patches
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 14 Sep 2007 06:35:10 -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,18 @@
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
+WANTLIB= Xrender Xcursor X11 Xfixes Xdmcp Xau c m z
SEPARATE_BUILD= concurrent
USE_X11= Yes
-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"
+AUTOCONF_VERSION= 2.61
+CONFIGURE_STYLE= autoconf no-autoheader
+CONFIGURE_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
+MAKE_FLAGS+= AUTOCONF_VERSION=${AUTOCONF_VERSION}
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 14 Sep 2007 06:35:10 -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 08:35:11 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)
+
