From 55d9481f96b2bb51ab4d7c4ef9fa021078bec78e Mon Sep 17 00:00:00 2001 From: Patrick Li Date: Sat, 22 Jun 2002 05:18:54 +0000 Subject: Update to 1.5.2 PR: 39643 Submitted by: KATO Tsuguru --- graphics/gliv/Makefile | 14 +++++++++----- graphics/gliv/distinfo | 2 +- graphics/gliv/files/patch-aa | 11 ----------- 3 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 graphics/gliv/files/patch-aa (limited to 'graphics/gliv') diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile index 11dfc470247a..62fb3e1a179a 100644 --- a/graphics/gliv/Makefile +++ b/graphics/gliv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gliv -PORTVERSION= 1.4.5 +PORTVERSION= 1.5.2 CATEGORIES= graphics MASTER_SITES= http://gliv.tuxfamily.org/ @@ -19,11 +19,11 @@ LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ RUN_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick USE_BZIP2= yes -USE_GTK= yes +USE_REINPLACE= yes USE_X_PREFIX= yes +USE_GTK= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXext -lX11" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ GDK_PIXBUF_CONFIG=${X11BASE}/bin/gdk-pixbuf-config \ MAGICK_CONFIG=${LOCALBASE}/bin/Magick-config CONFIGURE_ARGS= --disable-gtk2 @@ -31,7 +31,11 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= gliv.1 +CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lXext -lX11 -lgnugetopt + post-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure .include diff --git a/graphics/gliv/distinfo b/graphics/gliv/distinfo index 19c7be3b197f..a7fb31cc2a40 100644 --- a/graphics/gliv/distinfo +++ b/graphics/gliv/distinfo @@ -1 +1 @@ -MD5 (gliv-1.4.5.tar.bz2) = 4049bc289a675f849a2c64b1258f83ae +MD5 (gliv-1.5.2.tar.bz2) = 6ab41228f5f7ce1a3a0a7299d627341e diff --git a/graphics/gliv/files/patch-aa b/graphics/gliv/files/patch-aa deleted file mode 100644 index 66a398b255b0..000000000000 --- a/graphics/gliv/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Sat May 11 02:13:30 2002 -+++ src/Makefile.in Sat May 11 02:13:38 2002 -@@ -150,7 +150,7 @@ - @HAVE_MAGICK_FALSE@imagemagick_dist = $(imagemagick_files) - - @NEED_REPLACEMENTS_TRUE@gliv_DEPENDENCIES = ../lib/libreplacements.a --@NEED_REPLACEMENTS_TRUE@gliv_LDADD = -L../lib -lreplacements -+@NEED_REPLACEMENTS_TRUE@gliv_LDADD = -L../lib -lreplacements -lgnugetopt - localedir = $(datadir)/locale - DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ - subdir = src -- cgit v1.2.3