cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix 64-bit issue

Browse Source 
- add license marker
- regen WANTLIB and patch-configure while here
This commit is contained in:
jasper 2009-03-08 18:15:45 +00:00
parent 2967043b53
commit b4d6d9a97b
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/mtr/Makefile
View File

@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.36 2008/10/01 20:52:56 sthen Exp $ # $OpenBSD: Makefile,v 1.37 2009/03/08 18:15:45 jasper Exp $
COMMENT= Matt's traceroute - network diagnostic tool COMMENT= Matt's traceroute - network diagnostic tool
DISTNAME= mtr-0.74 DISTNAME= mtr-0.74
PKGNAME= ${DISTNAME}p0 PKGNAME= ${DISTNAME}p1
CATEGORIES= net CATEGORIES= net
MAINTAINER= Jakob Schlyter <jakob@openbsd.org> MAINTAINER= Jakob Schlyter <jakob@openbsd.org>
HOMEPAGE= http://www.bitwizard.nl/mtr/ HOMEPAGE= http://www.bitwizard.nl/mtr/
# GPLv2+
PERMIT_PACKAGE_CDROM= yes PERMIT_PACKAGE_CDROM= yes
PERMIT_PACKAGE_FTP= yes PERMIT_PACKAGE_FTP= yes
PERMIT_DISTFILES_CDROM= yes PERMIT_DISTFILES_CDROM= yes
@ -30,11 +31,11 @@ USE_X11= Yes
CONFIGURE_ARGS+= --with-gtk-prefix=${LOCALBASE} CONFIGURE_ARGS+= --with-gtk-prefix=${LOCALBASE}
LIB_DEPENDS+= gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 \ LIB_DEPENDS+= gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 \
gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2
WANTLIB += X11 Xext Xi glib-2.0 gmodule-2.0 iconv intl WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes Xinerama WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
WANTLIB += Xrandr Xrender atk-1.0 cairo expat fontconfig freetype WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
WANTLIB += glitz gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += iconv intl pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
WANTLIB += pixman-1 png z WANTLIB += png z
.endif .endif
.include <bsd.port.mk> .include <bsd.port.mk>

10
net/mtr/patches/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig Tue Aug 19 14:11:50 2008 --- configure.orig Tue Aug 19 20:11:50 2008
+++ configure Thu Aug 21 11:10:03 2008 +++ configure Sun Mar 8 19:13:13 2009
@@ -7833,6 +7833,7 @@ @@ -7833,6 +7833,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
@ -8,7 +8,7 @@
#include <netinet/in.h> #include <netinet/in.h>
@@ -7898,6 +7899,7 @@ @@ -7898,6 +7899,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
@ -16,7 +16,7 @@
#include <netinet/in.h> #include <netinet/in.h>
@@ -7955,7 +7957,7 @@ @@ -7955,7 +7957,7 @@ fi
echo $ECHO_N "checking for C flags to get more warnings... $ECHO_C" >&6; } echo $ECHO_N "checking for C flags to get more warnings... $ECHO_C" >&6; }
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then

14
net/mtr/patches/patch-gtk_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-gtk_c,v 1.1 2009/03/08 18:15:45 jasper Exp $
Fix 64-bit issue.
--- gtk.c.orig Sun Mar 8 19:13:24 2009
+++ gtk.c Sun Mar 8 19:13:44 2009
@@ -22,6 +22,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <sys/time.h>
#include <sys/types.h>