- update gtkwave to 3.3.20
- remove unneeded patches and use FAKE_FLAGS instead
This commit is contained in:
jasper
parent
b6c1951ace
commit
38fd5299ea
@ -1,9 +1,8 @@
|
|||||||
# $OpenBSD: Makefile,v 1.6 2010/11/15 00:22:49 espie Exp $
|
# $OpenBSD: Makefile,v 1.7 2011/03/04 13:25:41 jasper Exp $
|
||||||
|
|
||||||
COMMENT= GTK+-based electronic waveform viewer
|
COMMENT= GTK+-based electronic waveform viewer
|
||||||
|
|
||||||
DISTNAME= gtkwave-3.3.9
|
DISTNAME= gtkwave-3.3.20
|
||||||
REVISION= 1
|
|
||||||
CATEGORIES= cad
|
CATEGORIES= cad
|
||||||
|
|
||||||
HOMEPAGE= http://gtkwave.sourceforge.net/
|
HOMEPAGE= http://gtkwave.sourceforge.net/
|
||||||
@ -16,12 +15,13 @@ PERMIT_DISTFILES_FTP= Yes
|
|||||||
|
|
||||||
MASTER_SITES= ${HOMEPAGE}
|
MASTER_SITES= ${HOMEPAGE}
|
||||||
|
|
||||||
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
|
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
|
||||||
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
|
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 bz2 c cairo
|
||||||
WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
|
WANTLIB += drm expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
|
||||||
WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||||
WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render
|
WANTLIB += gtk-x11-2.0 lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||||
WANTLIB += xcb-render-util z bz2 lzma gdk_pixbuf-2.0 gdk-x11-2.0 gtk-x11-2.0
|
WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-shm
|
||||||
|
WANTLIB += z
|
||||||
|
|
||||||
MODULES= devel/gettext
|
MODULES= devel/gettext
|
||||||
|
|
||||||
@ -37,6 +37,10 @@ CONFIGURE_ARGS+= --disable-tcl \
|
|||||||
|
|
||||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||||
LDFLAGS="-L${LOCALBASE}/lib"
|
LDFLAGS="-L${LOCALBASE}/lib"
|
||||||
USE_GROFF = Yes
|
|
||||||
|
FAKE_FLAGS+= pkgdatadir="${PREFIX}/share/doc/gtkwave/" \
|
||||||
|
examplesdir="${PREFIX}/share/examples/gtkwave/"
|
||||||
|
|
||||||
|
USE_GROFF = Yes
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
MD5 (gtkwave-3.3.9.tar.gz) = ojUTKP9dk+v6M75LlASlVw==
|
MD5 (gtkwave-3.3.20.tar.gz) = kfNc5WgXsaCzepBL5OXwIQ==
|
||||||
RMD160 (gtkwave-3.3.9.tar.gz) = VGk70/xxFToLkSmXaKoXIIXR4aw=
|
RMD160 (gtkwave-3.3.20.tar.gz) = HtaoJpphLZUeFiUrfs1GSK4gwLE=
|
||||||
SHA1 (gtkwave-3.3.9.tar.gz) = fzLi2NaT3pf6bUAmC5kBgyggcMo=
|
SHA1 (gtkwave-3.3.20.tar.gz) = jEu2Nd+Mb/tK8VPC2AbLOq9G1EQ=
|
||||||
SHA256 (gtkwave-3.3.9.tar.gz) = VzYnxGYBUGrKY8e7OIDreX97wLG9oSUns2RAhdEiZWU=
|
SHA256 (gtkwave-3.3.20.tar.gz) = dtCI9IsWsqaXcEqXImZiRXOOElgU1zb9/rLnXBSCXmQ=
|
||||||
SIZE (gtkwave-3.3.9.tar.gz) = 3145412
|
SIZE (gtkwave-3.3.20.tar.gz) = 3228226
|
||||||
|
|||||||
32
cad/gtkwave/patches/patch-configure
Normal file
32
cad/gtkwave/patches/patch-configure
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
$OpenBSD: patch-configure,v 1.1 2011/03/04 13:25:41 jasper Exp $
|
||||||
|
|
||||||
|
Using -lpthread is verboten!
|
||||||
|
|
||||||
|
--- configure.orig Fri Feb 25 11:38:02 2011
|
||||||
|
+++ configure Fri Feb 25 11:38:18 2011
|
||||||
|
@@ -4290,13 +4290,13 @@ _ACEOF
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
-echo "$as_me:$LINENO: checking for main in -lpthread" >&5
|
||||||
|
-echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
|
||||||
|
+echo "$as_me:$LINENO: checking for main in -pthread" >&5
|
||||||
|
+echo $ECHO_N "checking for main in -pthread... $ECHO_C" >&6
|
||||||
|
if test "${ac_cv_lib_pthread_main+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
-LIBS="-lpthread $LIBS"
|
||||||
|
+LIBS="-pthread $LIBS"
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
@@ -4353,7 +4353,7 @@ if test $ac_cv_lib_pthread_main = yes; then
|
||||||
|
#define HAVE_LIBPTHREAD 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
- LIBS="-lpthread $LIBS"
|
||||||
|
+ LIBS="-pthread $LIBS"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2010/07/08 11:20:50 jasper Exp $
|
|
||||||
--- doc/Makefile.in.orig Thu Jul 8 13:16:01 2010
|
|
||||||
+++ doc/Makefile.in Thu Jul 8 13:16:11 2010
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
srcdir = @srcdir@
|
|
||||||
top_srcdir = @top_srcdir@
|
|
||||||
VPATH = @srcdir@
|
|
||||||
-pkgdatadir = $(datadir)/@PACKAGE@
|
|
||||||
+pkgdatadir = $(datadir)/doc/@PACKAGE@
|
|
||||||
pkglibdir = $(libdir)/@PACKAGE@
|
|
||||||
pkgincludedir = $(includedir)/@PACKAGE@
|
|
||||||
top_builddir = ..
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-examples_Makefile_in,v 1.1.1.1 2010/07/08 11:20:50 jasper Exp $
|
|
||||||
--- examples/Makefile.in.orig Thu Jul 8 13:15:26 2010
|
|
||||||
+++ examples/Makefile.in Thu Jul 8 13:15:47 2010
|
|
||||||
@@ -174,7 +174,7 @@ sharedstatedir = @sharedstatedir@
|
|
||||||
sysconfdir = @sysconfdir@
|
|
||||||
target_alias = @target_alias@
|
|
||||||
dist_examples_DATA = des.sav des.tcl des.v des.vzt transaction.fst transaction.sav transaction.c
|
|
||||||
-examplesdir = $(pkgdatadir)/examples
|
|
||||||
+examplesdir = $(datadir)/examples/@PACKAGE@
|
|
||||||
all: all-am
|
|
||||||
|
|
||||||
.SUFFIXES:
|
|
||||||
Loading…
Reference in New Issue
Block a user