Date: Sun, 24 Aug 2014 21:10:50 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366015 - in head/graphics/giram: . files Message-ID: <201408242110.s7OLAobW034997@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Aug 24 21:10:50 2014 New Revision: 366015 URL: http://svnweb.freebsd.org/changeset/ports/366015 QAT: https://qat.redports.org/buildarchive/r366015/ Log: - Convert to USES=libtool - Simplify patches a bit Deleted: head/graphics/giram/files/patch-src+camera.c head/graphics/giram/files/patch-src+giram.c Modified: head/graphics/giram/Makefile head/graphics/giram/files/patch-configure head/graphics/giram/files/patch-src+view.c head/graphics/giram/pkg-plist Modified: head/graphics/giram/Makefile ============================================================================== --- head/graphics/giram/Makefile Sun Aug 24 21:07:47 2014 (r366014) +++ head/graphics/giram/Makefile Sun Aug 24 21:10:50 2014 (r366015) @@ -3,7 +3,7 @@ PORTNAME= giram PORTVERSION= 0.3.5 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= graphics MASTER_SITES= http://freebsd.nsu.ru/distfiles/ @@ -14,23 +14,24 @@ LIB_DEPENDS= lib3ds-1.so:${PORTSDIR}/gra BUILD_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= gettext perl5 pkgconfig gmake +USES= gettext gmake libtool perl5 pkgconfig USE_PERL5= build USE_GNOME= gtk20 -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes CONFIGURE_ENV= INTLTOOL_PERL="${PERL}" -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --datadir="${PREFIX}/lib" \ + --disable-static \ --with-tutorial-path="${DOCSDIR}" \ --with-lib3ds-prefix="${LOCALBASE}" CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lm OPTIONS_DEFINE= DOCS EXAMPLES post-patch: - @${REINPLACE_CMD} -e '36s,static ,,' ${WRKSRC}/src/tools/tool_disc.c - @${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \ - ${WRKSRC}/configure + @${REINPLACE_CMD} '/^giram_LDADD =/s/$$/ -lgmodule-2.0/' \ + ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} '/DiscWithHoleFlag/d' ${WRKSRC}/src/tools/tool_disc.h post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} Modified: head/graphics/giram/files/patch-configure ============================================================================== --- head/graphics/giram/files/patch-configure Sun Aug 24 21:07:47 2014 (r366014) +++ head/graphics/giram/files/patch-configure Sun Aug 24 21:10:50 2014 (r366015) @@ -1,19 +1,10 @@ --- configure.orig Sat Mar 8 21:30:47 2003 +++ configure Sun May 25 21:41:54 2003 -@@ -5432,6 +5432,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -5843,7 +5844,7 @@ +@@ -5843,7 +5843,6 @@ fi -CFLAGS="-g -Wall -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $CFLAGS" -+CFLAGS="-DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $CFLAGS" if test -n "$DEBUGFLAG"; then CFLAGS="$DEBUGFLAG $CFLAGS" Modified: head/graphics/giram/files/patch-src+view.c ============================================================================== --- head/graphics/giram/files/patch-src+view.c Sun Aug 24 21:07:47 2014 (r366014) +++ head/graphics/giram/files/patch-src+view.c Sun Aug 24 21:10:50 2014 (r366015) @@ -1,14 +1,10 @@ --- src/view.c.orig Sat Aug 10 02:25:18 2002 +++ src/view.c Tue Oct 26 17:04:03 2004 -@@ -22,8 +22,13 @@ +@@ -22,8 +22,9 @@ #include <unistd.h> #include <math.h> #include <string.h> -#include "giram.h" -+ -+#undef GTK_DISABLE_DEPRECATED -+#warning GTK_DISABLE_DEPRECATED -+ #include <gdk/gdkkeysyms.h> +#include <gtk/gtkitemfactory.h> +#include "giram.h" Modified: head/graphics/giram/pkg-plist ============================================================================== --- head/graphics/giram/pkg-plist Sun Aug 24 21:07:47 2014 (r366014) +++ head/graphics/giram/pkg-plist Sun Aug 24 21:10:50 2014 (r366015) @@ -9,23 +9,11 @@ lib/giram/0.3/color/color1.gcf lib/giram/0.3/finish/finish1 lib/giram/0.3/giram_logo.ppm lib/giram/0.3/giram_splash.ppm -lib/giram/0.3/modules/librender_flat.a -lib/giram/0.3/modules/librender_flat.la lib/giram/0.3/modules/librender_flat.so -lib/giram/0.3/modules/librender_gouraud.a -lib/giram/0.3/modules/librender_gouraud.la lib/giram/0.3/modules/librender_gouraud.so -lib/giram/0.3/modules/librender_hiddenfaces.a -lib/giram/0.3/modules/librender_hiddenfaces.la lib/giram/0.3/modules/librender_hiddenfaces.so -lib/giram/0.3/modules/librender_povray.a -lib/giram/0.3/modules/librender_povray.la lib/giram/0.3/modules/librender_povray.so -lib/giram/0.3/modules/librender_raytracing.a -lib/giram/0.3/modules/librender_raytracing.la lib/giram/0.3/modules/librender_raytracing.so -lib/giram/0.3/modules/librender_wireframe.a -lib/giram/0.3/modules/librender_wireframe.la lib/giram/0.3/modules/librender_wireframe.so lib/giram/0.3/normal/normal1 lib/giram/0.3/pigment/pigment1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408242110.s7OLAobW034997>