summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ns/Makefile6
-rw-r--r--net/pconsole/Makefile4
-rw-r--r--net/pconsole/patches/patch-aa4
-rw-r--r--net/pload/Makefile3
-rw-r--r--net/vncviewer/Makefile3
-rw-r--r--net/wminet/Makefile4
-rw-r--r--net/xipdump/Makefile3
-rw-r--r--net/xmftp/Makefile3
-rw-r--r--net/xrmftp/Makefile3
-rw-r--r--net/xrmftp/distinfo4
-rw-r--r--net/xrmftp/patches/patch-aa6
-rw-r--r--net/xtraceroute/Makefile7
12 files changed, 20 insertions, 30 deletions
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 6836fd5a598..b15210b99aa 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2014/10/09 14:06:45 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2015/07/04 16:18:38 joerg Exp $
DISTNAME= ns-src-2.35
PKGNAME= ns-2.35
@@ -25,8 +25,8 @@ CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}
CONFIGURE_ARGS+= --with-tk-ver=8.6
CONFIGURE_ARGS+= --with-otcl=${BUILDLINK_PREFIX.tcl-otcl}
CONFIGURE_ARGS+= --with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl}
-CONFIGURE_ENV+= X11LIBDIR=${X11PREFIX}/lib${LIBABISUFFIX}
-CONFIGURE_ENV+= X11INCDIR=${X11PREFIX}/include
+CONFIGURE_ENV+= X11LIBDIR=${X11BASE}/lib${LIBABISUFFIX}
+CONFIGURE_ENV+= X11INCDIR=${X11BASE}/include
MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE}
diff --git a/net/pconsole/Makefile b/net/pconsole/Makefile
index 579f4cbc9b0..85912be16e4 100644
--- a/net/pconsole/Makefile
+++ b/net/pconsole/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/02/20 05:45:05 mef Exp $
+# $NetBSD: Makefile,v 1.10 2015/07/04 16:18:38 joerg Exp $
#
DISTNAME= pconsole-1.0
@@ -20,7 +20,7 @@ REPLACE_KSH= pconsole.sh.in
SUBST_CLASSES= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= pconsole.sh.in
-SUBST_VARS.path= PREFIX X11PREFIX
+SUBST_VARS.path= PREFIX X11BASE
INSTALLATION_DIRS= share/doc/pconsole
INSTALL_MAKE_FLAGS= bindir=${DESTDIR}${PREFIX}/bin
diff --git a/net/pconsole/patches/patch-aa b/net/pconsole/patches/patch-aa
index f5a9c5882d9..f2c2aa6e746 100644
--- a/net/pconsole/patches/patch-aa
+++ b/net/pconsole/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/23 21:52:08 frueauf Exp $
+$NetBSD: patch-aa,v 1.2 2015/07/04 16:18:38 joerg Exp $
--- pconsole.sh.in.orig Mon Apr 9 10:59:48 2001
+++ pconsole.sh.in Sat Jun 23 23:29:24 2001
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/06/23 21:52:08 frueauf Exp $
fi
-PATH=/bin:/usr/bin:/usr/bin/X11:/usr/openwin/bin:/usr/local/bin:/usr/bsd:/usr/share/bin:/opt/bin:/etc:/usr/etc
-+PATH=/bin:/usr/bin:@PREFIX@/bin:@X11PREFIX@/bin:/usr/bin/X11:/usr/openwin/bin:/usr/local/bin:/usr/bsd:/usr/share/bin:/opt/bin:/etc:/usr/etc
++PATH=/bin:/usr/bin:@PREFIX@/bin:@X11BASE@/bin:/usr/bin/X11:/usr/openwin/bin:/usr/local/bin:/usr/bsd:/usr/share/bin:/opt/bin:/etc:/usr/etc
prefix=@prefix@
exec_prefix=@exec_prefix@
diff --git a/net/pload/Makefile b/net/pload/Makefile
index e6925fe7f29..67548551514 100644
--- a/net/pload/Makefile
+++ b/net/pload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2015/02/27 14:35:01 tnn Exp $
+# $NetBSD: Makefile,v 1.32 2015/07/04 16:18:39 joerg Exp $
#
DISTNAME= pload-0.9.5
@@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v2
HAS_CONFIGURE= YES
USE_TOOLS+= imake
-USE_X11BASE= YES
INSTALL_TARGET= install install.man
.include "../../x11/libXaw/buildlink3.mk"
diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile
index 28f8dea1d24..915991911d9 100644
--- a/net/vncviewer/Makefile
+++ b/net/vncviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/10/23 17:19:17 asau Exp $
+# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:39 joerg Exp $
DISTNAME= vnc-4_1_2-unixsrc
PKGNAME= vncviewer-4.1.2
@@ -16,7 +16,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix
CRYPTO= yes
NO_INSTALL_MANPAGES= yes
USE_LANGUAGES= c c++
-USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-installed-zlib
diff --git a/net/wminet/Makefile b/net/wminet/Makefile
index 310f824bb4a..4642865f0df 100644
--- a/net/wminet/Makefile
+++ b/net/wminet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/23 17:19:19 asau Exp $
+# $NetBSD: Makefile,v 1.15 2015/07/04 16:18:39 joerg Exp $
DISTNAME= wmnet-1.2
PKGNAME= wminet-1.2
@@ -12,8 +12,6 @@ COMMENT= Dockable network monitor
NOT_FOR_PLATFORM= Interix-*-* # no userland protocol stack support
-USE_X11BASE= YES
-
INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
do-install:
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 1adcd38982b..97f1ad1ac7d 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2014/09/25 16:32:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2015/07/04 16:18:39 joerg Exp $
#
DISTNAME= xipdump-1.5.4
@@ -13,7 +13,6 @@ COMMENT= Displays IP packets using X Window System
PLIST_SRC= ${WRKDIR}/PLIST
-USE_X11BASE= yes
GNU_CONFIGURE= yes
CFLAGS+= -I${PREFIX}/include
LIBS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lnet
diff --git a/net/xmftp/Makefile b/net/xmftp/Makefile
index ed58bf99f92..721dd595662 100644
--- a/net/xmftp/Makefile
+++ b/net/xmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/10/23 17:19:21 asau Exp $
+# $NetBSD: Makefile,v 1.21 2015/07/04 16:18:39 joerg Exp $
#
DISTNAME= xmftp-1.0.4
@@ -11,7 +11,6 @@ HOMEPAGE= http://viraj.org/old/xmftp/
COMMENT= X/Motif FTP client
WRKSRC= ${WRKDIR}/xmftp/source
-USE_X11BASE= yes
USE_TOOLS+= gmake
INSTALLATION_DIRS= bin share/doc/xmftp
diff --git a/net/xrmftp/Makefile b/net/xrmftp/Makefile
index 5fbf003a533..3c9f3d0a710 100644
--- a/net/xrmftp/Makefile
+++ b/net/xrmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/02/17 00:24:05 wiedi Exp $
+# $NetBSD: Makefile,v 1.24 2015/07/04 16:18:39 joerg Exp $
DISTNAME= xrmftp-1.2.4
PKGREVISION= 8
@@ -11,7 +11,6 @@ HOMEPAGE= http://www-users.mat.uni.torun.pl/~rafmet/xrmftp/
COMMENT= FTP client for X Window System
WRKSRC= ${WRKDIR}/${DISTNAME}.src
-USE_X11BASE= yes
INSTALLATION_DIRS= bin
diff --git a/net/xrmftp/distinfo b/net/xrmftp/distinfo
index 53264155441..133d893bd97 100644
--- a/net/xrmftp/distinfo
+++ b/net/xrmftp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 12:14:07 agc Exp $
+$NetBSD: distinfo,v 1.3 2015/07/04 16:18:39 joerg Exp $
SHA1 (xrmftp-1.2.4.src.tgz) = 7d6276fdb6f0582a6d31ab12ef058c418532ffc4
RMD160 (xrmftp-1.2.4.src.tgz) = 21c97fb5422efb01e60dba38b826d91b318c07c9
Size (xrmftp-1.2.4.src.tgz) = 37171 bytes
-SHA1 (patch-aa) = a89c99e75c45d5a1aabacc6e81f47dadeff4cece
+SHA1 (patch-aa) = dc4312962ea88f7de850b5efb4dc66717abd6447
diff --git a/net/xrmftp/patches/patch-aa b/net/xrmftp/patches/patch-aa
index 25a6e41f1d3..4b32f09b910 100644
--- a/net/xrmftp/patches/patch-aa
+++ b/net/xrmftp/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/21 11:07:04 rh Exp $
+$NetBSD: patch-aa,v 1.2 2015/07/04 16:18:39 joerg Exp $
--- Makefile.orig Wed Nov 18 08:25:43 1998
+++ Makefile
@@ -9,8 +9,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/21 11:07:04 rh Exp $
-XLIBSPATH=/usr/X11R6/lib # path to standard X libraries
-XINCPATH=/usr/X11R6/include # path to standard X header files
-LIBS= -lm -lX11 -lforms # libraries
-+XFORMSLIBPATH=${X11PREFIX}/lib # path to xforms library
-+XFORMSINCPATH=${X11PREFIX}/include/X11 # path to xforms header file <forms.h>
++XFORMSLIBPATH=${PREFIX}/lib # path to xforms library
++XFORMSINCPATH=${PREFIX}/include/X11 # path to xforms header file <forms.h>
+XLIBSPATH=${X11BASE}/lib # path to standard X libraries
+XINCPATH=${X11BASE}/include # path to standard X header files
+LIBS= -lm -lX11 -lforms -ljpeg -lXpm # libraries
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 58ad2196c8d..a4f29646b1b 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2015/04/25 14:23:48 tnn Exp $
+# $NetBSD: Makefile,v 1.59 2015/07/04 16:18:39 joerg Exp $
#
DISTNAME= xtraceroute-0.8.14
@@ -18,10 +18,7 @@ USE_TOOLS+= msgfmt
USE_FEATURES= snprintf
CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
-# XXX Actually, Mesa's in X11PREFIX too, but as our tiff is in LOCALBASE
-# and xtraceroute doesn't have a switch to tell it so (yet?), we abuse
-# the --with-GL-prefix switch for this.
-CONFIGURE_ARGS+= --with-GL-prefix=${LOCALBASE:Q}
+CONFIGURE_ARGS+= --with-GL-prefix=${LOCALBASE}
CONFIGURE_ARGS+= --with-lib-MesaGL
.include "../../mk/bsd.prefs.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 21:22:23 +0000