diff options
| author | joerg <joerg@pkgsrc.org> | 2015-07-04 16:18:28 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-07-04 16:18:28 +0000 |
| commit | 40359543350f97f6f4ce738f77467358da339880 (patch) | |
| tree | d8a48c8d2848b617581f63aeec6454f4736400cd | |
| parent | 87993e055fdcca0d2b61250e291a62eff0eb64ff (diff) | |
| download | pkgsrc-40359543350f97f6f4ce738f77467358da339880.tar.gz | |
Remove USE_X11BASE and X11PREFIX.
231 files changed, 317 insertions, 531 deletions
diff --git a/audio/dap/Makefile b/audio/dap/Makefile index be070600552..dec2d0dc78a 100644 --- a/audio/dap/Makefile +++ b/audio/dap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2013/12/23 11:57:02 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2015/07/04 16:18:28 joerg Exp $ DISTNAME= dap-2.1.5 PKGREVISION= 4 @@ -15,7 +15,7 @@ MAKE_JOBS_SAFE= no USE_LANGUAGES= c c++ INSTALLATION_DIRS+= bin share/doc/dap MAKE_FILE= Makefile.netbsd -MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} OTHER_INCLUDE_DIR=. +MAKE_ENV+= OTHER_INCLUDE_DIR=. do-install: ${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${DESTDIR}${PREFIX}/bin/dap diff --git a/audio/dap/distinfo b/audio/dap/distinfo index b6d085dfb59..1152dd26b21 100644 --- a/audio/dap/distinfo +++ b/audio/dap/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2007/03/24 21:02:18 adam Exp $ +$NetBSD: distinfo,v 1.9 2015/07/04 16:18:28 joerg Exp $ SHA1 (dap-2.1.5.tgz) = 947b5488bad395d20b88183b024311f7849765b4 RMD160 (dap-2.1.5.tgz) = 97508843962cc63b670c7248ccc1531e1ee1bb7b Size (dap-2.1.5.tgz) = 290439 bytes -SHA1 (patch-aa) = 22f6b9892f82ef059592b807e9a51c97f72fc2c2 +SHA1 (patch-aa) = 65a9e699e5db0d94dbe8002fcd5eced5473146c0 SHA1 (patch-ab) = fb89a62566a0e303012b6f3dbd43468fc9bb6ca5 SHA1 (patch-ad) = 1a9b4aec50cde74262528e62723d91815923df94 SHA1 (patch-af) = 735a9d8318479987deeecdfad2f77b9916fc24e9 -SHA1 (patch-ao) = 86d132c9dc6c9da42e5efd2a6e12ea8f2740100b -SHA1 (patch-ap) = 465884660e922feb5c88314f7e878617f559fbb2 +SHA1 (patch-ao) = fe7b582de1e306287d52c4145336e84fe6cc9c87 +SHA1 (patch-ap) = 7874592ccab3a6eeaf0cef91c4d4b270361d9e6d diff --git a/audio/dap/patches/patch-aa b/audio/dap/patches/patch-aa index c71aea1df22..dfe84227c02 100644 --- a/audio/dap/patches/patch-aa +++ b/audio/dap/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2007/03/24 21:02:18 adam Exp $ +$NetBSD: patch-aa,v 1.9 2015/07/04 16:18:28 joerg Exp $ --- main/Makefile.netbsd.orig 2003-09-10 02:06:24.000000000 +0200 +++ main/Makefile.netbsd @@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.8 2007/03/24 21:02:18 adam Exp $ -INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -LIBDIR = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib +X11DIR = ${X11BASE} -+INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11 -I${LOCALBASE}/include -+LIBDIR = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib ++INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${LOCALBASE}/include ++LIBDIR = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused -DEBUG = -g3 -OPTIM = -O1 diff --git a/audio/dap/patches/patch-ao b/audio/dap/patches/patch-ao index c39f807ed5b..778045c9b12 100644 --- a/audio/dap/patches/patch-ao +++ b/audio/dap/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.4 2007/03/24 21:02:18 adam Exp $ +$NetBSD: patch-ao,v 1.5 2015/07/04 16:18:28 joerg Exp $ --- spkit/spkit/Makefile.netbsd.orig 2003-09-16 01:06:28.000000000 +0200 +++ spkit/spkit/Makefile.netbsd @@ -9,7 +9,7 @@ $NetBSD: patch-ao,v 1.4 2007/03/24 21:02:18 adam Exp $ -X11DIR = /usr/X11R6 -INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR) +X11DIR = ${X11BASE} -+INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR) -I${X11PREFIX}/include -I${X11PREFIX}/include/X11 ++INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR) -I${LOCALBASE}/include CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused -DEBUG = -g3 -OPTIM = -O2 diff --git a/audio/dap/patches/patch-ap b/audio/dap/patches/patch-ap index 4e8806ed271..f7aee0618a7 100644 --- a/audio/dap/patches/patch-ap +++ b/audio/dap/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.5 2007/03/24 21:02:18 adam Exp $ +$NetBSD: patch-ap,v 1.6 2015/07/04 16:18:28 joerg Exp $ --- tooltips/Makefile.netbsd.orig 2003-09-16 01:05:51.000000000 +0200 +++ tooltips/Makefile.netbsd @@ -8,7 +8,7 @@ $NetBSD: patch-ap,v 1.5 2007/03/24 21:02:18 adam Exp $ # Define where the X11 include files are. -X11_INCLUDE_DIR = /usr/X11R6/include +X11_INCLUDE_DIR = ${X11BASE}/include -+OTHER_INCLUDE_DIR = ${X11PREFIX}/include/X11 ++OTHER_INCLUDE_DIR = ${LOCALBASE}/include/X11 +X11_BASE_INCLUDE= ${X11BASE}/include # Uncomment out this line if you do not want debug information included. diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 9dd820e6c72..2f139f57511 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2015/01/27 04:37:53 dbj Exp $ +# $NetBSD: Makefile,v 1.31 2015/07/04 16:18:28 joerg Exp $ # DISTNAME= jack-audio-connection-kit-${JACK_VERSION} @@ -99,7 +99,7 @@ SUBST_CLASSES+= jacksrc SUBST_FILES.jacksrc= libjack/unlock.c SUBST_MESSAGE.jacksrc= Peforming substitutions in JACK sources. SUBST_STAGE.jacksrc= pre-build -SUBST_VARS.jacksrc= PREFIX JACKD_PROCFS_PATH +SUBST_VARS.jacksrc= PREFIX JACKD_PROCFS_PATH X11BASE .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" PKG_OPTIONS_VAR= PKG_OPTIONS.jack diff --git a/audio/jack/distinfo b/audio/jack/distinfo index f65fb1a82c7..c416b6c590c 100644 --- a/audio/jack/distinfo +++ b/audio/jack/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2015/01/27 04:37:53 dbj Exp $ +$NetBSD: distinfo,v 1.16 2015/07/04 16:18:28 joerg Exp $ SHA1 (jack-audio-connection-kit-0.121.3.tar.gz) = 7d6e2219660222d1512ee704dd88a534b3e3089e RMD160 (jack-audio-connection-kit-0.121.3.tar.gz) = 0b41b17b0606a6cffdab765ba6a47d0bc6ac9705 @@ -9,7 +9,7 @@ SHA1 (patch-ad) = 4e37eaee3bd8674e20d116be80174b99dd9d6e20 SHA1 (patch-af) = 2a40f3a51a088e62352d7cdcc27eb41f3064ae7e SHA1 (patch-ah) = e70d2783d79c7177b774e8256cd2eb5c803a6488 SHA1 (patch-aj) = 90b38c6b2c883d21ea0d058f7e4426f3d16c8b07 -SHA1 (patch-ak) = 8e6d8f92d496991f3de02eeb2fffc89c865a3f63 +SHA1 (patch-ak) = 90006096f7c4035edea75ebebeff58c18f04e39e SHA1 (patch-ao) = 60930e5ecd408ebccbca8342083189b7d2d06a1b SHA1 (patch-ap) = 64b06cb300940f3e119bfcce033bf47195ab665f SHA1 (patch-aq) = cf735dd28af1373b4b2511978fca6af032591859 diff --git a/audio/jack/patches/patch-ak b/audio/jack/patches/patch-ak index 80e2aa6dfb2..fb29a2cdf93 100644 --- a/audio/jack/patches/patch-ak +++ b/audio/jack/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.2 2008/11/16 11:22:55 bjs Exp $ +$NetBSD: patch-ak,v 1.3 2015/07/04 16:18:28 joerg Exp $ Yuck. At least let's attempt to make this somewhat sane. When I have the time and figure out the Right Thing(tm) @@ -11,7 +11,7 @@ to do, perhaps I'll rewrite some of the shm code. "/lib", "/usr/lib", + "@PREFIX@", /* pkgsrc prefix */ -+ "@X11PREFIX@/lib", ++ "@X11BASE@/lib", "/usr/local/lib", - "/usr/X11R6/lib", "/opt/lib", /* solaris-y */ diff --git a/audio/mixer.app/distinfo b/audio/mixer.app/distinfo index 93a64c57535..d68507e8d72 100644 --- a/audio/mixer.app/distinfo +++ b/audio/mixer.app/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2005/02/23 20:39:49 agc Exp $ +$NetBSD: distinfo,v 1.8 2015/07/04 16:18:28 joerg Exp $ SHA1 (Mixer.app-1.8.0.tar.gz) = 68b644e2b13fe4a89461cf28ab6aebbcaedc0552 RMD160 (Mixer.app-1.8.0.tar.gz) = ae29a9b6c4a3d37d48f5e2b936ac62b81cc02c52 Size (Mixer.app-1.8.0.tar.gz) = 37884 bytes -SHA1 (patch-aa) = 4bbc4735d3d2075f2e890cdbd6ff48d70c8cc7a5 +SHA1 (patch-aa) = 125ce93748d6f438ed2bcc7994f800db09b07760 SHA1 (patch-ab) = 9ca9690364e4e42c64b227f58f913848d5f980a4 diff --git a/audio/mixer.app/patches/patch-aa b/audio/mixer.app/patches/patch-aa index a377c0a5aec..740ca4b555b 100644 --- a/audio/mixer.app/patches/patch-aa +++ b/audio/mixer.app/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2004/05/03 23:18:21 minskim Exp $ +$NetBSD: patch-aa,v 1.5 2015/07/04 16:18:28 joerg Exp $ --- Makefile.orig 2002-09-15 11:37:33.000000000 -0500 +++ Makefile @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2004/05/03 23:18:21 minskim Exp $ -LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11 +#CXX=c++ +CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I${X11BASE}/include -+LDFLAGS += -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib -L${X11BASE}/lib -lXpm -lXext -lX11 ${LIBOSSAUDIO} ++LDFLAGS += -Wl,-R${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lXpm -lXext -lX11 ${LIBOSSAUDIO} OBJECTS = Main.o Mixer.o Xpm.o diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile index 84bea0c0350..c1c91975340 100644 --- a/audio/wsoundserver/Makefile +++ b/audio/wsoundserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2014/05/15 14:41:46 adam Exp $ +# $NetBSD: Makefile,v 1.58 2015/07/04 16:18:28 joerg Exp $ # DISTNAME= WSoundServer-0.4.0 @@ -12,7 +12,6 @@ HOMEPAGE= http://shadowmere.student.utwente.nl/ COMMENT= Sound server for windowmaker LICENSE= modified-bsd -USE_X11BASE= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_TOOLS+= pkg-config diff --git a/cad/felt/Makefile b/cad/felt/Makefile index 067ed5fe70f..55511e0adb5 100644 --- a/cad/felt/Makefile +++ b/cad/felt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2013/07/15 02:02:18 ryoon Exp $ +# $NetBSD: Makefile,v 1.38 2015/07/04 16:18:28 joerg Exp $ DISTNAME= felt-3.05.src PKGNAME= felt-3.05 @@ -14,7 +14,6 @@ COMMENT= Free system for introductory level finite element analysis EXTRACT_ONLY= felt-3.05.src.tar.gz WRKSRC= ${WRKDIR}/FElt-3.05 -USE_X11BASE= yes USE_TOOLS+= gzcat XAW_TYPE?= 3d diff --git a/comms/xisp/distinfo b/comms/xisp/distinfo index 1524498e432..2e2f87a66c5 100644 --- a/comms/xisp/distinfo +++ b/comms/xisp/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.11 2012/02/17 13:49:47 hans Exp $ +$NetBSD: distinfo,v 1.12 2015/07/04 16:18:28 joerg Exp $ SHA1 (xisp-2.7p4.tar.gz) = d6b7cba0cbde2d8c42405108d69aa21c96e73659 RMD160 (xisp-2.7p4.tar.gz) = 617ad86157dc0bef19239359eb20d6f65ee8a00b Size (xisp-2.7p4.tar.gz) = 300156 bytes -SHA1 (patch-aa) = 0c90fc26d937f5ab3cda0bcaaeffe99b2a8fdaad +SHA1 (patch-aa) = 703e2467587b845747666e35006ede0a51b9096d SHA1 (patch-ab) = aebdef9938050ad251a4160f1d1d51b83c75c2c0 SHA1 (patch-ac) = 0c94e133d36024ea27b33c3cdbb8b3c2b387ceff diff --git a/comms/xisp/patches/patch-aa b/comms/xisp/patches/patch-aa index 7bf5d1e4467..d3f9e3fb157 100644 --- a/comms/xisp/patches/patch-aa +++ b/comms/xisp/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.12 2012/02/17 13:49:47 hans Exp $ +$NetBSD: patch-aa,v 1.13 2015/07/04 16:18:28 joerg Exp $ --- Makefile.orig 2005-11-07 00:38:22.000000000 +0000 +++ Makefile @@ -17,8 +17,9 @@ $NetBSD: patch-aa,v 1.12 2012/02/17 13:49:47 hans Exp $ +#X11PREFIX = /usr/X11R6 +INCX11 = $(X11BASE)/include +LIBX11 = $(X11BASE)/lib -+INCFORMS = $(X11PREFIX)/include/X11 - LIBFORMS = $(X11PREFIX)/lib ++INCFORMS = $(PREFIX)/include/X11 +-LIBFORMS = $(X11PREFIX)/lib ++LIBFORMS = $(X11BASE)/lib MODEM_DEV = modem MODEM_PATH = /dev/$(MODEM_DEV) @@ -29,26 +29,26 @@ MODEM_PATH = /dev/$(MODEM_DEV) @@ -78,7 +79,7 @@ $NetBSD: patch-aa,v 1.12 2012/02/17 13:49:47 hans Exp $ -#MANDIR = $(PREFIX)/man/man1 -#ETCPPP = /etc/ppp -#OPTSDIR = $(ETCPPP) -+BINX11 = $(X11PREFIX)/bin ++BINX11 = $(PREFIX)/bin +USRLOCAL = $(BINX11) +SBINDIR = /usr/sbin +VARRUN = $(VARBASE)/run diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index ebe9e2c515b..383e5fe18c9 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2012/10/02 21:25:18 asau Exp $ +# $NetBSD: Makefile,v 1.47 2015/07/04 16:18:29 joerg Exp $ # DISTNAME= gtksql-0.3 @@ -12,7 +12,6 @@ COMMENT= Query tool for PostgreSQL written with GTK INSTALLATION_DIRS+= bin -USE_X11BASE= yes MAKE_ENV+= MCFLAGS=${CFLAGS:M*:Q} PGSQL_PREFIX=${PGSQL_PREFIX:Q} .include "../../mk/pgsql.buildlink3.mk" diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile index a676829bfc8..0e2b691e517 100644 --- a/devel/coconut/Makefile +++ b/devel/coconut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2015/04/25 14:20:32 tnn Exp $ +# $NetBSD: Makefile,v 1.63 2015/07/04 16:18:29 joerg Exp $ # DISTNAME= coconut-0.3.0 @@ -31,6 +31,6 @@ pre-configure: cd ${WRKSRC} && \ ${CP} configure configure.old && \ ${SED} < configure.old > configure \ - 's|^\(INCLUDE_DIR_LIST=\).*|\1"${PREFIX}/include ${X11PREFIX}/include"|' + 's|^\(INCLUDE_DIR_LIST=\).*|\1"${PREFIX}/include ${X11BASE}/include"|' .include "../../mk/bsd.pkg.mk" diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 63e45a38618..36be706b2b3 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2012/10/31 11:16:51 asau Exp $ +# $NetBSD: Makefile,v 1.78 2015/07/04 16:18:29 joerg Exp $ # DISTNAME= ddd-3.3.12 @@ -18,7 +18,6 @@ TEST_TARGET= check BUILD_DEFS+= PAPERSIZE USE_TOOLS+= gmake gzip USE_LANGUAGES= c c++ -USE_X11BASE= YES GCC_REQD+= 3.0 diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 711544fe639..8c45f7da3bb 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2014/06/01 16:45:35 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2015/07/04 16:18:29 joerg Exp $ DISTNAME= mule-2.3 PKGREVISION= 8 @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --terminal-face --mcpath --canna-libraries=${PREFIX}/lib .if ${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" CONFIGURE_ARGS+= --valbits=26 .endif -CONFIGURE_ARGS+= --bdf-path=${X11PREFIX}/share/fonts/X11/intlfonts/bdf +CONFIGURE_ARGS+= --bdf-path=${PREFIX}/share/fonts/X11/intlfonts/bdf .include "options.mk" diff --git a/editors/sam/Makefile b/editors/sam/Makefile index 5f72107e465..299ebd25b9b 100644 --- a/editors/sam/Makefile +++ b/editors/sam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2015/03/12 17:32:58 tnn Exp $ +# $NetBSD: Makefile,v 1.42 2015/07/04 16:18:29 joerg Exp $ DISTNAME= sam PKGNAME= sam-4.3 @@ -18,14 +18,11 @@ WRKSRC= ${WRKDIR} EXTRACT_CMD= ${GZCAT} $$extract_file | ${SH} MANCOMPRESSED= yes -USE_X11BASE= yes -MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} INSTALLATION_DIRS= bin include lib/X11/app-defaults \ ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man4 ${PKGMANDIR}/man6 INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX:Q} \ - X11PREFIX=${DESTDIR}${X11PREFIX:Q} \ MAN=${PKGMANDIR} .include "../../mk/bsd.prefs.mk" diff --git a/editors/sam/distinfo b/editors/sam/distinfo index d48b34e92de..41b57cdb59d 100644 --- a/editors/sam/distinfo +++ b/editors/sam/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2005/10/10 16:18:04 joerg Exp $ +$NetBSD: distinfo,v 1.6 2015/07/04 16:18:29 joerg Exp $ SHA1 (sam.msg.gz) = c6d2baa07a3b7410658e31e6ebfb997809c8323e RMD160 (sam.msg.gz) = f3a6f354bd11b45966818188392c4655267f0571 @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 76fa25ab4737f925eefe2e3876d862e7814d3d31 SHA1 (patch-ac) = fa5ccdc02a82d4bd4a713f53a180126b85df0880 SHA1 (patch-ad) = 3a456316d0806b6b6bc6f6143bb3dd3701f8c1e1 SHA1 (patch-ae) = b95056d090d73ffa8920669027b43d16d6cf81f5 -SHA1 (patch-af) = b7f32619782b542773a85ea2d24c55f05782af94 +SHA1 (patch-af) = 9afde00ab2b86519dcf558c0e1e2232b3839b579 SHA1 (patch-ag) = 348b5400cccdd8cdcc6e63244a6e28551bbfb354 SHA1 (patch-ah) = 0126f1eee5bbcf59e3e08063d2cddffba83dc94b SHA1 (patch-ai) = ca76a0c22c4e962ec590e9aeff719c71bd6fdafc diff --git a/editors/sam/patches/patch-af b/editors/sam/patches/patch-af index 4eaeee2123e..4bf5ccd495d 100644 --- a/editors/sam/patches/patch-af +++ b/editors/sam/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.4 2001/05/01 09:16:25 agc Exp $ +$NetBSD: patch-af,v 1.5 2015/07/04 16:18:29 joerg Exp $ --- Makefile.orig Tue May 1 09:42:03 2001 +++ Makefile Tue May 1 09:43:37 2001 @@ -12,7 +12,7 @@ $NetBSD: patch-af,v 1.4 2001/05/01 09:16:25 agc Exp $ +MAN3=add balloc bitblt cachechars event frame graphics rgbpix rune +MAN4=font keyboard utf +MAN6=bitmap regexp -+APP_DEFAULT_DIR=${X11PREFIX}/lib/X11/app-defaults ++APP_DEFAULT_DIR=${PREFIX}/lib/X11/app-defaults +AD=Sam + all: lXg lframe samdir samtermdir diff --git a/editors/ted-cs/Makefile b/editors/ted-cs/Makefile index b35277dc729..fde00537ddd 100644 --- a/editors/ted-cs/Makefile +++ b/editors/ted-cs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:43 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $ DISTNAME= Ted_cs_CZ PKGNAME= ted-cs-2.16 @@ -13,7 +13,6 @@ COMMENT= Czech spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-da/Makefile b/editors/ted-da/Makefile index c11bfeda887..f891859dc7e 100644 --- a/editors/ted-da/Makefile +++ b/editors/ted-da/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:43 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $ DISTNAME= Ted_da_DK PKGNAME= ted-da-2.16 @@ -13,7 +13,6 @@ COMMENT= Danish spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-de/Makefile b/editors/ted-de/Makefile index eaf61fea8aa..634afcf1f07 100644 --- a/editors/ted-de/Makefile +++ b/editors/ted-de/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $ DISTNAME= Ted_de_DE PKGNAME= ted-de-2.16 @@ -13,7 +13,6 @@ COMMENT= German spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-en-gb/Makefile b/editors/ted-en-gb/Makefile index e7997cb319b..b4dcbe1345f 100644 --- a/editors/ted-en-gb/Makefile +++ b/editors/ted-en-gb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $ DISTNAME= Ted_en_GB PKGNAME= ted-en-gb-2.16 @@ -13,7 +13,6 @@ COMMENT= UK English spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-en-us/Makefile b/editors/ted-en-us/Makefile index 710b783d6b9..3763913fce3 100644 --- a/editors/ted-en-us/Makefile +++ b/editors/ted-en-us/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/02/19 22:31:32 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:29 joerg Exp $ DISTNAME= ted-2.16.src PKGNAME= ted-en-us-2.16 @@ -13,7 +13,6 @@ COMMENT= US English spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR}/Ted-2.16 -USE_X11BASE= YES NO_BUILD= YES USE_TOOLS+= tar diff --git a/editors/ted-es/Makefile b/editors/ted-es/Makefile index d7a7b7a1420..3db69afce6d 100644 --- a/editors/ted-es/Makefile +++ b/editors/ted-es/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $ DISTNAME= Ted_es_ES PKGNAME= ted-es-2.16 @@ -13,7 +13,6 @@ COMMENT= Spanish spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-fr/Makefile b/editors/ted-fr/Makefile index 94ed1e54472..ee76f32a02e 100644 --- a/editors/ted-fr/Makefile +++ b/editors/ted-fr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:29 joerg Exp $ DISTNAME= Ted_fr_FR PKGNAME= ted-fr-2.16 @@ -13,7 +13,6 @@ COMMENT= French spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-it/Makefile b/editors/ted-it/Makefile index d1e3c5dd12b..d88c8d9d317 100644 --- a/editors/ted-it/Makefile +++ b/editors/ted-it/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:30 joerg Exp $ DISTNAME= Ted_it_IT PKGNAME= ted-it-2.16 @@ -13,7 +13,6 @@ COMMENT= Italian spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-nl/Makefile b/editors/ted-nl/Makefile index 9507ee7f32a..9654f56ea8d 100644 --- a/editors/ted-nl/Makefile +++ b/editors/ted-nl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:30 joerg Exp $ DISTNAME= Ted_nl_NL PKGNAME= ted-nl-2.16 @@ -13,7 +13,6 @@ COMMENT= Dutch spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-no/Makefile b/editors/ted-no/Makefile index 7a92b564019..edd52eef6c7 100644 --- a/editors/ted-no/Makefile +++ b/editors/ted-no/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:44 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:30 joerg Exp $ DISTNAME= Ted_no_NO PKGNAME= ted-no-2.16 @@ -13,7 +13,6 @@ COMMENT= Norwegian spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-pl/Makefile b/editors/ted-pl/Makefile index 0ff671ce673..084ae0a36dc 100644 --- a/editors/ted-pl/Makefile +++ b/editors/ted-pl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/10/03 11:43:45 asau Exp $ +# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:30 joerg Exp $ DISTNAME= Ted_pl_PL PKGNAME= ted-pl-2.16 @@ -13,7 +13,6 @@ COMMENT= Polish spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-pt/Makefile b/editors/ted-pt/Makefile index 8cf9c95f213..dae9b63b9fc 100644 --- a/editors/ted-pt/Makefile +++ b/editors/ted-pt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:45 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:30 joerg Exp $ DISTNAME= Ted_pt_PT PKGNAME= ted-pt-2.16 @@ -13,7 +13,6 @@ COMMENT= Portuguese spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/ted-sv/Makefile b/editors/ted-sv/Makefile index 4969b18d954..e9d97ea30f2 100644 --- a/editors/ted-sv/Makefile +++ b/editors/ted-sv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/03 11:43:45 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:30 joerg Exp $ DISTNAME= Ted_sv_SE PKGNAME= ted-sv-2.16 @@ -13,7 +13,6 @@ COMMENT= Swedish spelling dictionary for the Ted word processor DEPENDS+= ted>=2.6:../../editors/ted WRKSRC= ${WRKDIR} -USE_X11BASE= YES DIST_SUBDIR= Ted-2.16 NO_BUILD= YES diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile index 5928981de08..cf643afaa28 100644 --- a/editors/xcoral/Makefile +++ b/editors/xcoral/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/04/06 13:24:18 rodent Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:30 joerg Exp $ DISTNAME= xcoral-3.2 PKGREVISION= 1 @@ -10,7 +10,6 @@ COMMENT= Multiwindow mouse-based text editor for X MAKE_JOBS_SAFE= no -USE_X11BASE= yes GNU_CONFIGURE= yes LIBFILES= DEPEND README cmd.sc color.sc comments.sc compare-win.sc \ diff --git a/emulators/xtrs/Makefile b/emulators/xtrs/Makefile index d9823362112..8d348fbdd85 100644 --- a/emulators/xtrs/Makefile +++ b/emulators/xtrs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2014/05/20 12:38:25 obache Exp $ +# $NetBSD: Makefile,v 1.27 2015/07/04 16:18:30 joerg Exp $ # DISTNAME= xtrs-4.9d @@ -19,7 +19,7 @@ SUBST_CLASSES+= mf SUBST_STAGE.mf= post-configure SUBST_FILES.mf= Makefile.local SUBST_SED.mf= -e 's|/usr/local|${PREFIX}|g' -SUBST_SED.mf+= -e 's|/usr/X11/|${X11PREFIX}/|g' +SUBST_SED.mf+= -e 's|/usr/X11/|${X11BASE}/|g' SUBST_SED.mf+= -e 's|/usr/include/X11|${X11BASE}/include|g' SUBST_SED.mf+= -e 's|/share/man|/${PKGMANDIR}|g' diff --git a/fonts/Xg/Makefile b/fonts/Xg/Makefile index b7344e1b2c4..dacae19e3de 100644 --- a/fonts/Xg/Makefile +++ b/fonts/Xg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2014/06/01 16:35:31 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:30 joerg Exp $ DISTNAME= libXg.utf.fonts PKGNAME= libXgFonts-1.0 @@ -11,7 +11,6 @@ COMMENT= These are the UNICODE fonts for use with 9term and sam WRKSRC= ${WRKDIR} NO_BUILD= yes -USE_X11BASE= yes USE_TOOLS+= bdftopcf gzip FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/Xg diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile index 7f8ab2b21ad..ea9166a0a37 100644 --- a/fonts/arphic-ttf/Makefile +++ b/fonts/arphic-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2014/06/01 16:35:32 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2015/07/04 16:18:30 joerg Exp $ # DISTNAME= arphic-ttf-2.11 @@ -19,7 +19,6 @@ MISC_FILES= ARPHICPL.TXT logo.gif release.txt DIST_SUBDIR= arphic-ttf WRKSRC= ${WRKDIR} -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/artwiz-fonts/Makefile b/fonts/artwiz-fonts/Makefile index f6d7dd3ed7f..c9bac4baf5f 100644 --- a/fonts/artwiz-fonts/Makefile +++ b/fonts/artwiz-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:32 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:30 joerg Exp $ # DISTNAME= artwiz-aleczapka-1.3 @@ -13,7 +13,6 @@ HOMEPAGE= http://www.vastwaters.com/ COMMENT= Set of free fonts for X11 desktops WRKSRC= ${WRKDIR}/artwiz-aleczapka -USE_X11BASE= yes NO_BUILD= yes NO_CONFIGURE= yes diff --git a/fonts/baekmuk-ttf/Makefile b/fonts/baekmuk-ttf/Makefile index e65227d1de6..3520b1191b5 100644 --- a/fonts/baekmuk-ttf/Makefile +++ b/fonts/baekmuk-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2014/06/01 16:35:32 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:30 joerg Exp $ DISTNAME= baekmuk-ttf-2.2 PKGREVISION= 3 @@ -9,7 +9,6 @@ MAINTAINER= yui@yui.pe.kr HOMEPAGE= http://kldp.net/projects/baekmuk/ COMMENT= Baekmuk family Korean TrueType fonts -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/biznet-iso8859_2/Makefile b/fonts/biznet-iso8859_2/Makefile index 9a8c5a689e1..890004ae91f 100644 --- a/fonts/biznet-iso8859_2/Makefile +++ b/fonts/biznet-iso8859_2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:32 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:30 joerg Exp $ # DISTNAME= ISO8859-2-pcf @@ -11,7 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://web.archive.org/web/20041204153923/http://www.biz.net.pl/english/x-fonts/index.html COMMENT= Full set of ISO 8859-2 fonts for X Window System -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/croscorefonts/Makefile b/fonts/croscorefonts/Makefile index 56be8184ddd..f2bf9f1024f 100644 --- a/fonts/croscorefonts/Makefile +++ b/fonts/croscorefonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/06/01 16:35:32 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2015/07/04 16:18:30 joerg Exp $ # DISTNAME= croscorefonts-1.21.0 @@ -11,7 +11,6 @@ HOMEPAGE= http://fedoraproject.org/wiki/Google_Croscore_fonts COMMENT= Google Croscore fonts LICENSE= ofl-v1.1 -USE_X11BASE= yes NO_CONFIGURE= yes NO_BUILD= yes USE_LANGUAGES= # none diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common index 0b4ab6f41ea..b4b8dbaafcf 100644 --- a/fonts/cyberbit-ttf/Makefile.common +++ b/fonts/cyberbit-ttf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2014/10/05 16:41:06 wiz Exp $ +# $NetBSD: Makefile.common,v 1.28 2015/07/04 16:18:31 joerg Exp $ # # used by fonts/cyberbit-ttf/Makefile # used by fonts/cyberbase-ttf/Makefile @@ -25,7 +25,6 @@ DIST_SUBDIR= cyberbit-ttf EXTRACT_ONLY= ${FONT_FILE} #EXTRACT_OPTS_ZIP= -Laq -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/cyr-rfx-share/Makefile.common b/fonts/cyr-rfx-share/Makefile.common index 91092dd9eba..e13f6f3f153 100644 --- a/fonts/cyr-rfx-share/Makefile.common +++ b/fonts/cyr-rfx-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2014/06/01 16:35:33 wiz Exp $ +# $NetBSD: Makefile.common,v 1.17 2015/07/04 16:18:31 joerg Exp $ # used by fonts/cyr-rfx-bulgarian-mik/Makefile # used by fonts/cyr-rfx-ibm-cp866/Makefile @@ -25,8 +25,6 @@ HOMEPAGE= http://www.inp.nsk.su/~bolkhov/files/fonts/cyr-rfx/00index.en.html COMMENT= Cyrillic X11 fonts in ${CYR_RFX_ENCODING} encoding DIST_SUBDIR= cyr-rfx -USE_X11BASE= yes - NO_CONFIGURE= yes NO_BUILD= yes diff --git a/fonts/droid-ttf/Makefile b/fonts/droid-ttf/Makefile index 0270d9e880b..c77c3aabf61 100644 --- a/fonts/droid-ttf/Makefile +++ b/fonts/droid-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/06/01 16:35:33 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2015/07/04 16:18:31 joerg Exp $ # DISTNAME= droid-fonts-20111115 @@ -14,7 +14,6 @@ COMMENT= The Droid fonts family from Ascender Corporation LICENSE= apache-2.0 USE_LANGUAGES= # none -USE_X11BASE= YES NO_BUILD= YES DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile index 1a7997ce727..e61db2d7d43 100644 --- a/fonts/efont-unicode/Makefile +++ b/fonts/efont-unicode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2014/06/01 16:35:33 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:31 joerg Exp $ DISTNAME= efont-unicode-bdf-0.4.2 PKGNAME= ${DISTNAME:S/-bdf//} @@ -11,7 +11,6 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://openlab.ring.gr.jp/efont/unicode/ COMMENT= Free unicode BDF font -USE_X11BASE= YES USE_TOOLS+= bdftopcf gzip MESSAGE_SUBST+= FONTDIR=${FONTDIR} diff --git a/fonts/freefonts/Makefile b/fonts/freefonts/Makefile index fb98062928b..168fba8de1d 100644 --- a/fonts/freefonts/Makefile +++ b/fonts/freefonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/08/19 10:42:55 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2015/07/04 16:18:31 joerg Exp $ DISTNAME= freefonts-0.10 PKGREVISION= 3 @@ -15,7 +15,6 @@ EXTRACT_ONLY= # empty NO_CONFIGURE= yes NO_BUILD= yes -USE_X11BASE= yes USE_TOOLS+= gzcat tar FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/freefont REQD_DIRS= ${PREFIX}/share/fonts/X11/freefont diff --git a/fonts/geoslab703-ttf/Makefile b/fonts/geoslab703-ttf/Makefile index 5f08b7dc4f4..ac1ab3fa59d 100644 --- a/fonts/geoslab703-ttf/Makefile +++ b/fonts/geoslab703-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/06/01 16:35:34 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2015/07/04 16:18:31 joerg Exp $ # DISTNAME= geoslab703-ttf-20010522 @@ -14,7 +14,6 @@ COMMENT= Free TrueType fonts from Bitstream, useful for web viewing DIST_SUBDIR= geoslab703-ttf EXTRACT_ONLY= # empty -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/ipaexfont/Makefile b/fonts/ipaexfont/Makefile index c2a31a2c658..3120da8b11f 100644 --- a/fonts/ipaexfont/Makefile +++ b/fonts/ipaexfont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2015/06/29 11:06:46 ryoon Exp $ +# $NetBSD: Makefile,v 1.10 2015/07/04 16:18:31 joerg Exp $ # IPAEXVER= 00201 @@ -15,7 +15,6 @@ HOMEPAGE= http://ipafont.ipa.go.jp/ COMMENT= IPAex fonts (fixed JIS X0213 Kanji, and proportional ASCII) LICENSE= ipafont -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/ipafont/Makefile b/fonts/ipafont/Makefile index f9d8db5ff41..2775dc29575 100644 --- a/fonts/ipafont/Makefile +++ b/fonts/ipafont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/06/01 16:35:34 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2015/07/04 16:18:31 joerg Exp $ # DISTNAME= IPAfont00303 @@ -13,7 +13,6 @@ HOMEPAGE= http://ipafont.ipa.go.jp/ COMMENT= IPA JIS X 0213 fonts (Gothic, P Gothic, Mincho, and P Mincho) LICENSE= ipafont -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile index 5ad11e93464..9ce2c02b026 100644 --- a/fonts/ja-elisat/Makefile +++ b/fonts/ja-elisat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2014/06/01 16:35:34 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:31 joerg Exp $ DISTNAME= elisat10 PKGNAME= ja-elisat-1.0 @@ -11,7 +11,6 @@ COMMENT= 8x8 dots X11 bitmap font for JIS X 0208 LICENSE= no-commercial-use WRKSRC= ${WRKDIR} -USE_X11BASE= YES DOCDIR= ${PREFIX}/share/doc/elisat FONTDIR= ${PREFIX}/share/fonts/X11/local FONTS_DIRS.x11= ${FONTDIR} diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile index 60be3e1bcff..c80d10806e2 100644 --- a/fonts/ja-elisau/Makefile +++ b/fonts/ja-elisau/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2014/06/01 16:35:34 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:31 joerg Exp $ DISTNAME= elisau10 PKGNAME= ja-elisau-1.0 @@ -21,7 +21,6 @@ SITES.clR5x8.bdf= ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/ WRKSRC= ${WRKDIR} USE_TOOLS+= bdftopcf gzip patch -USE_X11BASE= YES DOCDIR= ${PREFIX}/share/doc/elisau FONTDIR= ${PREFIX}/share/fonts/X11/local FONTS_DIRS.x11= ${FONTDIR} diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile index 49c07e67403..b22fc1ae2f8 100644 --- a/fonts/ja-kaname/Makefile +++ b/fonts/ja-kaname/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/06/01 16:35:34 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:31 joerg Exp $ DISTNAME= kaname_k12_bdf PKGNAME= ja-kaname-0.0.0.20030112 @@ -11,7 +11,6 @@ COMMENT= 12x12 dots X11 bitmap font for JIS X 0208 #LICENSE= no-commercial-use WRKSRC= ${WRKDIR} -USE_X11BASE= YES USE_TOOLS+= bdftopcf gzip DOCDIR= ${PREFIX}/share/doc/kaname FONTDIR= ${PREFIX}/share/fonts/X11/local diff --git a/fonts/ja-kappa20/Makefile b/fonts/ja-kappa20/Makefile index 39e2b95e5ab..c77ccd67294 100644 --- a/fonts/ja-kappa20/Makefile +++ b/fonts/ja-kappa20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:34 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:31 joerg Exp $ DISTNAME= Kappa20-0.394 PKGNAME= ja-kappa20-0.394 @@ -11,7 +11,6 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://kappa.allnet.ne.jp/20dot.fonts/ COMMENT= 20x20 dots X11 bitmap font for Japanese with several extra fonts -USE_X11BASE= YES FONTDIR= ${PREFIX}/share/fonts/X11/local ALIAS_KAPPA= ${PREFIX}/share/examples/fonts.alias.Kappa20 diff --git a/fonts/ja-naga10/Makefile b/fonts/ja-naga10/Makefile index e0d691ac4f9..522f28bdbe6 100644 --- a/fonts/ja-naga10/Makefile +++ b/fonts/ja-naga10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/06/01 16:35:34 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:31 joerg Exp $ DISTNAME= knj10-1.1 PKGNAME= ja-naga10-1.1 @@ -12,7 +12,6 @@ MAINTAINER= tech-pkg-ja@jp.NetBSD.org HOMEPAGE= http://hp.vector.co.jp/authors/VA013391/fonts/#naga10 COMMENT= 10x10 dots X11 bitmap font for JIS X 0208 -USE_X11BASE= YES USE_TOOLS+= bdftopcf gzip patch DOCDIR= ${PREFIX}/share/doc FONTDIR= ${PREFIX}/share/fonts/X11/local diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile index bb347fe22ad..fbc07868f48 100644 --- a/fonts/ja-shinonome/Makefile +++ b/fonts/ja-shinonome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2015/06/12 10:50:05 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:31 joerg Exp $ # DISTNAME= shinonome-0.9.11-src @@ -14,7 +14,6 @@ COMMENT= 12, 14, 16 dots bitmap fonts for Japanese, iso8859-1 LICENSE= public-domain GNU_CONFIGURE= YES -USE_X11BASE= YES USE_TOOLS+= gawk gmake mkfontdir perl gzip FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/local FONTDIR= ${PREFIX}/share/fonts/X11/local diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile index a2bcbef0acb..410c2c0f77f 100644 --- a/fonts/jisx0212fonts/Makefile +++ b/fonts/jisx0212fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/06/01 16:35:35 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:32 joerg Exp $ DISTNAME= jisx0212fonts-0.0 PKGREVISION= 3 @@ -11,8 +11,6 @@ DISTFILES= jisksp14.bdf.gz jisksp16-1990.bdf.Z min-1-24.bdf.gz \ MAINTAINER= uebayasi@NetBSD.org COMMENT= X11 bitmap fonts for JIS X 0212 -USE_X11BASE= yes - WRKSRC= ${WRKDIR} EXTRACT_ONLY= ${DISTFILES} diff --git a/fonts/jisx0213fonts/Makefile b/fonts/jisx0213fonts/Makefile index 9d520efbc9e..cd09a5942f6 100644 --- a/fonts/jisx0213fonts/Makefile +++ b/fonts/jisx0213fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2014/06/01 16:35:35 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:32 joerg Exp $ # DISTNAME= jisx0213fonts-0.0 @@ -11,7 +11,6 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= ftp://ftp.m17n.org/pub/character/fonts/imamura/jisx0213/ COMMENT= X11 bitmap fonts for JIS X 0213 -USE_X11BASE= yes USE_TOOLS+= gzip bdftopcf FONTS= K14-1 K14-2 jiskan16-2000-1 jiskan16-2000-2 diff --git a/fonts/jmk-fonts/Makefile b/fonts/jmk-fonts/Makefile index 4db9ba3e6c7..e5fd16fc4bf 100644 --- a/fonts/jmk-fonts/Makefile +++ b/fonts/jmk-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/06/01 16:35:35 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:32 joerg Exp $ # DISTNAME= jmk-x11-fonts-3.0 @@ -16,7 +16,6 @@ MAKE_FLAGS+= INSTALL_DIR=${PREFIX}/share/fonts/X11/jmk USE_TOOLS+= bdftopcf gzip -USE_X11BASE= yes FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/jmk REQD_DIRS+= ${PREFIX}/share/fonts/X11/jmk diff --git a/fonts/kanjistrokeorders-ttf/Makefile b/fonts/kanjistrokeorders-ttf/Makefile index 7ee19ca55a0..7908dadee4e 100644 --- a/fonts/kanjistrokeorders-ttf/Makefile +++ b/fonts/kanjistrokeorders-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/03/07 01:15:15 ryoon Exp $ +# $NetBSD: Makefile,v 1.8 2015/07/04 16:18:32 joerg Exp $ DISTNAME= KanjiStrokeOrders_v${KSOVER} PKGNAME= ${DISTNAME:tl:S/_v/-ttf-/} @@ -11,7 +11,6 @@ HOMEPAGE= https://sites.google.com/site/nihilistorguk/ COMMENT= Japanese Kanji characters stroke order font LICENSE= modified-bsd -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/kcfonts/Makefile b/fonts/kcfonts/Makefile index 2fb21d87b6d..fad7bc8e6f6 100644 --- a/fonts/kcfonts/Makefile +++ b/fonts/kcfonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/06/01 16:35:35 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2015/07/04 16:18:32 joerg Exp $ DISTNAME= kcfonts-1.05 PKGREVISION= 4 @@ -9,7 +9,6 @@ MAINTAINER= kevlo@midassol.com COMMENT= Kuo Chauo Chinese Fonts collection WRKSRC= ${WRKDIR} -USE_X11BASE= yes FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/local REQD_DIRS+= ${PREFIX}/share/fonts/X11/local diff --git a/fonts/kiloji-ttf/Makefile b/fonts/kiloji-ttf/Makefile index 288976754b3..84e3a17e2ea 100644 --- a/fonts/kiloji-ttf/Makefile +++ b/fonts/kiloji-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:35 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2015/07/04 16:18:32 joerg Exp $ DISTNAME= # empty PKGNAME= kiloji-ttf-2.1.0 @@ -16,7 +16,6 @@ HOMEPAGE= http://www.ez0.net/distribution/font/kiloji/ COMMENT= JIS X 0208 Japanese script fonts made by kilo LICENSE= modified-bsd # with some difference -USE_X11BASE= yes NO_CONFIGURE= yes NO_BUILD= yes diff --git a/fonts/ko-hanyang/Makefile b/fonts/ko-hanyang/Makefile index 8973612a7c1..972425793aa 100644 --- a/fonts/ko-hanyang/Makefile +++ b/fonts/ko-hanyang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/06/01 16:35:35 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:32 joerg Exp $ # DISTNAME= hanyang-font-pcf @@ -13,7 +13,6 @@ COMMENT= X11 fonts for KSC 5601 standard CONFLICTS+= ksc5601fonts-[0-9]* -USE_X11BASE= yes USE_TOOLS+= gzip EXTRACT_ONLY= # empty diff --git a/fonts/ko-kaist/Makefile b/fonts/ko-kaist/Makefile index cf8af8d563a..27d5aa1d63f 100644 --- a/fonts/ko-kaist/Makefile +++ b/fonts/ko-kaist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/06/01 16:35:35 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:32 joerg Exp $ # DISTNAME= ko-kaist-20010718 @@ -13,7 +13,6 @@ COMMENT= X11 fonts for Korean KSC 5601 standard (kaist foundry) CONFLICTS+= ksc5601fonts-[0-9]* -USE_X11BASE= yes USE_TOOLS+= gzip gunzip bdftopcf EXTRACT_ONLY= # empty diff --git a/fonts/ko-mizi/Makefile b/fonts/ko-mizi/Makefile index d800b623a83..9b966cf6438 100644 --- a/fonts/ko-mizi/Makefile +++ b/fonts/ko-mizi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2015/02/27 21:42:57 tnn Exp $ +# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:32 joerg Exp $ # DISTNAME= xfntmizi-1.1-2.noarch @@ -15,7 +15,6 @@ BUILD_DEPENDS+= rpm2cpio>=1.3:../../converters/rpm2cpio CONFLICTS+= ksc5601fonts-[0-9]* -USE_X11BASE= yes USE_TOOLS+= gzip gunzip MAKE_ENV+= FONTDIR=${FONTDIR:Q} GZIP_CMD=${GZIP_CMD:Q} diff --git a/fonts/konatu-ttf/Makefile b/fonts/konatu-ttf/Makefile index 574411d3688..47a6ed6857f 100644 --- a/fonts/konatu-ttf/Makefile +++ b/fonts/konatu-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:35 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2015/07/04 16:18:32 joerg Exp $ # DISTNAME= Konatu_ver_26 @@ -13,7 +13,6 @@ HOMEPAGE= http://www.masuseki.com/?u=be/konatu.htm COMMENT= Japanese TrueType gothic (sans-serif) fonts, Konatu fonts LICENSE= cc-by-sa-v3.0 -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/koruri-ttf/Makefile b/fonts/koruri-ttf/Makefile index 05e2d0b762c..929ae443c19 100644 --- a/fonts/koruri-ttf/Makefile +++ b/fonts/koruri-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2015/07/01 05:22:03 nonaka Exp $ +# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:32 joerg Exp $ # DISTNAME= Koruri-${KORURI_VERSION} @@ -14,7 +14,6 @@ LICENSE= apache-2.0 KORURI_VERSION= 20150701 -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/lohit-fonts/Makefile b/fonts/lohit-fonts/Makefile index abd104c5108..b8dafa75732 100644 --- a/fonts/lohit-fonts/Makefile +++ b/fonts/lohit-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/04/18 12:43:07 mef Exp $ +# $NetBSD: Makefile,v 1.5 2015/07/04 16:18:32 joerg Exp $ DISTNAME= lohit-fonts-2.3.8 CATEGORIES= fonts @@ -10,7 +10,6 @@ HOMEPAGE= https://fedorahosted.org/lohit COMMENT= Free fonts for Indian languages LICENSE= gnu-gpl-v2 -USE_X11BASE= yes NO_CONFIGURE= yes NO_BUILD= yes diff --git a/fonts/migu-ttf/Makefile b/fonts/migu-ttf/Makefile index ebd63f4b45c..203bc2b380b 100644 --- a/fonts/migu-ttf/Makefile +++ b/fonts/migu-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2015/06/29 11:06:46 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:32 joerg Exp $ # DISTNAME= # empty @@ -15,7 +15,6 @@ HOMEPAGE= http://mix-mplus-ipa.osdn.jp/ COMMENT= Fonts generated from M+ and IPA Gothic (Universal Design) LICENSE= ipafont -USE_X11BASE= yes NO_CONFIGURE= yes NO_BUILD= yes diff --git a/fonts/misaki-fonts/Makefile b/fonts/misaki-fonts/Makefile index c35934e0ed1..269aece92de 100644 --- a/fonts/misaki-fonts/Makefile +++ b/fonts/misaki-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:36 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:32 joerg Exp $ DISTNAME= misaki_bdf_2012-06-03 PKGNAME= ${DISTNAME:S/-//g:S/misaki_bdf_/misaki-fonts-1.0./} @@ -12,7 +12,6 @@ COMMENT= 8x8 dots X11 bitmap font for JIS X 0208 LICENSE= mplusfont WRKSRC= ${WRKDIR} -USE_X11BASE= YES NO_CONFIGURE= YES USE_TOOLS+= bdftopcf gzip diff --git a/fonts/monafonts-ttf/Makefile b/fonts/monafonts-ttf/Makefile index 556337292b2..9cf28d206ed 100644 --- a/fonts/monafonts-ttf/Makefile +++ b/fonts/monafonts-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:36 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2015/07/04 16:18:33 joerg Exp $ # $FreeBSD: ports/japanese/monafonts-ttf/Makefile,v 1.1 2003/10/14 13:35:38 nobutaka Exp $ DISTNAME= monafont-ttf-2.90 @@ -12,7 +12,6 @@ MAINTAINER= yamajun@ofug.net HOMEPAGE= http://monafont.sourceforge.net/index-e.html COMMENT= Japanese TrueType fonts for "Mona" seen at 2ch.net -USE_X11BASE= YES NO_BUILD= YES NO_CONFIGURE= YES diff --git a/fonts/motoya-fonts/Makefile b/fonts/motoya-fonts/Makefile index 8d46355a68c..c3bffa9c77f 100644 --- a/fonts/motoya-fonts/Makefile +++ b/fonts/motoya-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/06/01 16:35:36 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2015/07/04 16:18:33 joerg Exp $ # DISTNAME= motoya-fonts-20111115 @@ -13,7 +13,6 @@ COMMENT= Motoya L Cider W3 and L Mulberry W3 fonts LICENSE= apache-2.0 USE_LANGUAGES= # none -USE_X11BASE= YES NO_BUILD= YES FONTDIR= ${PREFIX}/share/fonts/X11/TTF diff --git a/fonts/ms-ttf/Makefile b/fonts/ms-ttf/Makefile index 3eee9ff9582..2fa39931d34 100644 --- a/fonts/ms-ttf/Makefile +++ b/fonts/ms-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/06/01 16:35:36 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:33 joerg Exp $ DISTNAME= # empty PKGNAME= ms-ttf-20020306 @@ -25,7 +25,6 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_CONFIGURE= yes NO_BUILD= yes -USE_X11BASE= yes DIST_SUBDIR= ms-ttf EVAL_PREFIX+= CABEXTRACT_PREFIX=cabextract CABEXTRACT_PREFIX_DEFAULT=${LOCALBASE} diff --git a/fonts/noto-ttf/Makefile b/fonts/noto-ttf/Makefile index d7046a64001..7a93c733a45 100644 --- a/fonts/noto-ttf/Makefile +++ b/fonts/noto-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2015/07/02 13:20:31 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2015/07/04 16:18:33 joerg Exp $ DISTNAME= noto-ttf-20150630 CATEGORIES= fonts @@ -12,7 +12,6 @@ COMMENT= Noto fonts for all languages LICENSE= apache-2.0 USE_LANGUAGES= # none -USE_X11BASE= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/noto-fonts-2015-06-30 diff --git a/fonts/profont/Makefile b/fonts/profont/Makefile index 0b28de21869..ed79febe82c 100644 --- a/fonts/profont/Makefile +++ b/fonts/profont/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/06/01 16:35:36 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2015/07/04 16:18:33 joerg Exp $ # DISTNAME= profontlinux @@ -14,7 +14,6 @@ COMMENT= Monospaced bitmap font readable in very small sizes NO_BUILD= yes NO_CONFIGURE= yes -USE_X11BASE= yes FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/misc INSTALLATION_DIRS= share/fonts/X11/misc diff --git a/fonts/proggy-fonts/Makefile b/fonts/proggy-fonts/Makefile index 2a247427915..806ccf101f7 100644 --- a/fonts/proggy-fonts/Makefile +++ b/fonts/proggy-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/06/01 16:35:36 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2015/07/04 16:18:33 joerg Exp $ DISTNAME= proggy-fonts-1 PKGREVISION= 1 @@ -14,7 +14,6 @@ LICENSE= mit WRKSRC= ${WRKDIR}/proggy-fonts NO_BUILD= yes NO_CONFIGURE= yes -USE_X11BASE= yes FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/misc INSTALLATION_DIRS= share/fonts/X11/misc diff --git a/fonts/ricty-ttf/Makefile b/fonts/ricty-ttf/Makefile index 221de1d47b4..83dc7a11c4c 100644 --- a/fonts/ricty-ttf/Makefile +++ b/fonts/ricty-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2015/03/19 23:41:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:33 joerg Exp $ DISTNAME= Ricty-3.2.4 PKGNAME= ${DISTNAME:S/Ricty/ricty-ttf/} @@ -23,7 +23,6 @@ RESTRICTED= Redistribution not permitted per open-font-license PERMISSION & CON NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} -USE_X11BASE= YES NO_CONFIGURE= YES INSTALLATION_DIRS= share/fonts/X11/TTF diff --git a/fonts/roboto-fonts/Makefile b/fonts/roboto-fonts/Makefile index df4508c26f6..f8d94c5d5a0 100644 --- a/fonts/roboto-fonts/Makefile +++ b/fonts/roboto-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/07/17 14:31:46 ryoon Exp $ +# $NetBSD: Makefile,v 1.6 2015/07/04 16:18:33 joerg Exp $ # DISTNAME= RobotoTTF @@ -17,7 +17,6 @@ DIST_SUBDIR= ${PKGNAME_NOREV} WRKSRC= ${WRKDIR} USE_LANGUAGES= # none -USE_X11BASE= yes NO_BUILD= yes FONTDIR= ${PREFIX}/share/fonts/X11/TTF diff --git a/fonts/sgi-fonts/Makefile b/fonts/sgi-fonts/Makefile index 9bf83249623..3d4026f8966 100644 --- a/fonts/sgi-fonts/Makefile +++ b/fonts/sgi-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2015/03/15 18:42:12 tnn Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:33 joerg Exp $ # DISTNAME= sgi-fonts-1.0-457.src @@ -15,7 +15,6 @@ COMMENT= Linux compatibility package for SGI fonts WRKSRC= ${WRKDIR}/sgi-fonts USE_LANGUAGES= c -USE_X11BASE= yes FONTS_DIRS.x11= ${PREFIX}/share/fonts/X11/misc/sgi USE_IMAKE= yes diff --git a/fonts/sourcehansans-fonts/Makefile b/fonts/sourcehansans-fonts/Makefile index 35ecfdea4af..b67f285aece 100644 --- a/fonts/sourcehansans-fonts/Makefile +++ b/fonts/sourcehansans-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2014/07/17 14:52:08 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2015/07/04 16:18:33 joerg Exp $ DISTNAME= SourceHanSansOTF-1.000 PKGNAME= ${DISTNAME:S/SourceHanSansOTF/sourcehansans-fonts/} @@ -12,7 +12,6 @@ COMMENT= Set of Pan-CJK fonts from Adobe LICENSE= apache-2.0 USE_LANGUAGES= # none -USE_X11BASE= yes NO_BUILD= yes FONTDIR= ${PREFIX}/share/fonts/X11/TTF diff --git a/fonts/takao-ex-fonts-ttf/Makefile b/fonts/takao-ex-fonts-ttf/Makefile index 36d1475b8ce..bab3ad78f14 100644 --- a/fonts/takao-ex-fonts-ttf/Makefile +++ b/fonts/takao-ex-fonts-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2015/03/07 12:12:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2015/07/04 16:18:33 joerg Exp $ # DISTNAME= TakaoExFonts_00201.01 @@ -12,7 +12,6 @@ HOMEPAGE= https://launchpad.net/takao-fonts COMMENT= Takao Ex Fonts are based on IPA Ex fonts, and includes some bug fix LICENSE= ipafont -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/takao-fonts-ttf/Makefile b/fonts/takao-fonts-ttf/Makefile index d2f2bc17a14..06f2c12f67e 100644 --- a/fonts/takao-fonts-ttf/Makefile +++ b/fonts/takao-fonts-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/03/07 12:09:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.8 2015/07/04 16:18:33 joerg Exp $ # DISTNAME= TakaoFonts_00303.01 @@ -12,7 +12,6 @@ HOMEPAGE= https://launchpad.net/takao-fonts COMMENT= Takao fonts are based on IPA fonts, and includes some bug fix LICENSE= ipafont -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/type1inst/Makefile b/fonts/type1inst/Makefile index 9c8f8c0e611..3fe29ad573c 100644 --- a/fonts/type1inst/Makefile +++ b/fonts/type1inst/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2015/06/12 10:50:06 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:33 joerg Exp $ # DISTNAME= type1inst-0.6.1 @@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/xutils/} MAINTAINER= groo@NetBSD.org COMMENT= Automatically generate fonts.scale/fonts.dir for Type1 fonts -USE_X11BASE= yes USE_TOOLS+= perl:run REPLACE_PERL= t1embed type1inst diff --git a/fonts/umefont-ttf/Makefile b/fonts/umefont-ttf/Makefile index 0bf08c48cde..ad91aac6271 100644 --- a/fonts/umefont-ttf/Makefile +++ b/fonts/umefont-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2015/07/01 12:33:38 ryoon Exp $ +# $NetBSD: Makefile,v 1.52 2015/07/04 16:18:33 joerg Exp $ # DISTNAME= umefont_520 @@ -17,7 +17,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/([a-z]+)-//} CONFLICTS= umefont<=0.421 SUPERSEDES= umefont<=0.421 -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/un-core-ttf/Makefile b/fonts/un-core-ttf/Makefile index 1b5fcf07651..bfefd442ce6 100644 --- a/fonts/un-core-ttf/Makefile +++ b/fonts/un-core-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:37 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:34 joerg Exp $ DISTNAME= un-fonts-core-1.0.2-080608 PKGNAME= ${DISTNAME:S/fonts-core/core-ttf/:S/-0/.200/} @@ -13,7 +13,6 @@ COMMENT= Core set of Un Korean TrueType fonts CONFLICTS+= un-ttf-[0-9]* WRKSRC= ${WRKDIR}/un-fonts -USE_X11BASE= yes NO_CONFIGURE= yes NO_BUILD= yes diff --git a/fonts/un-extra-ttf/Makefile b/fonts/un-extra-ttf/Makefile index 69f64f5ab31..ef5e10c3d16 100644 --- a/fonts/un-extra-ttf/Makefile +++ b/fonts/un-extra-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:37 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2015/07/04 16:18:34 joerg Exp $ DISTNAME= un-fonts-extra-1.0.2-080608 PKGNAME= ${DISTNAME:S/fonts-extra/extra-ttf/:S/-0/.200/} @@ -13,7 +13,6 @@ COMMENT= Extra set of Un Korean TrueType fonts CONFLICTS+= un-ttf-[0-9]* WRKSRC= ${WRKDIR}/un-fonts -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/vera-ttf/Makefile b/fonts/vera-ttf/Makefile index 08658d7251f..181d760e662 100644 --- a/fonts/vera-ttf/Makefile +++ b/fonts/vera-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2014/06/01 16:35:37 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:34 joerg Exp $ # DISTNAME= ttf-bitstream-vera-1.10 @@ -12,7 +12,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnome.org/fonts/ COMMENT= Bitstream Vera TrueType fonts -USE_X11BASE= YES NO_CONFIGURE= YES NO_BUILD= YES diff --git a/fonts/vlgothic-ttf/Makefile b/fonts/vlgothic-ttf/Makefile index ca9328922b3..8289b775d62 100644 --- a/fonts/vlgothic-ttf/Makefile +++ b/fonts/vlgothic-ttf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2015/06/29 11:06:46 ryoon Exp $ +# $NetBSD: Makefile,v 1.28 2015/07/04 16:18:34 joerg Exp $ # DISTNAME= VLGothic-20141206 @@ -12,7 +12,6 @@ HOMEPAGE= http://vlgothic.dicey.org/ COMMENT= Free Japanese TrueType fonts named 'VLGothic' LICENSE= modified-bsd AND mplusfont -USE_X11BASE= YES NO_BUILD= YES NO_CONFIGURE= YES diff --git a/fonts/xmbdfed/Makefile b/fonts/xmbdfed/Makefile index 43dc518f315..90101a0492f 100644 --- a/fonts/xmbdfed/Makefile +++ b/fonts/xmbdfed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/01/19 20:23:34 riastradh Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:34 joerg Exp $ DISTNAME= xmbdfed-4.5 PKGREVISION= 5 @@ -9,8 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://crl.nmsu.edu/~mleisher/xmbdfed.html COMMENT= Motif-based BDF font editor with lots of features -USE_X11BASE= YES - INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: diff --git a/fonts/xmbdfed/distinfo b/fonts/xmbdfed/distinfo index bf81afd7075..d7fac5ea4b0 100644 --- a/fonts/xmbdfed/distinfo +++ b/fonts/xmbdfed/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2014/03/22 22:26:44 spz Exp $ +$NetBSD: distinfo,v 1.8 2015/07/04 16:18:34 joerg Exp $ SHA1 (xmbdfed-4.5.tar.gz) = 325f2f3a8ae68b3f5d22ff9bdd115d30cdd743db RMD160 (xmbdfed-4.5.tar.gz) = a6c1d9202e6d978dbc0aaa1fb6389a3d14b16c26 Size (xmbdfed-4.5.tar.gz) = 282055 bytes -SHA1 (patch-aa) = 9c01eb9c4d160e8747fe2f9d68bb16a2b6afc197 +SHA1 (patch-aa) = 55740a6f3bf01bf149bc953078a0cf75eea4dc11 SHA1 (patch-ab) = 2ddd129850dfc53e46ba0df8d62239ffb5fac0eb SHA1 (patch-ac) = c62140d171ea96418d48ee4b236cde8bb87b545d diff --git a/fonts/xmbdfed/patches/patch-aa b/fonts/xmbdfed/patches/patch-aa index 998058b4097..089f43f7385 100644 --- a/fonts/xmbdfed/patches/patch-aa +++ b/fonts/xmbdfed/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2013/10/20 18:10:11 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2015/07/04 16:18:34 joerg Exp $ --- Makefile.orig Fri Mar 17 05:08:49 2000 +++ Makefile Wed Mar 20 00:37:53 2002 @@ -14,8 +14,8 @@ $NetBSD: patch-aa,v 1.3 2013/10/20 18:10:11 joerg Exp $ -#FTYPE_INCS = -I/usr/local/include -#FTYPE_LIBS = -L/user/local/lib -lttf -#FTYPE_DEFS = -DHAVE_FREETYPE -+FTYPE_INCS = -I${X11PREFIX}/include/freetype -+FTYPE_LIBS = -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -lttf ++FTYPE_INCS = -I${X11BASE}/include/freetype ++FTYPE_LIBS = -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -lttf +FTYPE_DEFS = -DHAVE_FREETYPE @@ -66,3 +66,3 @@ @@ -25,8 +25,8 @@ $NetBSD: patch-aa,v 1.3 2013/10/20 18:10:11 joerg Exp $ @@ -73,2 +73,6 @@ -+INCS = -I${X11PREFIX}/include -I${PREFIX}/include ${FTYPE_INCS} -+LIBS = -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib \ ++INCS = -I${X11BASE}/include -I${PREFIX}/include ${FTYPE_INCS} ++LIBS = -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib \ + -lXm -lXmu -lXt -lXext -lX11 ${FTYPE_LIBS} + # diff --git a/games/abuse/Makefile b/games/abuse/Makefile index 7258c0c0547..f58d905e629 100644 --- a/games/abuse/Makefile +++ b/games/abuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2015/01/04 02:55:02 dholland Exp $ +# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:34 joerg Exp $ DISTNAME= abuse_pd PKGNAME= abuse-2.0 @@ -11,7 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= # AWOL COMMENT= Full color 320x200 arcade quality platform shooter -USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LDFLAGS=${X11_LDFLAGS:Q} USE_TOOLS+= gmake gtar diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile index c58bd7f0eaa..05a071236a3 100644 --- a/games/finalbattle/Makefile +++ b/games/finalbattle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/06 11:54:37 asau Exp $ +# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:34 joerg Exp $ # DISTNAME= finalbattle.0.0 @@ -15,8 +15,6 @@ COMMENT= Multiplayer space battle simulation for X WRKSRC= ${WRKDIR}/final MAKE_FILE= makefile -USE_X11BASE= yes - INSTALLATION_DIRS+= bin .include "../../x11/libX11/buildlink3.mk" diff --git a/games/golddig/Makefile b/games/golddig/Makefile index 80ebf3ace86..907342f678d 100644 --- a/games/golddig/Makefile +++ b/games/golddig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/06 11:54:42 asau Exp $ +# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:34 joerg Exp $ # DISTNAME= golddigC3.1 @@ -10,8 +10,6 @@ MASTER_SITES= http://www.NetBSD.org/~chuck/gz/ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Fast action game designed for use with X -USE_X11BASE= yes - INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ MAN=${DESTDIR}${PREFIX}/${PKGMANDIR}/man6 diff --git a/games/imaze/Makefile b/games/imaze/Makefile index 7c98ecded65..948ce2a6b1b 100644 --- a/games/imaze/Makefile +++ b/games/imaze/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2012/10/06 11:54:43 asau Exp $ +# $NetBSD: Makefile,v 1.30 2015/07/04 16:18:34 joerg Exp $ DISTNAME= imaze1.3 PKGNAME= imaze-1.3 @@ -14,7 +14,6 @@ COMMENT= Multiplayer, networked, action,x 3D maze game EXTRACT_ONLY= imaze1.3.tar.Z WRKSRC= ${WRKDIR}/imaze -USE_X11BASE= yes USE_TOOLS+= pax INSTALLATION_DIRS= bin lib/X11/app-defaults ${PKGMANDIR}/man6 diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile index 41c0e1b034d..0477e851538 100644 --- a/games/maelstrom-x11/Makefile +++ b/games/maelstrom-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2014/08/21 11:47:17 jperkin Exp $ +# $NetBSD: Makefile,v 1.28 2015/07/04 16:18:34 joerg Exp $ DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz PKGNAME= maelstrom-x11-2.0.6 @@ -24,7 +24,6 @@ EXTRACT_ONLY= ${DISTNAME} WRKSRC= ${WRKDIR}/Maelstrom USE_LANGUAGES= c c++ USE_TOOLS+= pax -USE_X11BASE= YES LDFLAGS.SunOS+= -lsocket -lnsl LIBS.SunOS+= -lsocket -lnsl MAKE_FLAGS+= EXTRALIBS=${LIBS:Q} diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile index 14a4a302d82..4601becf96a 100644 --- a/games/spellcast/Makefile +++ b/games/spellcast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/10/06 11:54:55 asau Exp $ +# $NetBSD: Makefile,v 1.15 2015/07/04 16:18:34 joerg Exp $ # DISTNAME= spellcast @@ -12,7 +12,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.eblong.com/zarf/spellcast.html COMMENT= Game of dueling wizards for two players -USE_X11BASE= yes INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 .include "../../x11/libX11/buildlink3.mk" diff --git a/games/tanked/distinfo b/games/tanked/distinfo index a679d51c064..0d0e272dd9d 100644 --- a/games/tanked/distinfo +++ b/games/tanked/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2010/06/25 22:38:40 joerg Exp $ +$NetBSD: distinfo,v 1.9 2015/07/04 16:18:34 joerg Exp $ SHA1 (tanked-0.90.tar.gz) = 781e4d23e5b59bfff53e921e9b20d94a15609f23 RMD160 (tanked-0.90.tar.gz) = 5473310798a9cf4a7403bd90fe9a7c241920baa1 Size (tanked-0.90.tar.gz) = 151105 bytes SHA1 (patch-aa) = 29d6f519832103df13517ffe611f2d68b4a97553 SHA1 (patch-ab) = f25cd592b5571c4e35d9e3160a1f5bcfacee1ad7 -SHA1 (patch-ac) = 097e1252deabeb2a6a9b9981bfb51b9c6c409672 +SHA1 (patch-ac) = 4d944d7380757e40c706bf0062b766dd72460ea9 SHA1 (patch-ad) = 09931ca419399dbcbcea690381f7b68916fb0efa SHA1 (patch-ae) = 8244fbccb0e9109ec246e32f97844400dd9167a5 SHA1 (patch-af) = c6bd8d7766639f0ef4e8ed6818cf736928410f17 diff --git a/games/tanked/patches/patch-ac b/games/tanked/patches/patch-ac index 5354f77cc85..89e1acf9cdd 100644 --- a/games/tanked/patches/patch-ac +++ b/games/tanked/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2002/10/21 12:11:05 wiz Exp $ +$NetBSD: patch-ac,v 1.4 2015/07/04 16:18:34 joerg Exp $ --- server/Makefile.orig Sun Apr 12 04:18:42 1998 +++ server/Makefile @@ -9,7 +9,7 @@ $NetBSD: patch-ac,v 1.3 2002/10/21 12:11:05 wiz Exp $ -EXTRAFLAGS = -g -Wall -DLIFE -DLIFEFREQ=300 +EXTRAFLAGS = -g -Wall -DLIFE -DLIFEFREQ=300 -DTANKDIR=\"$(TANKDIR)\" + -+TANKDIR= $(X11PREFIX)/share/tanked ++TANKDIR= $(PREFIX)/share/tanked INCLUDES = -I../common diff --git a/games/xboing/distinfo b/games/xboing/distinfo index f7d22457894..8da4e64d185 100644 --- a/games/xboing/distinfo +++ b/games/xboing/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.11 2010/02/14 21:52:53 joerg Exp $ +$NetBSD: distinfo,v 1.12 2015/07/04 16:18:35 joerg Exp $ SHA1 (xboing2.4.tar.gz) = 57fad37ab99e6a3ff87ff814d0de1baad3b93b91 RMD160 (xboing2.4.tar.gz) = 3aa027dd7a7abe9b4119362a1c8b5fb968971567 Size (xboing2.4.tar.gz) = 588811 bytes -SHA1 (patch-aa) = d28a7f42480fba31f703ef1e4327142de3b7579b +SHA1 (patch-aa) = 06048ae0ac114f6f929dcac93807f5981ec3ec98 SHA1 (patch-ab) = 70d125ef4d34ad0dc92556b59cf6e4165d96004c SHA1 (patch-ac) = 97ac52a5f8095178f690a33df6ede70498c28fb7 SHA1 (patch-ad) = 444331ce4cbca8e291331bc3d5e698e9f01d8f6e diff --git a/games/xboing/patches/patch-aa b/games/xboing/patches/patch-aa index e4166552271..f132428ad98 100644 --- a/games/xboing/patches/patch-aa +++ b/games/xboing/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.10 2010/02/14 21:52:53 joerg Exp $ +$NetBSD: patch-aa,v 1.11 2015/07/04 16:18:35 joerg Exp $ --- Imakefile.orig 1996-11-22 01:28:46.000000000 +0000 +++ Imakefile @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.10 2010/02/14 21:52:53 joerg Exp $ XCOMM placed. Default will be the current directory. - XBOING_DIR = . -+ XBOING_DIR = ${DESTDIR}$(X11PREFIX)/share/xboing ++ XBOING_DIR = ${DESTDIR}$(PREFIX)/share/xboing XCOMM These are some defines that must be set. Some may be overwritten in the XCOMM machine arch section. diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 0b94b7611e2..2d4f5984f7d 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2014/01/11 14:42:03 adam Exp $ +# $NetBSD: Makefile,v 1.46 2015/07/04 16:18:35 joerg Exp $ DISTNAME= xconq-7.4.1 PKGREVISION= 13 @@ -9,7 +9,6 @@ MAINTAINER= kleink@NetBSD.org HOMEPAGE= http://sources.redhat.com/xconq/ COMMENT= Xconq is a general strategy game system -USE_X11BASE= YES USE_TOOLS+= gmake makeinfo GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-alternate-scoresdir=${SCOREDIR} diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index 2db914356c3..fbbf02a3ff3 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2015/01/04 03:08:30 dholland Exp $ +# $NetBSD: Makefile,v 1.52 2015/07/04 16:18:35 joerg Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10 @@ -17,7 +17,6 @@ LICENSE= xdoom-license DEPENDS+= doom1-[0-9]*:../../games/doom1 WRKSRC= ${WRKDIR} -USE_X11BASE= yes USE_TOOLS+= gmake gunzip tar unzip MAKE_ENV+= X11BASE=${X11BASE:Q} INSTALL_PREFIX=${PREFIX:Q} diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile index 2d1e837b95e..cb1729625dc 100644 --- a/games/xfreecell/Makefile +++ b/games/xfreecell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 10:24:05 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:35 joerg Exp $ DISTNAME= xfreecell-1.0.5b PKGREVISION= 2 @@ -10,7 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www2.giganet.net/~nakayama/ COMMENT= Popular freecell card game for X -USE_X11BASE= yes USE_TOOLS+= gmake USE_LANGUAGES= c++ MAKE_FILE= makefile diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile index c8aa5f5c59d..4ca34bbd676 100644 --- a/games/xpuyopuyo/Makefile +++ b/games/xpuyopuyo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2012/10/06 11:55:02 asau Exp $ +# $NetBSD: Makefile,v 1.45 2015/07/04 16:18:35 joerg Exp $ DISTNAME= xpuyopuyo-0.9.1 PKGREVISION= 9 @@ -11,7 +11,6 @@ HOMEPAGE= http://chaos2.org/xpuyopuyo/ COMMENT= Tetris-like puzzle game USE_TOOLS+= automake autoconf gmake -USE_X11BASE= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/games/xtris/Makefile b/games/xtris/Makefile index 9eb5f39b702..95f09a2955d 100644 --- a/games/xtris/Makefile +++ b/games/xtris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/10/06 11:55:04 asau Exp $ +# $NetBSD: Makefile,v 1.21 2015/07/04 16:18:35 joerg Exp $ # DISTNAME= xtris-1.15 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.iagora.com/~espel/xtris/xtris.html COMMENT= Multi-player version of a popular game for the X Window system WRKSRC= ${WRKDIR}/xtris -USE_X11BASE= yes LIBS.SunOS+= -lsocket -lnsl MAKE_ENV+= LIBS=${LIBS:Q} diff --git a/games/xzip/Makefile b/games/xzip/Makefile index d153a1b932d..0445c928446 100644 --- a/games/xzip/Makefile +++ b/games/xzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2012/10/06 11:55:04 asau Exp $ +# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:35 joerg Exp $ DISTNAME= xzip180 PKGNAME= xzip-1.8 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.eblong.com/zarf/xzip.html COMMENT= Z-code interpreter for X11 (Infocom game format) WRKSRC= ${WRKDIR}/xzip -USE_X11BASE= yes BUILD_TARGET= xzip INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 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 diff --git a/inputmethod/Chinput/Makefile b/inputmethod/Chinput/Makefile index 1ca697067e9..a61b75fa6c9 100644 --- a/inputmethod/Chinput/Makefile +++ b/inputmethod/Chinput/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/06 14:25:10 asau Exp $ +# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:36 joerg Exp $ DISTNAME= Chinput-3.0 PKGREVISION= 3 @@ -9,8 +9,6 @@ MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://www.opencjk.org/~yumj/project-chinput.html COMMENT= Chinese input server -USE_X11BASE= yes - BUILD_TARGET= chinput INSTALLATION_DIRS= bin etc diff --git a/inputmethod/xcin/Makefile b/inputmethod/xcin/Makefile index 5ab7cab5bc7..51d173cc156 100644 --- a/inputmethod/xcin/Makefile +++ b/inputmethod/xcin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2015/06/12 10:50:15 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2015/07/04 16:18:37 joerg Exp $ DISTNAME= xcin-2.5.3.pre2 PKGNAME= xcin-2.5.3rc2 @@ -17,7 +17,6 @@ WRKSRC= ${WRKDIR}/xcin USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt pax perl:run -USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-db-lib=${BDBBASE}/lib diff --git a/mail/faces/Makefile b/mail/faces/Makefile index 971a3070534..c2bfbc76e0d 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2015/06/12 10:50:19 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2015/07/04 16:18:37 joerg Exp $ DISTNAME= faces-1.6.1 PKGREVISION= 9 @@ -19,7 +19,6 @@ DEPENDS+= netpbm>=9.2:../../graphics/netpbm CONFLICTS= compface-[0-9]* WRKSRC= ${WRKDIR}/faces -USE_X11BASE= YES USE_LIBTOOL= YES USE_TOOLS+= perl:run yacc diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile index aa573a89312..67631a3d94c 100644 --- a/mail/wmmail/Makefile +++ b/mail/wmmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2013/04/06 03:45:16 rodent Exp $ +# $NetBSD: Makefile,v 1.39 2015/07/04 16:18:37 joerg Exp $ DISTNAME= WMMail.app-0.64 PKGNAME= wmmail-0.64 @@ -11,7 +11,6 @@ COMMENT= WindowMaker xbiff-like "mail-checker" DEPENDS+= windowmaker>=0.80.0nb1:../../wm/windowmaker -USE_X11BASE= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-PL-incs="-I${LOCALBASE}/include" \ diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile index dceff32a445..2c4988ac6f2 100644 --- a/mail/xbuffy/Makefile +++ b/mail/xbuffy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/08 12:19:35 asau Exp $ +# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:37 joerg Exp $ # DISTNAME= xbuffy-3.4 @@ -10,7 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Replacement for xbiff that handles multiple mail files GNU_CONFIGURE= YES -USE_X11BASE= YES CPPFLAGS+= -I${X11BASE}/include CPPFLAGS+= -Wall diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index f1b65e3e77a..03af77c2371 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2013/01/26 21:38:09 adam Exp $ +# $NetBSD: Makefile,v 1.55 2015/07/04 16:18:37 joerg Exp $ DISTNAME= xfmail-1.5.5 PKGREVISION= 7 @@ -13,7 +13,6 @@ COMMENT= Xforms based mail application for Unix operating systems # A few files are. #LICENSE+= mit-license -USE_X11BASE= YES USE_LANGUAGES= c c++ USE_LIBTOOL= yes GNU_CONFIGURE= YES diff --git a/math/abs/Makefile b/math/abs/Makefile index 041a6e0e601..cfc08b04cfa 100644 --- a/math/abs/Makefile +++ b/math/abs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2012/09/11 23:04:16 asau Exp $ +# $NetBSD: Makefile,v 1.24 2015/07/04 16:18:37 joerg Exp $ # DISTNAME= abs-src-0.8 @@ -12,7 +12,6 @@ HOMEPAGE= http://home.scarlet.be/~pin01858/abs.html COMMENT= Free spreadsheet with graphical user interface LICENSE= gnu-gpl-v2 -USE_X11BASE= YES MAKE_FILE= Makefile.netBSD INSTALLATION_DIRS= bin diff --git a/math/grace/Makefile b/math/grace/Makefile index 0c4173b6d00..3146f05d499 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2014/02/12 23:18:11 tron Exp $ +# $NetBSD: Makefile,v 1.59 2015/07/04 16:18:37 joerg Exp $ DISTNAME= grace-5.1.23 PKGREVISION= 4 @@ -12,7 +12,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://plasma-gate.weizmann.ac.il/Grace/ COMMENT= GRaphing, Advanced Computation and Exploration of data -USE_X11BASE= YES USE_TOOLS+= gmake USE_LANGUAGES= c fortran77 GNU_CONFIGURE= YES diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 7b2eedfd7eb..ab17a9f0dbd 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2015/06/30 11:52:58 jaapb Exp $ +# $NetBSD: Makefile,v 1.97 2015/07/04 16:18:37 joerg Exp $ # DISTNAME= ${SCIBASE}-src @@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/${SCIBASE} BROKEN_ON_PLATFORM+= ${LP64PLATFORMS} USE_LANGUAGES= c fortran77 -USE_X11BASE= yes USE_LIBTOOL= yes USE_TOOLS+= tee diff --git a/math/vista/Makefile b/math/vista/Makefile index dbe91345a15..759a1682fae 100644 --- a/math/vista/Makefile +++ b/math/vista/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/09/11 23:04:35 asau Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:37 joerg Exp $ # DISTNAME= vista @@ -16,7 +16,6 @@ DEPENDS+= xlispstat>=3.52.9:../../math/xlispstat MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/vista-5.0.5 -USE_X11BASE= yes USE_TOOLS+= gmake .include "../../mk/bsd.pkg.mk" diff --git a/math/xeukleides10/Makefile b/math/xeukleides10/Makefile index 9e5c3ca359f..b08449b1b4a 100644 --- a/math/xeukleides10/Makefile +++ b/math/xeukleides10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/06/10 12:29:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.3 2015/07/04 16:18:37 joerg Exp $ DISTNAME= xeukleides.1.0.1 PKGNAME= xeukleides-1.0.1 @@ -14,7 +14,6 @@ MAKE_JOBS_SAFE= no DEPENDS+= eukleides>=1.0.1:../../math/eukleides10 -USE_X11BASE= yes BUILD_TARGET= xeukleides USE_TOOLS+= gmake flex bison diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile index 484c507bf85..296db3b4f7b 100644 --- a/math/xldlas/Makefile +++ b/math/xldlas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2013/01/26 21:38:12 adam Exp $ +# $NetBSD: Makefile,v 1.39 2015/07/04 16:18:37 joerg Exp $ DISTNAME= xldlas-0.85 PKGREVISION= 9 @@ -11,7 +11,6 @@ HOMEPAGE= # http://sunsite.math.klte.hu/mirrors/xldlas/ COMMENT= XForms-based statistics package WRKSRC= ${WRKDIR}/xldlas -USE_X11BASE= yes INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile index 9cb111282f3..18108eb77d2 100644 --- a/math/xlispstat/Makefile +++ b/math/xlispstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2015/01/01 11:10:15 dholland Exp $ +# $NetBSD: Makefile,v 1.26 2015/07/04 16:18:37 joerg Exp $ DISTNAME= xlispstat-3-52-20 PKGNAME= xlispstat-3.52.20 @@ -13,7 +13,6 @@ COMMENT= Statistics/X11-based LISP interpreter MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes -USE_X11BASE= yes BROKEN_ON_PLATFORM= *-*-alpha # core dumps diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile index c6ccb3af3df..a05b40d05cf 100644 --- a/math/xmgr/Makefile +++ b/math/xmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2015/06/12 10:50:32 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2015/07/04 16:18:37 joerg Exp $ DISTNAME= xmgr-4.1.2 PKGREVISION= 12 @@ -10,7 +10,6 @@ HOMEPAGE= http://plasma-gate.weizmann.ac.il/Xmgr/ COMMENT= Powerful XY plotting tool for workstations or X-terminals using X LICENSE= modified-bsd -USE_X11BASE= YES USE_LANGUAGES= c fortran77 GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-acegr-home=${PREFIX:Q} diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile index d6562a35cc2..458be7e950b 100644 --- a/mbone/rat/Makefile +++ b/mbone/rat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2014/09/10 19:02:13 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2015/07/04 16:18:37 joerg Exp $ # DISTNAME= rat-3.0.28 @@ -12,7 +12,6 @@ COMMENT= Robust Audio Tool - multicast audioconferencing CRYPTO= yes USE_TOOLS+= gmake -USE_X11BASE= yes USER= build diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile index f3fd01de31d..b3a480602c0 100644 --- a/misc/astrolog/Makefile +++ b/misc/astrolog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2012/10/08 09:57:16 asau Exp $ +# $NetBSD: Makefile,v 1.39 2015/07/04 16:18:38 joerg Exp $ DISTNAME= ast54unx PKGNAME= astrolog-5.40 @@ -21,8 +21,6 @@ WRKSRC= ${WRKDIR} EPHEM= LRZ5_24 CHI_24 CPJV_24 EXTRACT_ONLY= ${DISTNAME}.shr -USE_X11BASE= yes - DIST_SUBDIR= astrolog BUILD_TARGET= astrolog diff --git a/misc/bbappconf/Makefile b/misc/bbappconf/Makefile index 882ffea2b26..95b652f1164 100644 --- a/misc/bbappconf/Makefile +++ b/misc/bbappconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/10/08 09:57:16 asau Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:38 joerg Exp $ # DISTNAME= bbappconf-0.0.2 @@ -11,7 +11,6 @@ HOMEPAGE= http://bbtools.sourceforge.net/download.php?file=1 COMMENT= Configure the behaviour of an application under Blackbox USE_LANGUAGES= c c++ -USE_X11BASE= YES GNU_CONFIGURE= YES INSTALLATION_DIRS= ${PKGMANDIR}/man1 diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 19cbdb74b2f..c09c93c1970 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.59 2015/05/04 19:23:19 joerg Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.60 2015/07/04 16:18:38 joerg Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -47,18 +47,11 @@ PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX:Q} .endif .if defined(USE_IMAKE) -USE_X11BASE?= implied MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} .endif -.if defined(USE_X11BASE) && ${X11_TYPE} != "modular" -. include "x11.buildlink3.mk" -.endif - .if defined(INSTALLATION_PREFIX) PREFIX= ${INSTALLATION_PREFIX} -.elif defined(USE_X11BASE) -PREFIX= ${X11PREFIX} .elif defined(USE_CROSSBASE) PREFIX= ${CROSSBASE} .else diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index edd787f6628..2e363ce5947 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.365 2015/06/04 15:48:46 sevan Exp $ +# $NetBSD: bsd.prefs.mk,v 1.366 2015/07/04 16:18:38 joerg Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -659,8 +659,6 @@ CROSSBASE?= ${LOCALBASE}/cross X11BASE= ${LOCALBASE} .endif -X11PREFIX= ${LOCALBASE} - # Default directory for font encodings .if ${X11_TYPE} == "modular" X11_ENCODINGSDIR?= ${X11BASE}/share/fonts/X11/encodings diff --git a/mk/build/bsd.build-vars.mk b/mk/build/bsd.build-vars.mk index c86c9a9a052..57424f352a7 100644 --- a/mk/build/bsd.build-vars.mk +++ b/mk/build/bsd.build-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.build-vars.mk,v 1.8 2012/12/06 11:36:31 jperkin Exp $ +# $NetBSD: bsd.build-vars.mk,v 1.9 2015/07/04 16:18:38 joerg Exp $ # # Package-settable variables: # @@ -37,7 +37,6 @@ MAKE_ENV+= LOCALBASE=${LOCALBASE:Q} MAKE_ENV+= NO_WHOLE_ARCHIVE_FLAG=${NO_WHOLE_ARCHIVE_FLAG:Q} MAKE_ENV+= WHOLE_ARCHIVE_FLAG=${WHOLE_ARCHIVE_FLAG:Q} MAKE_ENV+= X11BASE=${X11BASE:Q} -MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} MAKE_ENV+= PKGMANDIR=${PKGMANDIR:Q} MAKE_ENV+= PKGINFODIR=${PKGINFODIR:Q} MAKE_ENV+= PKGGNUDIR=${PKGGNUDIR:Q} diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 6a798cef914..31f72fe29cc 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.256 2015/04/19 09:21:33 tnn Exp $ +# $NetBSD: mk.conf,v 1.257 2015/07/04 16:18:38 joerg Exp $ # # This file provides default values for variables that may be overridden @@ -302,7 +302,7 @@ VARBASE?= /var # Where Motif-2.0-compatible headers and libraries are installed # on the system. # Possible: any path -# Default: ${X11PREFIX} or where motif, openmotif or lesstif is installed +# Default: ${X11BASE} or where motif, openmotif or lesstif is installed PKGINFODIR?= info # The subdirectory of PREFIX that holds the GNU info files and the diff --git a/mk/help/directories.help b/mk/help/directories.help index cce2d0fc24b..27fe2f7d4a1 100644 --- a/mk/help/directories.help +++ b/mk/help/directories.help @@ -1,4 +1,4 @@ -# $NetBSD: directories.help,v 1.3 2015/07/04 15:46:18 joerg Exp $ +# $NetBSD: directories.help,v 1.4 2015/07/04 16:18:38 joerg Exp $ # # This file contains some short documentation on the directories that # are used within pkgsrc. @@ -6,15 +6,14 @@ # PREFIX # This is the directory where the package should install its # files. The actual value depends on the variables -# INSTALLATION_PREFIX, USE_X11BASE and USE_CROSSBASE. +# INSTALLATION_PREFIX and USE_CROSSBASE. # # Tags: read-only, system-defined, non-overridable, etc. # # See also: # CROSSBASE, # INSTALLATION_PREFIX, -# LOCALBASE, -# X11PREFIX. +# LOCALBASE. # # LOCALBASE diff --git a/mk/pkgformat/pkg/metadata.mk b/mk/pkgformat/pkg/metadata.mk index 6327452ab8d..45ad0ad8496 100644 --- a/mk/pkgformat/pkg/metadata.mk +++ b/mk/pkgformat/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.11 2015/02/16 10:17:47 jperkin Exp $ +# $NetBSD: metadata.mk,v 1.12 2015/07/04 16:18:38 joerg Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -236,7 +236,6 @@ MESSAGE_SUBST+= PKGNAME=${PKGNAME} \ EMULDIR=${EMULDIR} \ EMULSUBDIR=${EMULSUBDIR} \ LOCALBASE=${LOCALBASE} \ - X11PREFIX=${X11PREFIX} \ X11BASE=${X11BASE} \ PKG_SYSCONFDIR=${PKG_SYSCONFDIR} \ ROOT_GROUP=${REAL_ROOT_GROUP} \ diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index 625343558c7..d003a52fe8c 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: plist.mk,v 1.48 2014/12/30 15:13:20 wiz Exp $ +# $NetBSD: plist.mk,v 1.49 2015/07/04 16:18:38 joerg Exp $ # # This Makefile fragment handles the creation of PLISTs for use by # pkg_create(8). @@ -162,7 +162,6 @@ PLIST_SUBST+= OPSYS=${OPSYS:Q} \ LOCALBASE=${LOCALBASE:Q} \ VIEWBASE=${VIEWBASE:Q} \ X11BASE=${X11BASE:Q} \ - X11PREFIX=${X11PREFIX:Q} \ CHGRP=${CHGRP:Q} \ CHMOD=${CHMOD:Q} \ CHOWN=${CHOWN:Q} \ diff --git a/mk/x11.version.mk b/mk/x11.version.mk index 44fc20de2d5..64aec2739ff 100644 --- a/mk/x11.version.mk +++ b/mk/x11.version.mk @@ -1,4 +1,4 @@ -# $NetBSD: x11.version.mk,v 1.11 2010/09/11 20:46:11 wiz Exp $ +# $NetBSD: x11.version.mk,v 1.12 2015/07/04 16:18:38 joerg Exp $ # # This file must not be included directly. # It is included automatically by mk/x11.buildlink3.mk. @@ -35,7 +35,6 @@ _VARGROUPS+= x11 _USER_VARS.x11= X11_TYPE X11BASE -_PKG_VARS.x11= USE_X11BASE _SYS_VARS.x11= X11_PKGSRCDIR.${X11_TYPE} BUILTIN_X11_TYPE.${X11_TYPE} BUILTIN_X11_VERSION.${X11_TYPE} X11_PKGSRCDIR.native= ../../pkgtools/x11-links diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile index c6946a26a85..c48b86caeda 100644 --- a/multimedia/alevt/Makefile +++ b/multimedia/alevt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/02/16 11:23:30 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:38 joerg Exp $ DISTNAME= alevt-1.6.1 PKGREVISION= 3 @@ -15,7 +15,6 @@ ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \ NetBSD-1.5_ALPHA-* NetBSD-1.[56]*-* \ NetBSD-[2-9]*-* DragonFly-*-* -USE_X11BASE= YES USE_TOOLS+= gmake INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/pixmaps diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile index dd0c8a76630..431376ad665 100644 --- a/multimedia/dvd-slideshow/Makefile +++ b/multimedia/dvd-slideshow/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/08/12 18:22:06 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2015/07/04 16:18:38 joerg Exp $ DISTNAME= dvd-slideshow-0.7.5 PKGREVISION= 12 @@ -20,7 +20,6 @@ DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick DEPENDS+= mjpegtools-[0-9]*:../../multimedia/mjpegtools DEPENDS+= ffmpeg1-[0-9]*:../../multimedia/ffmpeg1 -USE_X11BASE= yes USE_TOOLS+= bash:run NO_BUILD= yes SCRIPTS= dvd-slideshow dvd-menu dir2slideshow gallery1-to-slideshow \ 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" diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink index beff63e0cc9..a4e5ee88bc5 100755 --- a/pkgtools/createbuildlink/files/createbuildlink +++ b/pkgtools/createbuildlink/files/createbuildlink @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: createbuildlink,v 1.35 2010/01/13 15:27:52 wiz Exp $ +# $NetBSD: createbuildlink,v 1.36 2015/07/04 16:18:39 joerg Exp $ # # Copyright (c) 2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -39,7 +39,7 @@ # Create an initial buildlink3.mk from a package's Makefile and PLIST # -REV=`echo '$Revision: 1.35 $' | sed 's/\\$//g'` +REV=`echo '$Revision: 1.36 $' | sed 's/\\$//g'` tmpdir=/tmp spacesintab=8 makefile=Makefile @@ -90,13 +90,7 @@ PKGNAME=`@MAKE@ show-var VARNAME=PKGNAME` PKGVER=`echo $PKGNAME | sed -e 's/^.*-//'` PKGNOVER=`echo $PKGNAME | sed -e 's/-[^-]*$//'` PKGUPPER=`echo $PKGNOVER | tr '[:lower:]' '[:upper:]' | tr - _` -PREFIX=X11PREFIX -USE_X11BASE=`@MAKE@ show-var VARNAME=USE_X11BASE` -if [ -z "$USE_X11BASE" ]; then - if ! grep "^USE_X11BASE" $makefile $commons > /dev/null; then - PREFIX=LOCALBASE - fi -fi +PREFIX=LOCALBASE ## ## create sed rules diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile index 9d3961ac4c2..2c69a6e1460 100644 --- a/pkgtools/pkg_filecheck/Makefile +++ b/pkgtools/pkg_filecheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2015/06/12 10:50:56 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2015/07/04 16:18:39 joerg Exp $ # PKGNAME= pkg_filecheck-0.4 @@ -14,7 +14,6 @@ WRKSRC= ${WRKDIR} USE_TOOLS+= perl:run USE_FEATURES= fts_open -FILES_SUBST+= X11PREFIX=${X11PREFIX:Q} FILES_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q} CONF_FILES= ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \ ${PKG_SYSCONFDIR}/pkg_filecheck.conf @@ -27,7 +26,6 @@ SUBST_FILES.paths= builddb.pl builddb.1 pkg_filecheck.conf SUBST_FILES.paths+= pkg_filecheck.conf.5 pkg_filecheck.c pkg_filecheck.1 SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' SUBST_SED.paths+= -e 's,@PERL5@,${PERL5},g' -SUBST_SED.paths+= -e 's,@X11PREFIX@,${X11PREFIX},g' SUBST_SED.paths+= -e 's,@PKG_DBDIR@,${PKG_DBDIR},g' SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' SUBST_STAGE.paths= post-patch diff --git a/pkgtools/pkg_filecheck/files/pkg_filecheck.conf b/pkgtools/pkg_filecheck/files/pkg_filecheck.conf index 07308a43c15..fc601e272c6 100644 --- a/pkgtools/pkg_filecheck/files/pkg_filecheck.conf +++ b/pkgtools/pkg_filecheck/files/pkg_filecheck.conf @@ -1,4 +1,4 @@ -# $NetBSD: pkg_filecheck.conf,v 1.3 2006/07/02 10:32:09 rillig Exp $ +# $NetBSD: pkg_filecheck.conf,v 1.4 2015/07/04 16:18:39 joerg Exp $ # location of package database dir @PKG_DBDIR@ @@ -7,12 +7,6 @@ db pkgdb.byfile.db # installation prefix for packages check @PREFIX@ -# If not using xpkgwedge: -# xdb.byfile.db has to be created by running builddb -#db xdb.byfile.db -# installation prefix for X11-based packages -#check @X11PREFIX@ - ignore @PREFIX@/etc ignore @PREFIX@/var/scrollkeeper ignore @PKG_DBDIR@ diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index 8398e48bd24..d42c414b7a6 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.266 2015/07/03 09:52:04 abs Exp $ +# $NetBSD: makevars.map,v 1.267 2015/07/04 16:18:39 joerg Exp $ # # This file contains the guessed type of some variables, according to @@ -757,7 +757,6 @@ USE_PKGLOCALEDIR YesNo [$package] USE_PKGSRC_GCC Yes [$user] USE_TOOLS List of Tool [*:a] USE_X11 Yes [$package] -USE_X11BASE Yes [$package] WARNING_MSG ShellCommand [$system] WARNING_CAT ShellCommand [$system] WRAPPER_REORDER_CMDS List of WrapperReorder [b:a,c:a,m:a] @@ -765,6 +764,5 @@ WRAPPER_TRANSFORM_CMDS List of WrapperTransform [b:a,c:a,m:a] WRKDIR Pathname [$system] WRKSRC WrkdirSubdirectory [$package] X11_PKGSRCDIR.* Pathname [$system] -X11PREFIX Pathname [$system] XAW_TYPE { 3d neXtaw standard xpm } [$user] XMKMF_FLAGS List of ShellWord diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 0db7e05b030..03f7025a193 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.231 2015/07/04 08:07:28 wiz Exp $ +# $NetBSD: Makefile,v 1.232 2015/07/04 16:18:39 joerg Exp $ DISTNAME= openssh-6.6p1 PKGNAME= openssh-6.6.1 @@ -119,14 +119,14 @@ CONFIGURE_ARGS+= --disable-utmp --disable-wtmp CONFIGURE_ARGS+= --enable-md5-password .endif -# The ssh-askpass program is in ${X11BASE}/bin or ${X11PREFIX}/bin depending +# The ssh-askpass program is in ${X11BASE}/bin or ${PREFIX}/bin depending # on if it's part of the X11 distribution, or if it's installed from pkgsrc # (security/ssh-askpass). # .if exists(${X11BASE}/bin/ssh-askpass) ASKPASS_PROGRAM= ${X11BASE}/bin/ssh-askpass .else -ASKPASS_PROGRAM= ${X11PREFIX}/bin/ssh-askpass +ASKPASS_PROGRAM= ${PREFIX}/bin/ssh-askpass .endif CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q} MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q} @@ -135,7 +135,7 @@ MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q} .if exists(${X11BASE}/bin/xauth) CONFIGURE_ARGS+= --with-xauth=${X11BASE}/bin/xauth .else -CONFIGURE_ARGS+= --with-xauth=${X11PREFIX}/bin/xauth +CONFIGURE_ARGS+= --with-xauth=${PREFIX}/bin/xauth .endif CONFS= ssh_config sshd_config moduli diff --git a/sysutils/bbsload/Makefile b/sysutils/bbsload/Makefile index 8d3b840312c..13005f2522f 100644 --- a/sysutils/bbsload/Makefile +++ b/sysutils/bbsload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/23 19:50:52 asau Exp $ +# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:39 joerg Exp $ # DISTNAME= bbsload-0.2.6 @@ -12,7 +12,6 @@ COMMENT= Small (in dimensions) tool to display the average load GNU_CONFIGURE= YES USE_LANGUAGES= c c++ -USE_X11BASE= YES INSTALLATION_DIRS= ${PKGMANDIR}/man1 diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index 51a2b85c182..053696946f1 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2014/10/09 14:07:01 wiz Exp $ +# $NetBSD: Makefile,v 1.73 2015/07/04 16:18:40 joerg Exp $ DISTNAME= xosview-1.8.3 PKGREVISION= 2 @@ -9,7 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.pogo.org.uk/~mark/xosview/ COMMENT= X11 graphical display of OS statistics -USE_X11BASE= YES USE_LANGUAGES= c c++ HAS_CONFIGURE= YES diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile index 728a94f296d..1fc552863e4 100644 --- a/time/asclock-gtk/Makefile +++ b/time/asclock-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2015/05/03 19:47:49 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2015/07/04 16:18:40 joerg Exp $ # DISTNAME= asclock-gtk-2.1.10beta @@ -13,7 +13,6 @@ COMMENT= Dockable clock and calendar with themes for GTK+ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL WRKSRC= ${WRKDIR}/asclock-gtk -USE_X11BASE= yes PLIST_SRC= ${PKGDIR}/PLIST \ ${PKGDIR}/PLIST.themes diff --git a/time/bbdate/distinfo b/time/bbdate/distinfo index df9f0ad6384..f8cb73446d1 100644 --- a/time/bbdate/distinfo +++ b/time/bbdate/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 19:14:53 wiz Exp $ +$NetBSD: distinfo,v 1.4 2015/07/04 16:18:40 joerg Exp $ SHA1 (bbdate-0.2.4.tar.gz) = c48052eec337dfdca5fdfe6b87cd2bccf3a03921 RMD160 (bbdate-0.2.4.tar.gz) = a6af9817069f09fe359679feb6128be8b7096d0d Size (bbdate-0.2.4.tar.gz) = 60644 bytes -SHA1 (patch-aa) = f3dcd43ff15b065b2e4e63a07743178490c1634d +SHA1 (patch-aa) = b4a13b2e0493967463270b9f5782117642261320 SHA1 (patch-ab) = 4ba9c43992b476e8d515fb56fb18dad586533a3a diff --git a/time/bbdate/patches/patch-aa b/time/bbdate/patches/patch-aa index 880082a79b2..4f083ac68d3 100644 --- a/time/bbdate/patches/patch-aa +++ b/time/bbdate/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2004/08/27 06:29:10 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2015/07/04 16:18:40 joerg Exp $ --- Makefile.in.orig Fri Jul 18 11:31:51 2003 +++ Makefile.in Fri Jul 18 11:32:49 2003 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2004/08/27 06:29:10 jlam Exp $ DEFS = @DEFS@ -I. -I$(srcdir) -LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib ++LDFLAGS = @LDFLAGS@ ${COMPILER_RPATH_FLAG}${X11BASE}/lib LIBS = @LIBS@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile index 78facae895f..e1aef90c808 100644 --- a/time/cardboard-schedule/Makefile +++ b/time/cardboard-schedule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/04/06 12:04:02 rodent Exp $ +# $NetBSD: Makefile,v 1.30 2015/07/04 16:18:40 joerg Exp $ # DISTNAME= cs113ins @@ -18,8 +18,6 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -USE_X11BASE= yes - USE_TOOLS+= pax gtar .include "../../mk/bsd.prefs.mk" diff --git a/time/dclock/Makefile b/time/dclock/Makefile index 5df3aa111ee..07de9c85a2e 100644 --- a/time/dclock/Makefile +++ b/time/dclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/08 13:04:17 asau Exp $ +# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:40 joerg Exp $ # DISTNAME= dclock @@ -14,7 +14,6 @@ COMMENT= Digital clock for X CONFLICTS+= ivtools-* WRKSRC= ${WRKDIR} -USE_X11BASE= yes INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/time/gnyaclock/distinfo b/time/gnyaclock/distinfo index 8d1830c7759..bdabdace182 100644 --- a/time/gnyaclock/distinfo +++ b/time/gnyaclock/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 19:14:54 wiz Exp $ +$NetBSD: distinfo,v 1.4 2015/07/04 16:18:40 joerg Exp $ SHA1 (gnya.shar) = 8d5ba47445bc28eb1cf5019d1e1cd0fd38b025c5 RMD160 (gnya.shar) = f23bf47732b51ea03fbe4cabc13d20bcc9848247 Size (gnya.shar) = 46266 bytes -SHA1 (patch-aa) = 886cb708df64f04d4a13b24ca584c3480a5c835f +SHA1 (patch-aa) = c289b86e19aeb455974411a8b7a866ecd186f20b SHA1 (patch-ab) = 6c79cb5d3d7eff42e0f5418c061feefac1672524 diff --git a/time/gnyaclock/patches/patch-aa b/time/gnyaclock/patches/patch-aa index 443b8ea0651..5d8bf0a911c 100644 --- a/time/gnyaclock/patches/patch-aa +++ b/time/gnyaclock/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/18 12:35:48 kei Exp $ +$NetBSD: patch-aa,v 1.2 2015/07/04 16:18:40 joerg Exp $ --- Imakefile.orig Mon Dec 18 13:41:06 2000 +++ Imakefile Mon Dec 18 13:42:16 2000 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/18 12:35:48 kei Exp $ */ #ifdef SUPPORT_XPM - EXTRA_INCLUDES = -I/usr/local/include -+ EXTRA_INCLUDES = -I${X11PREFIX}/include ++ EXTRA_INCLUDES = -I${X11BASE}/include XPM_LIBRARY = -lXpm #endif diff --git a/time/plan/Makefile b/time/plan/Makefile index 32e2e90f591..88394619571 100644 --- a/time/plan/Makefile +++ b/time/plan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2014/02/16 15:41:54 wiedi Exp $ +# $NetBSD: Makefile,v 1.33 2015/07/04 16:18:40 joerg Exp $ DISTNAME= plan-1.9 PKGREVISION= 1 @@ -11,7 +11,6 @@ COMMENT= Schedule planner based on X/Motif WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_TOOLS+= yacc lex -USE_X11BASE= YES BUILD_TARGET= ${LOWER_OPSYS} INSTALLATION_DIRS= libexec/plan ${PKGMANDIR}/man1 ${PKGMANDIR}/man4 \ diff --git a/time/rclock/Makefile b/time/rclock/Makefile index a75ae043ae6..0106f271b1c 100644 --- a/time/rclock/Makefile +++ b/time/rclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/10/08 13:04:28 asau Exp $ +# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:40 joerg Exp $ DISTNAME= rxvt-2.7.10 PKGNAME= rclock-2.7.10 @@ -10,7 +10,6 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Analog clock for X w/appointment reminder and mail notification -USE_X11BASE= yes GNU_CONFIGURE= yes BUILD_TARGET= clock diff --git a/time/titrax/Makefile b/time/titrax/Makefile index e610191737e..61acfa24949 100644 --- a/time/titrax/Makefile +++ b/time/titrax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2015/06/12 10:51:46 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2015/07/04 16:18:40 joerg Exp $ # DISTNAME= titrax-1.98 @@ -23,7 +23,6 @@ USE_TOOLS+= perl:run pre-configure: ${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.bak ${SED} -e "s|@LOCALBASE@|${PREFIX}|g" \ - -e "s|@X11BASE@|${X11PREFIX}|g" \ ${WRKSRC}/Imakefile.bak > ${WRKSRC}/Imakefile INSTALLATION_DIRS= libexec/titrax diff --git a/time/wmfishtime/Makefile b/time/wmfishtime/Makefile index 8053c594c6c..ebc72c56467 100644 --- a/time/wmfishtime/Makefile +++ b/time/wmfishtime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/10/08 13:04:30 asau Exp $ +# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:40 joerg Exp $ # DISTNAME= wmfishtime-1.24 @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ne.jp/asahi/linux/timecop/ COMMENT= Dockable clock application with clock, date and fish -USE_X11BASE= yes - INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 .include "../../devel/libgetopt/buildlink3.mk" diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile index 6c0165c5d49..4b8355f5515 100644 --- a/time/wmmoonclock/Makefile +++ b/time/wmmoonclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/10/23 10:24:12 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:40 joerg Exp $ DISTNAME= wmMoonClock-1.27 PKGREVISION= 1 @@ -11,7 +11,6 @@ COMMENT= Shows lunar ephemeris to fairly high accuracy WRKSRC= ${WRKDIR}/${DISTNAME}/Src USE_TOOLS+= gmake -USE_X11BASE= YES MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q} diff --git a/wm/aewm++/distinfo b/wm/aewm++/distinfo index 143ce189e01..774153d04f0 100644 --- a/wm/aewm++/distinfo +++ b/wm/aewm++/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2015/03/13 16:50:37 tnn Exp $ +$NetBSD: distinfo,v 1.7 2015/07/04 16:18:40 joerg Exp $ SHA1 (aewm++-1.0.24.tar.bz2) = 366da85a5edf47e3214c772007aebb2daf7d18d0 RMD160 (aewm++-1.0.24.tar.bz2) = 6e37b29343948f469dcceba90732209b4b7324b9 Size (aewm++-1.0.24.tar.bz2) = 36642 bytes -SHA1 (patch-aa) = 9ca0d09a37893c8de049fcaa9eff7e2958c317b8 +SHA1 (patch-aa) = 0594007d3da7e03ab41a52103985a8fc68f3b0e3 SHA1 (patch-ab) = fb68b8580de648b9af46f0e994388bb586294644 SHA1 (patch-client.cc) = ab9d467920ecb1d402e33cb3ee429264ab42f9a8 SHA1 (patch-main.cc) = 4cbc321d877543aa1224c8c2548df85335e9b2ef diff --git a/wm/aewm++/patches/patch-aa b/wm/aewm++/patches/patch-aa index 3bc024e1649..14f20a80448 100644 --- a/wm/aewm++/patches/patch-aa +++ b/wm/aewm++/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2015/03/13 16:50:37 tnn Exp $ +$NetBSD: patch-aa,v 1.4 2015/07/04 16:18:41 joerg Exp $ --- Makefile.orig 2002-11-15 23:28:08.000000000 +0000 +++ Makefile @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.3 2015/03/13 16:50:37 tnn Exp $ -INCLUDES = -I$(prefix)/include -LDPATH = -L/usr/X11R6/lib +prefix = ${PREFIX} -+INCLUDES = -I${X11PREFIX}/include ++INCLUDES = -I${X11BASE}/include +LDPATH = ${LDFLAGS} LIBS = -lXext -lX11 diff --git a/wm/fvwm-themes/Makefile b/wm/fvwm-themes/Makefile index f65046563d0..76f719fcfc8 100644 --- a/wm/fvwm-themes/Makefile +++ b/wm/fvwm-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2015/06/12 10:51:47 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2015/07/04 16:18:41 joerg Exp $ # DISTNAME= fvwm-themes-${THEM_VER} @@ -20,7 +20,6 @@ THEM_VER= 0.6.2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_TOOLS+= perl:run -USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-ft-datadir=${PREFIX}/share/fvwm2 diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile index c1214df6df9..d45cf0b725b 100644 --- a/wm/fvwm/Makefile +++ b/wm/fvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2015/06/12 10:51:47 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2015/07/04 16:18:41 joerg Exp $ DISTNAME= fvwm-${FVWM_VER} PKGREVISION= 6 @@ -18,7 +18,6 @@ CONFLICTS= fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]* xpmroot-[0-9]* EXTRACT_ONLY= ${DISTNAME}.tar.gz FVWM_VER= 2.6.5 -USE_X11BASE= YES GNU_CONFIGURE= YES USE_TOOLS+= perl:run tar diff --git a/wm/icewmconf/Makefile b/wm/icewmconf/Makefile index b9a4cbbfc2d..db14ac52981 100644 --- a/wm/icewmconf/Makefile +++ b/wm/icewmconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/08 12:42:21 asau Exp $ +# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:41 joerg Exp $ DISTNAME= icewmconf-2.1.0 PKGREVISION= 2 @@ -22,7 +22,7 @@ post-extract: post-patch: ${MV} ${FILENAME} ${FILENAME}.orig - ${SED} 's#PREFIX#${X11PREFIX}#g' \ + ${SED} 's#PREFIX#${PREFIX}#g' \ < ${FILENAME}.orig > ${FILENAME} do-install: diff --git a/wm/spectrwm/Makefile b/wm/spectrwm/Makefile index 502d491339b..a126fc413cc 100644 --- a/wm/spectrwm/Makefile +++ b/wm/spectrwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/01/14 08:30:41 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2015/07/04 16:18:41 joerg Exp $ DISTNAME= spectrwm-2.5.1 CATEGORIES= wm @@ -25,8 +25,8 @@ MAKE_FLAGS+= MANINSTALL=maninstall CFLAGS+= -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so.0.0\" .else USE_TOOLS+= gmake -CFLAGS+= -I${X11PREFIX}/include -LDFLAGS+= -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib +CFLAGS+= -I${PREFIX}/include +LDFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} . if ${OPSYS} == "Darwin" BUILD_DIRS= osx diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile index e0769b291d1..055e64d46b1 100644 --- a/wm/wm2/Makefile +++ b/wm/wm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/10/23 10:24:16 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2015/07/04 16:18:41 joerg Exp $ DISTNAME= wm2-4 PKGNAME= wm2-4.0 @@ -14,7 +14,6 @@ BUILD_TARGET= depend wm2 USE_TOOLS+= makedepend USE_LANGUAGES= c c++ -USE_X11BASE= YES MAKE_ENV+= CCC=${CXX:Q} INSTALLATION_DIRS= bin share/doc/wm2 diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile index 38894ad74b6..5db3d49c59c 100644 --- a/wm/wmakerconf/Makefile +++ b/wm/wmakerconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2015/06/12 10:51:47 wiz Exp $ +# $NetBSD: Makefile,v 1.77 2015/07/04 16:18:41 joerg Exp $ DISTNAME= wmakerconf-2.11 PKGREVISION= 40 @@ -11,7 +11,6 @@ COMMENT= Gtk+ based configuration tool for Window Maker LICENSE= gnu-gpl-v2 USE_PKGLOCALEDIR= yes -USE_X11BASE= yes GNU_CONFIGURE= yes USE_TOOLS+= gzip tar perl:run pkg-config msgfmt diff --git a/wm/wmextra/Makefile b/wm/wmextra/Makefile index 8b93edf25fe..6e7f3136a4e 100644 --- a/wm/wmextra/Makefile +++ b/wm/wmextra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/08 12:42:25 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:41 joerg Exp $ # DISTNAME= WindowMaker-extra-0.1 @@ -13,7 +13,6 @@ COMMENT= Extras for Window Maker window manager DEPENDS+= windowmaker>=0.80.0nb1:../../wm/windowmaker -USE_X11BASE= yes GNU_CONFIGURE= yes .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common index 50a05cc4bbd..72a97421879 100644 --- a/wm/wmx/Makefile.common +++ b/wm/wmx/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2014/10/09 14:07:09 wiz Exp $ +# $NetBSD: Makefile.common,v 1.25 2015/07/04 16:18:41 joerg Exp $ # # used by wm/wmx/Makefile # used by wm/wmx-gnome/Makefile @@ -14,7 +14,6 @@ HOMEPAGE= http://www.all-day-breakfast.com/wmx/ CONFLICTS+= wmx-[0-9]* wmx-gnome-[0-9]* USE_LANGUAGES= c c++ -USE_X11BASE= yes GNU_CONFIGURE= yes BUILD_TARGET= depend all diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile index cf85edf154b..7ee1316f101 100644 --- a/x11/XmHTML/Makefile +++ b/x11/XmHTML/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2013/02/16 11:18:09 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2015/07/04 16:18:41 joerg Exp $ # DISTNAME= XmHTML-1.1.7 @@ -11,7 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Motif Widget capable of displaying HTML 3.2 conforming text LICENSE= gnu-lgpl-v2 -USE_X11BASE= YES USE_TOOLS+= gmake USE_LIBTOOL= YES diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile index cc65276b551..4fa89c100f8 100644 --- a/x11/filerunner/Makefile +++ b/x11/filerunner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2014/01/20 19:20:09 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2015/07/04 16:18:41 joerg Exp $ DISTNAME= FileRunner-2.5.1 PKGNAME= ${DISTNAME:S/FileRunner/filerunner/} @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.cd.chalmers.se/~hch/filerunner.html COMMENT= Filemanager with FTP capabilities. Uses Tcl/Tk -USE_X11BASE= yes - INSTALLATION_DIRS= bin lib/FileRunner/bitmaps post-extract: diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile index fe1a8cb2dad..3f4d3f7d469 100644 --- a/x11/gtk+extra/Makefile +++ b/x11/gtk+extra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/12/23 11:57:06 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2015/07/04 16:18:41 joerg Exp $ DISTNAME= gtk+extra-0.99.17 PKGREVISION= 6 @@ -9,7 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://gtkextra.sourceforge.net/ COMMENT= Useful set of GTK+ widgets for creating GUIs -USE_X11BASE= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES USE_LIBTOOL= YES diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index b249b21ff93..3ec4438ea89 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.134 2015/06/12 10:52:17 wiz Exp $ +# $NetBSD: Makefile,v 1.135 2015/07/04 16:18:41 joerg Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 14 @@ -12,7 +12,6 @@ COMMENT= GIMP Toolkit v1 - libraries for building X11 user interfaces .include "../../mk/bsd.prefs.mk" -USE_X11BASE= yes USE_TOOLS+= gmake msgfmt perl USE_PKGLOCALEDIR= yes USE_LANGUAGES+= c99 diff --git a/x11/gtk2+extra/Makefile b/x11/gtk2+extra/Makefile index 42164217f1c..ffca5df21dc 100644 --- a/x11/gtk2+extra/Makefile +++ b/x11/gtk2+extra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2015/04/25 14:25:06 tnn Exp $ +# $NetBSD: Makefile,v 1.31 2015/07/04 16:18:41 joerg Exp $ # DISTNAME= gtk+extra-2.1.2 @@ -11,7 +11,6 @@ MAINTAINER= bouyer@NetBSD.org HOMEPAGE= http://gtkextra.sourceforge.net/ COMMENT= Useful set of GTK+ widgets for creating GUIs -USE_X11BASE= YES USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= YES diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile index 20f89b47bde..1d1c9de9dd4 100644 --- a/x11/imwheel/Makefile +++ b/x11/imwheel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/29 05:06:21 asau Exp $ +# $NetBSD: Makefile,v 1.17 2015/07/04 16:18:42 joerg Exp $ # DISTNAME= imwheel-0.9.9 @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://imwheel.sourceforge.net/ COMMENT= Tool which helps to use mousewheels -USE_X11BASE= YES - GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-gpm diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 884e959c38d..02b4e39efd2 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.189 2015/04/25 14:25:12 tnn Exp $ +# $NetBSD: Makefile,v 1.190 2015/07/04 16:18:42 joerg Exp $ DISTNAME= kdebase-${_KDE_VERSION} PKGREVISION= 38 @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --with-ldap="${BUILDLINK_PREFIX.openldap-client}" CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" CONFIGURE_ARGS+= --without-java CONFIGURE_ENV+= kde_cv_defines_imake_version=8 \ - kde_cv_defines_imake="XBINDIR=${X11PREFIX:Q}/bin XLIBDIR=${X11PREFIX:Q}/lib" \ + kde_cv_defines_imake="XBINDIR=${X11BASE:Q}/bin XLIBDIR=${X11BASE:Q}/lib" \ XMKMF=${TRUE} REPLACE_PERL+= kcontrol/keys/convertShortcuts.pl \ diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index a9bbbdbeb8d..30dd06f5ac9 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2015/06/18 06:02:42 dholland Exp $ +# $NetBSD: Makefile,v 1.104 2015/07/04 16:18:42 joerg Exp $ DISTNAME= lesstif-0.95.2 PKGREVISION= 5 @@ -14,7 +14,6 @@ CONFLICTS+= openmotif-[0-9]* USE_LIBTOOL= yes USE_TOOLS+= gmake -USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --disable-verbose diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile index f1d6953fb40..66a6a482471 100644 --- a/x11/neXtaw/Makefile +++ b/x11/neXtaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/29 05:06:41 asau Exp $ +# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:42 joerg Exp $ DISTNAME= neXtaw-0.15.1 PKGREVISION= 3 @@ -9,7 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://siag.nu/neXtaw/ COMMENT= NeXTstep-like widgets based on the Athena Widget set -USE_X11BASE= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index 3f4ebc1d063..85e522faeed 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2014/03/13 11:08:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.61 2015/07/04 16:18:42 joerg Exp $ PKGNAME= ${PYPKGPREFIX}-Tk-${PY_DISTVERSION} PKGREVISION= 4 @@ -18,8 +18,7 @@ PY_PATCHPLIST= yes PY_SETUP_SUBST+= BLPREFIX=${LOCALBASE} PY_SETUP_SUBST+= TCLRTPREFIX=${BUILDLINK_PREFIX.tcl} PY_SETUP_SUBST+= TKRTPREFIX=${BUILDLINK_PREFIX.tk} -PY_SETUP_SUBST+= X11PREFIX=${X11BASE} -PY_SETUP_SUBST+= X11RTPREFIX=${X11BASE} +PY_SETUP_SUBST+= X11BASE=${X11BASE} PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload .include "../../mk/bsd.prefs.mk" diff --git a/x11/py-Tk/files/setup.py b/x11/py-Tk/files/setup.py index 423bfda882c..3c710ba46c6 100644 --- a/x11/py-Tk/files/setup.py +++ b/x11/py-Tk/files/setup.py @@ -1,4 +1,4 @@ -# $NetBSD: setup.py,v 1.5 2015/05/27 20:46:34 wiz Exp $ +# $NetBSD: setup.py,v 1.6 2015/07/04 16:18:42 joerg Exp $ import distutils from distutils.core import setup, Extension @@ -11,10 +11,10 @@ tclrtlib = tclrtprefix + '/lib' tclincl = tclrtprefix + '/include/tcl/generic' tkrtprefix = '@TKRTPREFIX@' tkrtlib = tkrtprefix + '/lib' -x11prefix = '@X11PREFIX@' +x11prefix = '@X11BASE@' x11incl = x11prefix + '/include' x11lib = x11prefix + '/lib' -x11rtprefix = '@X11RTPREFIX@' +x11rtprefix = '@X11BASE@' x11rtlib = x11rtprefix + '/lib' setup( diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 2a6e9da6fb6..c24096bb9a8 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.77 2014/10/05 16:41:09 wiz Exp $ +# $NetBSD: Makefile.common,v 1.78 2015/07/04 16:18:42 joerg Exp $ # used by x11/qt3-docs/Makefile # used by x11/qt3-libs/Makefile # used by x11/qt3-tools/Makefile @@ -131,7 +131,6 @@ pre-configure: ${SED} \ -e 's:@LOCALBASE@:${LOCALBASE}:g' \ -e 's:@X11BASE@:${X11BASE}:g' \ - -e 's:@X11PREFIX@:${X11PREFIX}:g' \ -e 's:@LIBTOOL@:${LIBTOOL}:g' \ -e 's:@CC@:${CC}:g' \ -e 's:@CXX@:${CXX}:g' \ diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 4929f1473ba..d1e09537e1d 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# $NetBSD: qmake.conf,v 1.22 2008/10/08 09:35:27 wiz Exp $ -# $Id: qmake.conf,v 1.22 2008/10/08 09:35:27 wiz Exp $ +# $NetBSD: qmake.conf,v 1.23 2015/07/04 16:18:42 joerg Exp $ +# $Id: qmake.conf,v 1.23 2015/07/04 16:18:42 joerg Exp $ # # qmake configuration for netbsd-g++ (pkgsrc) # @@ -40,8 +40,8 @@ QMAKE_INCDIR_X11 = @X11BASE@/include QMAKE_LIBDIR_X11 = @X11BASE@/lib QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib -QMAKE_INCDIR_OPENGL = @X11PREFIX@/include -QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib +QMAKE_INCDIR_OPENGL = @X11BASE@/include +QMAKE_LIBDIR_OPENGL = @X11BASE@/lib QMAKE_LINK = @CXX@ QMAKE_LINK_SHLIB = @CXX@ diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index 715fa528334..bbde0812122 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.39 2015/05/27 21:36:02 wiz Exp $ +# $NetBSD: Makefile.common,v 1.40 2015/07/04 16:18:42 joerg Exp $ # used by x11/qt4-docs/Makefile # used by x11/qt4-libs/Makefile # used by x11/qt4-mng/Makefile @@ -143,7 +143,6 @@ CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline pre-configure: sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \ -e 's:@X11BASE@:${X11BASE}:g' \ - -e 's:@X11PREFIX@:${X11PREFIX}:g' \ -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ -e 's:@CC@:${CC:Q}:g' \ -e 's:@CXX@:${CXX:Q}:g' \ diff --git a/x11/qt4-libs/files/qmake.conf b/x11/qt4-libs/files/qmake.conf index f0624e40c0f..dbf29b36c4f 100644 --- a/x11/qt4-libs/files/qmake.conf +++ b/x11/qt4-libs/files/qmake.conf @@ -1,4 +1,4 @@ -# $NetBSD: qmake.conf,v 1.5 2011/01/12 07:07:07 adam Exp $ +# $NetBSD: qmake.conf,v 1.6 2015/07/04 16:18:42 joerg Exp $ # # qmake configuration for PkgSrc @@ -42,8 +42,8 @@ QMAKE_INCDIR_X11 = @X11BASE@/include QMAKE_LIBDIR_X11 = @X11BASE@/lib QMAKE_INCDIR_QT = $(QTDIR)/include QMAKE_LIBDIR_QT = $(QTDIR)/lib -QMAKE_INCDIR_OPENGL = @X11PREFIX@/include -QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib +QMAKE_INCDIR_OPENGL = @X11BASE@/include +QMAKE_LIBDIR_OPENGL = @X11BASE@/lib QMAKE_LINK = @CXX@ QMAKE_LINK_SHLIB = @CXX@ diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index ef722e9b26c..10e50ead274 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2015/06/12 10:52:19 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2015/07/04 16:18:42 joerg Exp $ DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} @@ -132,7 +132,6 @@ PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \ pre-configure: ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \ -e 's:@X11BASE@:${X11BASE}:g' \ - -e 's:@X11PREFIX@:${X11PREFIX}:g' \ -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ -e 's:@CC@:${CC:Q}:g' \ -e 's:@CXX@:${CXX:Q}:g' \ diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index 191bd5c6c3f..cd098aef4a7 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2012/10/29 05:06:47 asau Exp $ +# $NetBSD: Makefile,v 1.38 2015/07/04 16:18:42 joerg Exp $ DISTNAME= qwt-5.0.2 CATEGORIES= x11 @@ -11,7 +11,6 @@ COMMENT= Qt widget library for technical purposes MAKE_JOBS_SAFE= no -USE_X11BASE= yes USE_LANGUAGES= c++ USE_TOOLS+= gmake USE_LIBTOOL= yes diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 64a85416e4e..57bde0eed6f 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2014/10/09 14:07:15 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2015/07/04 16:18:42 joerg Exp $ DISTNAME= rxvt-2.7.10 PKGREVISION= 6 @@ -11,7 +11,6 @@ MAINTAINER= gcw@rxvt.org HOMEPAGE= http://sourceforge.net/projects/rxvt COMMENT= Low memory usage xterm replacement that supports color -USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-utmp \ diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile index 2f130cec1bc..50563191767 100644 --- a/x11/ssystem/Makefile +++ b/x11/ssystem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2015/04/25 14:25:20 tnn Exp $ +# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:42 joerg Exp $ # DISTNAME= ssystem-1.6 @@ -13,7 +13,6 @@ COMMENT= Solar System Flyby Simulator MAKE_JOBS_SAFE= no USE_TOOLS+= flex bison -USE_X11BASE= yes MAKE_FILE= Makefile.FreeBSD diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 206fb2d2825..f1bef102a29 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2014/08/21 15:52:00 jperkin Exp $ +# $NetBSD: Makefile,v 1.60 2015/07/04 16:18:43 joerg Exp $ DISTNAME= wdm-1.28 PKGREVISION= 18 @@ -10,7 +10,6 @@ HOMEPAGE= http://voins.program.ru/wdm/ COMMENT= WINGs display manager USE_TOOLS+= msgfmt -USE_X11BASE= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/x11/worker/Makefile b/x11/worker/Makefile index 9da97eae87c..213182ddff6 100644 --- a/x11/worker/Makefile +++ b/x11/worker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/29 05:06:56 asau Exp $ +# $NetBSD: Makefile,v 1.7 2015/07/04 16:18:43 joerg Exp $ # DISTNAME= worker-2.14.1 @@ -17,7 +17,6 @@ GNU_CONFIGURE= YES #DEPENDS+= xview-lib>=3.2.1:../../x11/xview-lib #DEPENDS+= xview-clients>=3.2.1:../../x11/xview-clients -USE_X11BASE= yes REPLACE_BASH+= scripts/*.sh scripts/*r USE_TOOLS+= bash:run diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile index ef96c6cb6a5..f73686ba21e 100644 --- a/x11/wterm/Makefile +++ b/x11/wterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2014/05/15 14:41:59 adam Exp $ +# $NetBSD: Makefile,v 1.57 2015/07/04 16:18:43 joerg Exp $ DISTNAME= wterm-6.2.9 PKGREVISION= 24 @@ -12,7 +12,6 @@ COMMENT= NeXTStep(tm) style X11 terminal emulator for WindowMaker MAKE_JOBS_SAFE= no GNU_CONFIGURE= YES -USE_X11BASE= YES CONFIGURE_ARGS+= --enable-utmp --enable-wtmp CONFIGURE_ARGS+= --enable-xpm-background --enable-transparency diff --git a/x11/xauth/builtin.mk b/x11/xauth/builtin.mk index f341ef50649..4100333b5f7 100644 --- a/x11/xauth/builtin.mk +++ b/x11/xauth/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2014/03/14 22:35:44 agc Exp $ +# $NetBSD: builtin.mk,v 1.2 2015/07/04 16:18:43 joerg Exp $ BUILTIN_PKG:= xauth @@ -65,5 +65,5 @@ USE_BUILTIN.xauth!= \ .if !empty(USE_BUILTIN.xauth:M[yY][eE][sS]) XAUTHBASE= ${X11BASE} .else -XAUTHBASE= ${X11PREFIX} +XAUTHBASE= ${PREFIX} .endif diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile index 42a8050abcf..6fcba4ca8de 100644 --- a/x11/xfstt/Makefile +++ b/x11/xfstt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2014/11/12 15:24:16 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2015/07/04 16:18:43 joerg Exp $ DISTNAME= xfstt-1.9.1 CATEGORIES= x11 net fonts @@ -11,7 +11,6 @@ COMMENT= TrueType font server for X11 LICENSE= gnu-gpl-v2 USE_LANGUAGES= c c++ -USE_X11BASE= YES USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= YES diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile index 9ad132d7f9b..505b3dc041b 100644 --- a/x11/xglobe/Makefile +++ b/x11/xglobe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2015/04/25 14:25:25 tnn Exp $ +# $NetBSD: Makefile,v 1.47 2015/07/04 16:18:43 joerg Exp $ # DISTNAME= xglobe-0.5 @@ -20,7 +20,6 @@ DIST_SUBDIR= xglobe MAPS= LE.400.gif Brill.400.gif mggd.gif EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_X11BASE= YES USE_TOOLS+= gmake USE_LANGUAGES= c++ diff --git a/x11/xjman/Makefile b/x11/xjman/Makefile index 062a189ce2f..756c6339fe7 100644 --- a/x11/xjman/Makefile +++ b/x11/xjman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/29 05:07:12 asau Exp $ +# $NetBSD: Makefile,v 1.16 2015/07/04 16:18:43 joerg Exp $ DISTNAME= xjman-0.5 PKGREVISION= 2 @@ -13,7 +13,6 @@ COMMENT= Japanized X manual from "The X Japanese Documentation Project" DEPENDS+= ja-man-[0-9]*:../../misc/ja-man WRKSRC= ${WRKDIR}/man/ja_JP.eucJP -USE_X11BASE= yes PLIST_SRC= ${WRKDIR}/PLIST XJMANDIR= man/ja_JP.EUC MAKE_ENV+= XJMANDIR=${XJMANDIR:Q} diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile index 56f330865f4..de9e835d59b 100644 --- a/x11/xkbset/Makefile +++ b/x11/xkbset/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2015/06/12 10:52:19 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:43 joerg Exp $ # DISTNAME= xkbset-0.5 @@ -10,7 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.math.missouri.edu/~stephen/software/#xkbset COMMENT= Manages XKB features of the X window system -USE_X11BASE= yes USE_TOOLS+= perl:run REPLACE_PERL= xkbset-gui diff --git a/x11/xkbset/distinfo b/x11/xkbset/distinfo index 186bcb4be39..606baa488fd 100644 --- a/x11/xkbset/distinfo +++ b/x11/xkbset/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2012/11/25 21:37:50 shattered Exp $ +$NetBSD: distinfo,v 1.7 2015/07/04 16:18:43 joerg Exp $ SHA1 (xkbset-0.5.tar.gz) = aa2f067e0963f351323b947bfbdfdb0be9e7d52d RMD160 (xkbset-0.5.tar.gz) = be1b29d9dc695b5c4848c0ac78c170b6c2ce5d67 Size (xkbset-0.5.tar.gz) = 13933 bytes -SHA1 (patch-aa) = 149bc1e2c4b141b836b52c125d6d92fc8b9537b8 +SHA1 (patch-aa) = a5214bc6d84b2c96ed52d07fbcb73dc16ea42a13 diff --git a/x11/xkbset/patches/patch-aa b/x11/xkbset/patches/patch-aa index bce60c6bcca..9d5105eb9d5 100644 --- a/x11/xkbset/patches/patch-aa +++ b/x11/xkbset/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2012/11/25 21:37:50 shattered Exp $ +$NetBSD: patch-aa,v 1.5 2015/07/04 16:18:43 joerg Exp $ --- Makefile.orig 2002-11-24 23:14:18.000000000 +0000 +++ Makefile @@ -6,8 +6,10 @@ $NetBSD: patch-aa,v 1.4 2012/11/25 21:37:50 shattered Exp $ -X11PREFIX=/usr/X11R6 -X11BASE=/usr/X11R6 - - INSTALL_BIN=${DESTDIR}${X11PREFIX}/bin - INSTALL_MAN1=${DESTDIR}${X11PREFIX}/man/man1 +-INSTALL_BIN=${DESTDIR}${X11PREFIX}/bin +-INSTALL_MAN1=${DESTDIR}${X11PREFIX}/man/man1 ++INSTALL_BIN=${DESTDIR}${PREFIX}/bin ++INSTALL_MAN1=${DESTDIR}${PREFIX}/man/man1 INC_PATH=-I${X11BASE}/include -LIB_PATH=-L${X11BASE}/lib diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index 56fb06a7265..9390739bceb 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.73 2015/04/15 07:31:15 spz Exp $ +# $NetBSD: Makefile.common,v 1.74 2015/07/04 16:18:43 joerg Exp $ # # used by x11/xlockmore/Makefile # used by x11/xlockmore-lite/Makefile @@ -35,7 +35,6 @@ PKG_OPTIONS_LEGACY_VARS+=XLOCK_NO_DPMS:-xlockmore-dpms USE_LANGUAGES= c c++ USE_TOOLS+= xmkmf -USE_X11BASE= YES XLOCK_SOUNDDIR= ${PREFIX}/lib/X11/xlock/sounds XLOCK_MODULEDIR= ${PREFIX}/lib/X11/xlock/modules diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile index 97214fa9dd1..f771d9f7d41 100644 --- a/x11/xmove/Makefile +++ b/x11/xmove/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/29 05:07:16 asau Exp $ +# $NetBSD: Makefile,v 1.19 2015/07/04 16:18:43 joerg Exp $ # DISTNAME= xmove.2.0beta2 @@ -17,7 +17,7 @@ XMOVEDOCDIR= ${PREFIX}/share/doc/xmove INSTALLATION_DIRS= ${XMOVEDOCDIR} pre-configure: - @${SED} -e 's|@x11base@|'${X11PREFIX}'|' < ${WRKSRC}/xmove/Imakefile > ${WRKSRC}/xmove/Imakefile.new && \ + @${SED} -e 's|@x11base@|'${PREFIX}'|' < ${WRKSRC}/xmove/Imakefile > ${WRKSRC}/xmove/Imakefile.new && \ ${MV} ${WRKSRC}/xmove/Imakefile.new ${WRKSRC}/xmove/Imakefile ${CP} ${WRKSRC}/man/man1/xmove.1 ${WRKSRC}/xmove/xmove.man ${CP} ${WRKSRC}/man/man1/xmovectrl.1 ${WRKSRC}/xmovectrl/xmovectrl.man diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile index abf317b341b..3c79f046b4a 100644 --- a/x11/xnodecor/Makefile +++ b/x11/xnodecor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/10/29 05:07:17 asau Exp $ +# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:43 joerg Exp $ DISTNAME= xnodecor PKGNAME= xnodecor-0.1 @@ -11,7 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= # none COMMENT= Borderless or undecorated window support utility -USE_X11BASE= yes NO_CONFIGURE= yes WRKSRC= ${WRKDIR} diff --git a/x11/xpmicons/Makefile b/x11/xpmicons/Makefile index b542d093c42..acbd3426c1d 100644 --- a/x11/xpmicons/Makefile +++ b/x11/xpmicons/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/29 05:07:18 asau Exp $ +# $NetBSD: Makefile,v 1.26 2015/07/04 16:18:43 joerg Exp $ DISTNAME= xpmicons-1.0 PKGREVISION= 5 @@ -16,7 +16,6 @@ COMMENT= Huge collection of icons for any windowmanager WRKSRC= ${WRKDIR} DIST_SUBDIR= icons -USE_X11BASE= yes NO_BUILD= yes INSTALLATION_DIRS= include/X11/bitmaps include/X11/pixmaps diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index 803934ba46b..17f59e2ba9b 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2012/10/29 05:07:18 asau Exp $ +# $NetBSD: Makefile,v 1.64 2015/07/04 16:18:43 joerg Exp $ # DISTNAME= fvwm-${PKG_VERSION} @@ -13,7 +13,6 @@ COMMENT= Sets the root window to an Xpm pixmap LICENSE= gnu-gpl-v2 PKG_VERSION= 2.4.20 -USE_X11BASE= YES GNU_CONFIGURE= YES BUILD_DIRS= libs utils diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile index ea8c0dad917..09fcf3c029c 100644 --- a/x11/xvattr/Makefile +++ b/x11/xvattr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/06/18 19:36:51 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:44 joerg Exp $ DISTNAME= xvattr-1.3 PKGREVISION= 5 @@ -11,7 +11,6 @@ COMMENT= Modify Xv attributes LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes -USE_X11BASE= yes USE_TOOLS+= pod2man .include "../../mk/bsd.prefs.mk" diff --git a/x11/xview/Makefile b/x11/xview/Makefile index e663ccab8cb..c8f113619d0 100644 --- a/x11/xview/Makefile +++ b/x11/xview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2009/04/08 23:16:55 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2015/07/04 16:18:44 joerg Exp $ # DISTNAME= xview3.2p1-X11R6 @@ -19,6 +19,4 @@ DEPENDS+= xview-clients>=3.2.1:../../x11/xview-clients NOT_FOR_PLATFORM= *-*-alpha # broken va_arg handling in xview-lib -USE_X11BASE= yes - .include "../../mk/bsd.pkg.mk" |