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.
Builds fine on i386 with the attached diff.
Thoughts?
-ME
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xcursorgen/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 16 Dec 2006 12:22:36 -0000 1.14
+++ Makefile 14 Sep 2007 05:15: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,17 +19,22 @@ PERMIT_PACKAGE_FTP= Yes
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+= Xau Xdmcp Xfixes Xrender
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"
-
NO_REGRESS= Yes
+AUTOCONF_VERSION= 2.61
+AUTOMAKE_VERSION= 1.9
+CONFIGURE_STYLE= autoconf automake
+CONFIGURE_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
+MAKE_FLAGS+= AUTOCONF_VERSION=${AUTOCONF_VERSION}
+CONFIGURE_SCRIPT= autogen.sh
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/xcursorgen/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 5 Apr 2007 17:36:26 -0000 1.7
+++ distinfo 14 Sep 2007 05:15: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: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 14 Sep 2007 05:15:10 -0000
@@ -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)
+
