summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/dx/Makefile3
-rw-r--r--graphics/dxsamples/Makefile3
-rw-r--r--graphics/gd/options.mk4
-rw-r--r--graphics/geomview/Makefile3
-rw-r--r--graphics/graphviz/options.mk4
-rw-r--r--graphics/imlib-gtk/Makefile7
-rw-r--r--graphics/imlib/Makefile7
-rw-r--r--graphics/kdegraphics3/Makefile4
-rw-r--r--graphics/mpeg2codec/Makefile3
-rw-r--r--graphics/ncview/Makefile3
-rw-r--r--graphics/py-gdchart/distinfo4
-rw-r--r--graphics/py-gdchart/patches/patch-aa4
-rw-r--r--graphics/vcg/Makefile3
-rw-r--r--graphics/wmphoto/Makefile5
-rw-r--r--graphics/wmphoto/distinfo4
-rw-r--r--graphics/wmphoto/patches/patch-aa8
-rw-r--r--graphics/xfig/Makefile4
-rw-r--r--graphics/xplot-devel/Makefile3
-rw-r--r--graphics/xplot/Makefile3
-rw-r--r--graphics/xzgv/Makefile3
20 files changed, 33 insertions, 49 deletions
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index 0fde7d5b11b..998317e57b6 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2015/04/25 14:23:09 tnn Exp $
+# $NetBSD: Makefile,v 1.79 2015/07/04 16:18:35 joerg Exp $
DISTNAME= dx-4.4.4
PKGREVISION= 30
@@ -12,7 +12,6 @@ COMMENT= Open Visualization Data Explorer
MAKE_JOBS_SAFE= no
USE_LANGUAGES= c c++
-USE_X11BASE= yes
USE_TOOLS+= gmake lex yacc sh
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-javadx
diff --git a/graphics/dxsamples/Makefile b/graphics/dxsamples/Makefile
index 11f5cfbcffc..90267782e8a 100644
--- a/graphics/dxsamples/Makefile
+++ b/graphics/dxsamples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/10/06 14:10:46 asau Exp $
+# $NetBSD: Makefile,v 1.28 2015/07/04 16:18:35 joerg Exp $
DISTNAME= dxsamples-4.4.0
CATEGORIES= graphics
@@ -13,6 +13,5 @@ DEPENDS+= dx-[0-9]*:../../graphics/dx
GNU_CONFIGURE= yes
USE_TOOLS+= gmake makeinfo
CONFIGURE_ARGS+= MAKEINFO=${TOOLS_PATH.makeinfo}
-USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/options.mk b/graphics/gd/options.mk
index 24c566f71fd..063b162b2b8 100644
--- a/graphics/gd/options.mk
+++ b/graphics/gd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/12/09 11:42:10 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2015/07/04 16:18:35 joerg Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gd
PKG_SUPPORTED_OPTIONS= libvpx x11
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= libvpx
.if !empty(PKG_OPTIONS:Mx11)
.include "../../x11/libXpm/buildlink3.mk"
-CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
+CONFIGURE_ENV+= X11BASE=${X11BASE}
CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm}
.else
CONFIGURE_ARGS+= --without-xpm
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index a9438dd54a4..22eedd50215 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2015/04/25 14:23:10 tnn Exp $
+# $NetBSD: Makefile,v 1.44 2015/07/04 16:18:35 joerg Exp $
DISTNAME= geomview-1.8.1
PKGREVISION= 7
@@ -13,7 +13,6 @@ MAKE_JOBS_SAFE= no
USE_TOOLS+= lex
USE_LANGUAGES= c c++
-USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-xforms
diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk
index e52a493b0ee..a6b56505d68 100644
--- a/graphics/graphviz/options.mk
+++ b/graphics/graphviz/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2014/05/16 12:27:34 ryoon Exp $
+# $NetBSD: options.mk,v 1.20 2015/07/04 16:18:35 joerg Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz
PKG_SUPPORTED_OPTIONS= gd ghostscript gtk guile lua ocaml pangocairo rsvg tcl x11 perl
@@ -21,7 +21,7 @@ PLIST_VARS+= gd ghostscript gtk guile lua ocaml pangocairo perl rsvg tcl x11
.if !empty(PKG_OPTIONS:Mx11)
.include "../../mk/xaw.buildlink3.mk"
-CONFIGURE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
+CONFIGURE_ENV+= X11BASE=${X11BASE}
PLIST.x11= yes
. if !empty(PKG_OPTIONS:Mpangocairo)
diff --git a/graphics/imlib-gtk/Makefile b/graphics/imlib-gtk/Makefile
index 0699f5bfd37..c341b86551e 100644
--- a/graphics/imlib-gtk/Makefile
+++ b/graphics/imlib-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/10/09 14:06:35 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2015/07/04 16:18:36 joerg Exp $
DISTNAME= imlib-1.9.15
PKGNAME= imlib-gtk-1.9.15
@@ -37,10 +37,7 @@ PKG_SYSCONFSUBDIR= imlib
#
X_LDFLAGS= ${X11_LDFLAGS}
-.include "../../mk/bsd.prefs.mk"
-.if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+= --x-includes=${X11PREFIX:Q}/include
-.endif
+CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
BUILDLINK_DEPMETHOD.libXt?= build
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 61104041a87..ea8749c081b 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2014/10/09 14:06:35 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2015/07/04 16:18:35 joerg Exp $
DISTNAME= imlib-1.9.15
PKGREVISION= 20
@@ -46,10 +46,7 @@ SUBST_STAGE.imlib-config= post-configure
#
X_LDFLAGS= ${X11_LDFLAGS}
-.include "../../mk/bsd.prefs.mk"
-.if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+= --x-includes=${X11PREFIX:Q}/include
-.endif
+CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
post-install:
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/imlib
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index b3fa6e0b1f5..e114088e281 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2015/04/25 14:23:14 tnn Exp $
+# $NetBSD: Makefile,v 1.130 2015/07/04 16:18:36 joerg Exp $
DISTNAME= kdegraphics-${_KDE_VERSION}
PKGREVISION= 44
@@ -14,7 +14,7 @@ BUILDLINK_API_DEPENDS.lcms+= lcms>=1.12
REPLACE_PERL+= kghostview/update-to-xt-names.pl
-CONFIGURE_ARGS+= --with-imlib-config=${X11PREFIX}/bin
+CONFIGURE_ARGS+= --with-imlib-config=${PREFIX}/bin
FRIBIDI_LIBS= ${TOOLS_PATH.pkg-config} --libs fribidi
FRIBIDI_CFLAGS= ${TOOLS_PATH.pkg-config} --cflags fribidi
diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index cbdf0b98e6a..ae6b1c7cb90 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2014/10/09 14:06:36 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2015/07/04 16:18:36 joerg Exp $
DISTNAME= mpeg2vidcodec_v12
PKGNAME= mpeg2codec-1.2
@@ -11,7 +11,6 @@ HOMEPAGE= http://www.mpeg.org/MSSG/
COMMENT= MPEG Software Simulation Group's MPEG-2 Encoder and Decoder
WRKSRC= ${WRKDIR}/mpeg2
-USE_X11BASE= yes
INSTALLATION_DIRS= bin
diff --git a/graphics/ncview/Makefile b/graphics/ncview/Makefile
index 85059a97343..a9bff7da773 100644
--- a/graphics/ncview/Makefile
+++ b/graphics/ncview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/02/12 23:18:02 tron Exp $
+# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:36 joerg Exp $
DISTNAME= ncview-1.92d
PKGREVISION= 5
@@ -12,7 +12,6 @@ COMMENT= Visual browser for netCDF format files
MAKE_JOBS_SAFE= no
GNU_CONFIGURE= yes
-USE_X11BASE= yes
CONFIGURE_ARGS+= --with-netcdf_incdir=${BUILDLINK_PREFIX.netcdf}/include
CONFIGURE_ARGS+= --with-netcdf_libdir=${BUILDLINK_PREFIX.netcdf}/lib
diff --git a/graphics/py-gdchart/distinfo b/graphics/py-gdchart/distinfo
index e021d870965..05356389c92 100644
--- a/graphics/py-gdchart/distinfo
+++ b/graphics/py-gdchart/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2008/08/17 06:14:20 dholland Exp $
+$NetBSD: distinfo,v 1.10 2015/07/04 16:18:36 joerg Exp $
SHA1 (gdchart-py-0.6.tar.gz) = 20547e8550bb8c925a3b9776739f9a5e93ce8692
RMD160 (gdchart-py-0.6.tar.gz) = 6c8e430e53ab7adf2b83a8493afe570474532a26
Size (gdchart-py-0.6.tar.gz) = 321891 bytes
-SHA1 (patch-aa) = 41dff5a28491fed9e955a44e02f2003a9482f85e
+SHA1 (patch-aa) = 837717d61525d3f04b058bbc513b9cf30bcc64bd
SHA1 (patch-ab) = b4acbd6a23b97056ae18ab9a91c1d5a0b2424eb2
diff --git a/graphics/py-gdchart/patches/patch-aa b/graphics/py-gdchart/patches/patch-aa
index 75b4e85239c..d1af28b31bf 100644
--- a/graphics/py-gdchart/patches/patch-aa
+++ b/graphics/py-gdchart/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2008/08/17 06:14:21 dholland Exp $
+$NetBSD: patch-aa,v 1.6 2015/07/04 16:18:36 joerg Exp $
--- Makefile.orig 2001-03-16 14:08:18.000000000 -0500
+++ Makefile 2008-08-17 02:14:47.000000000 -0400
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2008/08/17 06:14:21 dholland Exp $
-GCC = gcc
-CFLAGS = -Wall -fpic -O2
+INC_DIRS = -I${GDCHART_INCLUDE} -I$(GD_INCLUDE) -I$(PYTHON_INCLUDE)
-+LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib
++LIB_DIRS = -L${LOCALBASE}/lib -L/usr/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
+GCC = ${CC}
+CFLAGS ?= -Wall -fpic -O2
+CFLAGS+=-fPIC
diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index 78eea5c60d6..02458ede612 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/06 14:11:23 asau Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:36 joerg Exp $
DISTNAME= vcg.1.30.r3.17
PKGNAME= vcg-1.30
@@ -14,7 +14,6 @@ MAKE_JOBS_SAFE= no
WRKSRC= ${WRKDIR}/vcg.1.30
USE_TOOLS+= imake lex
-USE_X11BASE= yes
pre-patch:
${MKDIR} ${WRKSRC}/preconf/X11ccNetBSD
diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile
index 47562335151..fa1ea899e46 100644
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/23 10:24:07 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:36 joerg Exp $
#
DISTNAME= wmphoto-0.3a
@@ -11,9 +11,8 @@ HOMEPAGE= http://www.dcc.uchile.cl/~amartoq/wmphoto/
COMMENT= Dock-app that can show you a photo
BUILD_DIRS= wmphoto
-USE_X11BASE= YES
USE_TOOLS+= gmake
-MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q}
+MAKE_ENV+= X11BASE=${X11BASE:Q}
INSTALLATION_DIRS+= bin share/doc/wmphoto
diff --git a/graphics/wmphoto/distinfo b/graphics/wmphoto/distinfo
index 9b4a24e8920..eedefd7e5bd 100644
--- a/graphics/wmphoto/distinfo
+++ b/graphics/wmphoto/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2012/11/01 19:52:47 joerg Exp $
+$NetBSD: distinfo,v 1.6 2015/07/04 16:18:36 joerg Exp $
SHA1 (wmphoto-0.3a.tar.gz) = dbec1ddd49671bc915b6e9ce37462247557f7fb9
RMD160 (wmphoto-0.3a.tar.gz) = 64b0006b90d187ec01da32f1bc9b7607d19f4330
Size (wmphoto-0.3a.tar.gz) = 19320 bytes
-SHA1 (patch-aa) = fc65409f609cf4484abf13a72437dd8e7fe77e5b
+SHA1 (patch-aa) = cbdb2ba3f1d845b8ea4d6a3fb281e2fd8966669e
SHA1 (patch-wmgeneral_list.h) = fdbaefcdb1e895bf904b383316c8aac3909a9b20
diff --git a/graphics/wmphoto/patches/patch-aa b/graphics/wmphoto/patches/patch-aa
index ae101d16bca..66cd12f8fcf 100644
--- a/graphics/wmphoto/patches/patch-aa
+++ b/graphics/wmphoto/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2010/01/29 23:50:26 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2015/07/04 16:18:36 joerg Exp $
--- wmphoto/Makefile.orig Wed Mar 28 10:09:18 2001
+++ wmphoto/Makefile Wed Mar 28 10:15:59 2001
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.3 2010/01/29 23:50:26 joerg Exp $
-CC = gcc
-CCOPTIONS = -O2 -Wall
-LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib
++LIBDIR = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib
LIBS = -lXpm -lXext -lX11
-
-# Slowlaris at my university
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2010/01/29 23:50:26 joerg Exp $
-#CCOPTIONS = -O2 -I/usr/local/X11R6/include
-#LIBDIR = -L/usr/local/X11R6/lib
-#LIBS = -lXpm -lXext -lX11 -lsocket -lnsl
-+CFLAGS = -I${X11PREFIX}/include -I${X11BASE}/include
++CFLAGS = -I${PREFIX}/include -I${X11BASE}/include
# now the common stuff...
APP = wmphoto
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.3 2010/01/29 23:50:26 joerg Exp $
- cp $(APP) $(INSTALL)
- chown root.root $(APP)
- chmod 755 $(APP)
-+ ${BSD_INSTALL_PROGRAM} $(APP) ${DESTDIR}${X11PREFIX}/bin
++ ${BSD_INSTALL_PROGRAM} $(APP) ${DESTDIR}${PREFIX}/bin
clean::
for i in $(OBJS) ; do \
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 4280944af6c..349e9cadedf 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2014/03/18 23:28:20 gdt Exp $
+# $NetBSD: Makefile,v 1.70 2015/07/04 16:18:36 joerg Exp $
DISTNAME= xfig.3.2.5b.full
PKGNAME= xfig-3.2.5b
@@ -21,7 +21,7 @@ XAW_TYPE?= 3d
NO_INSTALL_MANPAGES= YES # install.all does install.man
INSTALL_TARGET= install install.all
-CFLAGS+= -I${X11PREFIX}/include/X11
+CFLAGS+= -I${X11BASE}/include/X11
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/xplot-devel/Makefile b/graphics/xplot-devel/Makefile
index df01c0eb6f3..d087d7eff45 100644
--- a/graphics/xplot-devel/Makefile
+++ b/graphics/xplot-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/06/12 10:50:14 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:36 joerg Exp $
DISTNAME= xplot-0.90.8
PKGREVISION= 7
@@ -9,7 +9,6 @@ HOMEPAGE= http://www.xplot.org/
MAINTAINER= gdt@NetBSD.org
COMMENT= Plotting program (development snapshot)
-USE_X11BASE= yes
GNU_CONFIGURE= yes
REPLACE_PERL+= tcpdump2xplot.pl
diff --git a/graphics/xplot/Makefile b/graphics/xplot/Makefile
index f2bb77d91cd..8e2f54c8369 100644
--- a/graphics/xplot/Makefile
+++ b/graphics/xplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/06/12 10:50:14 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2015/07/04 16:18:36 joerg Exp $
DISTNAME= xplot-0.90.7.1
PKGREVISION= 10
@@ -9,7 +9,6 @@ HOMEPAGE= http://www.xplot.org/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Plotting program, most often used in conjunction with tcptrace
-USE_X11BASE= yes
GNU_CONFIGURE= yes
REPLACE_PERL+= tcpdump2xplot.pl
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index fe6d457f634..0e1c8a10048 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2015/04/25 14:23:20 tnn Exp $
+# $NetBSD: Makefile,v 1.65 2015/07/04 16:18:36 joerg Exp $
#
DISTNAME= xzgv-0.9.1
@@ -11,7 +11,6 @@ HOMEPAGE= http://sourceforge.net/projects/xzgv
COMMENT= Image viewer
LICENSE= gnu-gpl-v2
-USE_X11BASE= yes
USE_TOOLS+= gmake makeinfo pkg-config gawk
INFO_FILES= yes
INSTALLATION_DIRS= bin ${PKGINFODIR} ${PKGMANDIR}/man1
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-05 11:37:57 +0000