Date: Fri, 18 Apr 2008 21:47:25 GMT From: Max Brazhnikov <makc@issp.ac.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/122892: maintainer update: graphics/xaos Message-ID: <200804182147.m3ILlPDN089773@www.freebsd.org> Resent-Message-ID: <200804182150.m3ILo16S081712@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 122892
>Category: ports
>Synopsis: maintainer update: graphics/xaos
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 18 21:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Max Brazhnikov
>Release: FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
FreeBSD luna.dio.ru 7.0-STABLE FreeBSD 7.0-STABLE #0: Thu Apr 17 12:14:46 MSD 2008 makc@luna.dio.ru:/usr/obj/usr/src/sys/LUNA i386
>Description:
update to 3.3
add NLS knob
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN --exclude=CVS /usr/ports/graphics/xaos/Makefile /home/makc/porting/ports/graphics/xaos/Makefile
--- /usr/ports/graphics/xaos/Makefile 2008-04-16 15:17:38.000000000 +0400
+++ /home/makc/porting/ports/graphics/xaos/Makefile 2008-04-19 01:39:45.000000000 +0400
@@ -6,11 +6,9 @@
#
PORTNAME= xaos
-PORTVERSION= 3.2.3
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xaos
+PORTVERSION= 3.3
+CATEGORIES= graphics math
+MASTER_SITES= SF
DISTNAME= XaoS-${PORTVERSION}
MAINTAINER= makc@issp.ac.ru
@@ -18,25 +16,27 @@
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
-USE_XLIB= yes
-USE_GETTEXT= yes
+USE_XORG= x11 xau xdmcp xext
+USE_AUTOTOOLS= autoconf:261
GNU_CONFIGURE= yes
+USE_GMAKE= yes
-OPTIONS= PTHREAD "Enable experimental SMP support" off
+OPTIONS= PTHREAD "Enable SMP support (experimental)" off \
+ NLS "Native Language Support" on
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-aa-driver=no --with-dga-driver=no \
--with-ggi-driver=no --with-svga-driver=no \
- --with-included-gettext=yes \
- --with-x --with-png=yes \
- --with-mit-shm=yes
+ --with-sffe=no
MAN6= xaos.6
INFO= xaos
PLIST_SUB+= XAOSDIR="share/XaoS"
+DESKTOP_ENTRIES="XaoS" "Fractal zoomer" "" "xaos" "" false
+
.include <bsd.port.pre.mk>
.if defined(WITH_PTHREAD)
@@ -47,7 +47,12 @@
CONFIGURE_ARGS+= --with-pthread=no
.endif
-post-install:
- ${STRIP_CMD} ${PREFIX}/bin/xaos
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/xaos/distinfo /home/makc/porting/ports/graphics/xaos/distinfo
--- /usr/ports/graphics/xaos/distinfo 2007-07-05 10:22:18.000000000 +0400
+++ /home/makc/porting/ports/graphics/xaos/distinfo 2008-04-10 20:28:27.000000000 +0400
@@ -1,3 +1,3 @@
-MD5 (XaoS-3.2.3.tar.gz) = f1d9a9f3d2097906754b8824ba925e64
-SHA256 (XaoS-3.2.3.tar.gz) = b15420bcfafeca09eb29e5961cedbbe0572d0fc7912f6c545458a346188516c1
-SIZE (XaoS-3.2.3.tar.gz) = 1399068
+MD5 (XaoS-3.3.tar.gz) = c1156044a54638df32b1b163e051e3e0
+SHA256 (XaoS-3.3.tar.gz) = 02399eeb49f4e5fe43cd97195525ec5c603709a4a49998986402dc37ca76420f
+SIZE (XaoS-3.3.tar.gz) = 1638245
diff -ruN --exclude=CVS /usr/ports/graphics/xaos/files/patch-configure /home/makc/porting/ports/graphics/xaos/files/patch-configure
--- /usr/ports/graphics/xaos/files/patch-configure 2007-07-05 10:22:19.000000000 +0400
+++ /home/makc/porting/ports/graphics/xaos/files/patch-configure 1970-01-01 03:00:00.000000000 +0300
@@ -1,19 +0,0 @@
---- configure.orig Sun Nov 12 22:49:50 2006
-+++ configure Wed Jul 4 22:41:37 2007
-@@ -10653,7 +10653,7 @@
-
- use_cc_g_flag=no
- DRIVERDIRS=""
--LOCALEDIR="/usr/share/locale"
-+LOCALEDIR="${prefix}/share/locale"
- DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a"
- CFLAGS="$CCOPTS"
- # Find a good install program. We prefer a C program (faster),
-@@ -16237,6 +16237,7 @@
- eval datadir2=$datadir
- cat >>confdefs.h <<_ACEOF
- #define DATAPATH "${datadir2}/XaoS"
-+#define PREFIX "${prefix}"
- _ACEOF
-
-
diff -ruN --exclude=CVS /usr/ports/graphics/xaos/files/patch-configure.in /home/makc/porting/ports/graphics/xaos/files/patch-configure.in
--- /usr/ports/graphics/xaos/files/patch-configure.in 1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/graphics/xaos/files/patch-configure.in 2008-04-10 22:34:32.000000000 +0400
@@ -0,0 +1,27 @@
+--- ./configure.in.orig 2008-03-13 20:23:57.000000000 +0300
++++ ./configure.in 2008-04-10 22:34:25.000000000 +0400
+@@ -284,7 +284,7 @@
+
+ use_cc_g_flag=no
+ DRIVERDIRS=""
+-LOCALEDIR="/usr/share/locale"
++LOCALEDIR="${prefix}/share/locale"
+ DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a"
+ CFLAGS="$CCOPTS"
+ AC_PROG_INSTALL
+@@ -429,6 +429,7 @@
+ fi
+ fi
+ case $target_os in
++*freebsd*) CMPLX_O_TARGET=elf;;
+ *linux*) CMPLX_O_TARGET=elf;;
+ *cygwin*) CMPLX_O_TARGET=coff;;
+ *darwin*) CMPLX_O_TARGET=macho;;
+@@ -735,6 +736,7 @@
+ eval datadir3=$datadir2
+ # This is a madness! eval can evaluate only one level of variable...
+ AC_DEFINE_UNQUOTED(DATAPATH,"${datadir3}/XaoS")
++AC_DEFINE_UNQUOTED(PREFIX,"${prefix}")
+
+ AC_CHECK_SIZEOF(short)
+ AC_CHECK_SIZEOF(int)
diff -ruN --exclude=CVS /usr/ports/graphics/xaos/files/patch-src__Makefile.in /home/makc/porting/ports/graphics/xaos/files/patch-src__Makefile.in
--- /usr/ports/graphics/xaos/files/patch-src__Makefile.in 1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/graphics/xaos/files/patch-src__Makefile.in 2008-04-11 01:37:08.000000000 +0400
@@ -0,0 +1,10 @@
+--- ./src/Makefile.in.orig 2008-03-05 16:00:12.000000000 +0300
++++ ./src/Makefile.in 2008-04-11 01:36:56.000000000 +0400
+@@ -1,6 +1,6 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ @LTLIBINTL@
+ LFLAGS = @LDFLAGS@
+ AR = @AR@
+ RANLIB = @RANLIB@
diff -ruN --exclude=CVS /usr/ports/graphics/xaos/pkg-descr /home/makc/porting/ports/graphics/xaos/pkg-descr
--- /usr/ports/graphics/xaos/pkg-descr 1997-02-28 13:52:52.000000000 +0300
+++ /home/makc/porting/ports/graphics/xaos/pkg-descr 2008-04-10 20:29:52.000000000 +0400
@@ -10,3 +10,5 @@
- saving to GIF files
- palette rotation
- random dot stereograms
+
+WWW: http://xaos.sf.net
diff -ruN --exclude=CVS /usr/ports/graphics/xaos/pkg-plist /home/makc/porting/ports/graphics/xaos/pkg-plist
--- /usr/ports/graphics/xaos/pkg-plist 2007-07-05 10:22:18.000000000 +0400
+++ /home/makc/porting/ports/graphics/xaos/pkg-plist 2008-04-11 01:43:27.000000000 +0400
@@ -1,10 +1,4 @@
bin/xaos
-share/locale/cs/LC_MESSAGES/xaos.mo
-share/locale/de/LC_MESSAGES/xaos.mo
-share/locale/es/LC_MESSAGES/xaos.mo
-share/locale/fr/LC_MESSAGES/xaos.mo
-share/locale/hu/LC_MESSAGES/xaos.mo
-share/locale/ro/LC_MESSAGES/xaos.mo
%%XAOSDIR%%/catalogs/README
%%XAOSDIR%%/catalogs/cesky.cat
%%XAOSDIR%%/catalogs/deutsch.cat
@@ -31,6 +25,7 @@
%%XAOSDIR%%/examples/3d8.xpf
%%XAOSDIR%%/examples/3d9.xpf
%%XAOSDIR%%/examples/README
+%%XAOSDIR%%/examples/alien.xpf
%%XAOSDIR%%/examples/axe.xpf
%%XAOSDIR%%/examples/barnsl1.xpf
%%XAOSDIR%%/examples/barnsl2.xpf
@@ -45,7 +40,10 @@
%%XAOSDIR%%/examples/beatle2.xpf
%%XAOSDIR%%/examples/bolygo.xpf
%%XAOSDIR%%/examples/brown.xpf
+%%XAOSDIR%%/examples/burnship.xpf
+%%XAOSDIR%%/examples/butterfly.xpf
%%XAOSDIR%%/examples/checker.xpf
+%%XAOSDIR%%/examples/circle.xpf
%%XAOSDIR%%/examples/crone.xpf
%%XAOSDIR%%/examples/csiga2.xpf
%%XAOSDIR%%/examples/csiga3.xpf
@@ -58,6 +56,7 @@
%%XAOSDIR%%/examples/edge2.xpf
%%XAOSDIR%%/examples/edge3.xpf
%%XAOSDIR%%/examples/eifell.xpf
+%%XAOSDIR%%/examples/eyes.xpf
%%XAOSDIR%%/examples/fract0.xpf
%%XAOSDIR%%/examples/fract1.xpf
%%XAOSDIR%%/examples/galaxy.xpf
@@ -67,6 +66,8 @@
%%XAOSDIR%%/examples/head.xpf
%%XAOSDIR%%/examples/head2.xpf
%%XAOSDIR%%/examples/head3.xpf
+%%XAOSDIR%%/examples/heart.xpf
+%%XAOSDIR%%/examples/helloween.xpf
%%XAOSDIR%%/examples/hornflake1.xpf
%%XAOSDIR%%/examples/hornflake2.xpf
%%XAOSDIR%%/examples/impulzus.xpf
@@ -131,6 +132,7 @@
%%XAOSDIR%%/examples/palace.xpf
%%XAOSDIR%%/examples/pavaszem.xpf
%%XAOSDIR%%/examples/pavaszem2.xpf
+%%XAOSDIR%%/examples/pentafrac.xpf
%%XAOSDIR%%/examples/pepita.xpf
%%XAOSDIR%%/examples/perb1.xpf
%%XAOSDIR%%/examples/perb2.xpf
@@ -144,6 +146,7 @@
%%XAOSDIR%%/examples/redmand2.xpf
%%XAOSDIR%%/examples/rocks.xpf
%%XAOSDIR%%/examples/shell.xpf
+%%XAOSDIR%%/examples/skullfrm.xpf
%%XAOSDIR%%/examples/something.xpf
%%XAOSDIR%%/examples/spiral.xpf
%%XAOSDIR%%/examples/spiral2.xpf
@@ -163,6 +166,7 @@
%%XAOSDIR%%/examples/truecol6.xpf
%%XAOSDIR%%/examples/truecol7.xpf
%%XAOSDIR%%/examples/ufo.xpf
+%%XAOSDIR%%/examples/warriormask.xpf
%%XAOSDIR%%/examples/zsigapro.xpf
%%XAOSDIR%%/help/xaos.hlp
%%XAOSDIR%%/tutorial/3dtutor.xaf
@@ -219,9 +223,15 @@
%%XAOSDIR%%/tutorial/trice.xaf
%%XAOSDIR%%/tutorial/truecol.xaf
%%XAOSDIR%%/tutorial/truecol.xhf
-@dirrm %%XAOSDIR%%/catalogs
-@dirrm %%XAOSDIR%%/examples
+%%NLS%%share/locale/cs/LC_MESSAGES/xaos.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xaos.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xaos.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xaos.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xaos.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xaos.mo
@dirrm %%XAOSDIR%%/tutorial
-@dirrm %%XAOSDIR%%/doc
@dirrm %%XAOSDIR%%/help
+@dirrm %%XAOSDIR%%/examples
+@dirrm %%XAOSDIR%%/doc
+@dirrm %%XAOSDIR%%/catalogs
@dirrm %%XAOSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804182147.m3ILlPDN089773>