Date: Thu, 1 Jun 2006 15:11:26 +0400 (MSD) From: Igor Pokrovsky <ip@doom.homeunix.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/98275: Update port: graphics/pixie 1.5.5 -> 1.6.3 Message-ID: <200606011111.k51BBQTI059733@doom.homeunix.org> Resent-Message-ID: <200606011120.k51BKDHO034399@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98275
>Category: ports
>Synopsis: Update port: graphics/pixie 1.5.5 -> 1.6.3
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 01 11:20:12 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Igor Pokrovsky
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed May 24 18:19:40 MSD 2006 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL-amd64 i386
>Description:
Update to 1.6.3.
>How-To-Repeat:
>Fix:
--- pixie.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/pixie/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 7 May 2006 23:46:21 -0000 1.23
+++ Makefile 1 Jun 2006 10:54:26 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= pixie
-PORTVERSION= 1.5.5
+PORTVERSION= 1.6.3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +21,8 @@
USE_GL= yes
USE_X_PREFIX= yes
-USE_AUTOTOOLS= automake:15:env autoconf:253 libtool:15
+ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
+USE_AUTOTOOLS= autoconf:259 aclocal:19 automake:19 libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS="${CFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
CXXFLAGS="${CXXFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -51,11 +52,7 @@
@${FIND} -X ${WRKSRC} -name '*.cpp' -or -name '*.h' | \
${XARGS} ${REINPLACE_CMD} -i '' -e 's|malloc\.h|stdlib\.h|g'
-
pre-configure:
- @(cd ${WRKSRC} && ${ACLOCAL} && \
- ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} --add-missing && \
- ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} -i)
@${REINPLACE_CMD} -e '/^_LT_AC_SHELL_INIT/d' ${WRKSRC}/aclocal.m4
do-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/pixie/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo 22 Jan 2006 12:35:06 -0000 1.11
+++ distinfo 1 Jun 2006 10:26:50 -0000
@@ -1,3 +1,3 @@
-MD5 (Pixie-src-1.5.5.tgz) = fbd01a2974ccdfe7887111da4ae76aa8
-SHA256 (Pixie-src-1.5.5.tgz) = c199ab9b470232b45d64bb22f7c6091751985cae5192d487f0cc8a86e3318ed3
-SIZE (Pixie-src-1.5.5.tgz) = 6110365
+MD5 (Pixie-src-1.6.3.tgz) = fa36424619d5dda8515f009e01df2207
+SHA256 (Pixie-src-1.6.3.tgz) = 19cd9aee4b360cde8bb12862b6e312498fd3a257d58d6d133150324a433180b6
+SIZE (Pixie-src-1.6.3.tgz) = 6125284
Index: files/patch-configure.in
===================================================================
RCS file: /home/ncvs/ports/graphics/pixie/files/patch-configure.in,v
retrieving revision 1.5
diff -u -r1.5 patch-configure.in
--- files/patch-configure.in 23 Feb 2006 10:37:19 -0000 1.5
+++ files/patch-configure.in 1 Jun 2006 10:31:39 -0000
@@ -1,6 +1,8 @@
---- configure.in.orig Tue Nov 22 06:30:25 2005
-+++ configure.in Wed Jan 25 00:38:57 2006
-@@ -23,5 +23,5 @@
+--- configure.in.orig
++++ configure.in
+@@ -23,9 +23,9 @@
+ dnl ---------------------------------------------------
+ dnl Check standard libraries
dnl
-AC_CHECK_LIB(dl, dlopen,,[AC_MSG_ERROR([dl library is not found])],)
+dnl AC_CHECK_LIB(dl, dlopen,,[AC_MSG_ERROR([dl library is not found])],)
@@ -8,7 +10,11 @@
-AC_CHECK_LIB(pthread, pthread_create,,[AC_MSG_ERROR([pthread library is not found])],)
+dnl AC_CHECK_LIB(pthread, pthread_create,,[AC_MSG_ERROR([pthread library is not found])],)
-@@ -52,5 +52,9 @@
+ dnl ---------------------------------------------------
+ dnl Find X
+@@ -52,18 +52,24 @@
+ dnl Find FLTK
+ dnl
+saved_LIBS="${LIBS}"
+
@@ -19,13 +25,26 @@
-AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL" have_fltk=true])
+AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL -lstdc++" have_fltk=true])
AM_CONDITIONAL(BUILD_SHOW, test x$have_fltk = xtrue)
-@@ -63,3 +67,3 @@
+
++LIBS="${saved_LIBS}"
++
+ dnl ---------------------------------------------------
+ dnl Find libtiff
+ dnl
+
+ saved_LIBS="$LIBS"
-AC_CHECK_HEADER(tiffio.h,,AC_MSG_ERROR([tiffio.h not found]))
+dnl AC_CHECK_HEADER(tiffio.h,,AC_MSG_ERROR([tiffio.h not found]))
AC_CHECK_LIB(tiff,TIFFOpen,,[AC_MSG_ERROR([libtiff not found])],)
-@@ -100,3 +104,3 @@
+
+ TIFF_LIBS="$LIBS"
+@@ -141,7 +147,7 @@
+ dnl
+
AC_ARG_ENABLE(selfcontained,
--AS_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup]),
-+AC_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup]),
+-AS_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup (overrides custom directory settings)]),
++AC_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup (overrides custom directory settings)]),
[case "${enableval}" in
+ yes) docdir="${prefix}/doc"
+ shaderdir="${prefix}/shaders"
--- pixie.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606011111.k51BBQTI059733>