diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-08-03 09:28:57 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-08-03 09:28:57 +0000 |
| commit | c6bcad2436d925c98052ed292bd0794ae0e34b45 (patch) | |
| tree | 4752ebd6e8eb5959ebf00516e4ecf7156215bbce | |
| parent | USE_X_PREFIX should be before bsd.port.pre.mk include. (diff) | |
(1) Add new variable, XFREE86_VERSION, to specify which version of
XFree86 (3 or 4) to depend to when USE_XLIB is set.
XFREE86_VERSION defaults to 3 for now, but adventurous users can
override it in /etc/make.conf. When XFREE86_VERSION=3, USE_XLIB
will add a dependency to x11/XFree86; when it is set to 4, the
dependency will be to x11/XFree86-4-libraries. When
XFREE86_VERSION=4, the PKG_IGNORE_DEPENDS and ALWAYS_BUILD_DEPENDS
hacks to avoid messing with XFree86 are turned off.
Since XFree86 version 4 includes some software that used to be
separate ports, when XFREE86_VERSION=3 the following variables are
provided:
USE_DGS LIB_DEPENDS on x11/dgs
USE_FREETYPE LIB_DEPENDS on print/freetype
USE_MESA LIB_DEPENDS on graphics/Mesa3
USE_XPM LIB_DEPENDS on graphics/xpm
When XFREE86_VERSION=4, these variables have no effect. The
LIB_DEPENDS in the tree for the above four ports have all been
converted to the USE_* counterparts. For your information, this
is the count of the number of ports:
USE_DGS 0
USE_FREETYPE 16
USE_MESA 36
USE_XPM 236
There is a new variable, XAWVER, which is set to 6 when
XFREE86_VERSION=3 and 7 when XFREE86_VERSION=4. This is also
passed to PLIST_SUB so ports that build Xaw based shared libraries
can use this variable to substitute the shlib version number.
There is also a provision of using a separate mtree file for
XFREE86_VERSION=4, but that part is not enabled yet.
Reviewed by: the ports list
Tested by: make index (XFREE86_VERSION=3 only)
(2) Add hebrew to list of valid categories.
Submitted by: nbm
Diffstat (limited to '')
342 files changed, 500 insertions, 646 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4d525f3abb34..cd3930385bfd 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -754,7 +754,29 @@ BUILD_DEPENDS+= ${X11BASE}/lib/libXm.a:${PORTSDIR}/x11-toolkits/Motif-dummy .endif .endif -PKG_IGNORE_DEPENDS?= '(XFree86-3\.3\.6|Motif-2\.1\.10)' +# defaults to 3.3.6; will be changed to 4.0 when it is ready +XFREE86_VERSION?= 3 + +.if ${XFREE86_VERSION} == 3 +.if defined(USE_XPM) +LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm +.endif +.if defined(USE_DGS) +LIB_DEPENDS+= dps.0:${PORTSDIR}/x11/dgs +.endif +.if defined(USE_MESA) +LIB_DEPENDS+= GL.14:${PORTSDIR}/graphics/Mesa3 +.endif +.if defined(USE_FREETYPE) +LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype +.endif +XAWVER= 7 +PKG_IGNORE_DEPENDS?= '(XFree86-3\.3\.6|Motif-2\.1\.10)' +.else +XAWVER= 6 +PKG_IGNORE_DEPENDS?= 'Motif-2\.1\.10' +.endif +PLIST_SUB+= XAWVER=${XAWVER} .if defined(USE_BISON) .if ${OSVERSION} >= 400014 @@ -797,11 +819,17 @@ RUN_DEPENDS+= perl${PERL_VERSION}:${PORTSDIR}/lang/perl5 .endif .endif -# Don't try to build XFree86 even if ALWAYS_BUILD_DEPENDS is defined -- +.if defined(USE_XLIB) +.if ${XFREE86_VERSION} == 3 +# Don't try to build XFree86-3 even if ALWAYS_BUILD_DEPENDS is defined -- # it's just too big.... -.if defined(USE_XLIB) && !defined(ALWAYS_BUILD_DEPENDS) +.if !defined(ALWAYS_BUILD_DEPENDS) LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86 .endif +.else +LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86-4-libraries +.endif +.endif .if exists(${PORTSDIR}/../Makefile.inc) .include "${PORTSDIR}/../Makefile.inc" @@ -905,8 +933,13 @@ EXTRACT_CMD?= ${GZIP_CMD} # Figure out where the local mtree file is .if !defined(MTREE_FILE) && !defined(NO_MTREE) .if defined(USE_X_PREFIX) +.if ${XFREE86_VERSION} == 3 MTREE_FILE= /etc/mtree/BSD.x11.dist .else +MTREE_FILE= /etc/mtree/BSD.x11.dist +#MTREE_FILE= /etc/mtree/BSD.x11-4.dist +.endif +.else MTREE_FILE= /etc/mtree/BSD.local.dist .endif .endif @@ -1135,7 +1168,7 @@ maintainer: VALID_CATEGORIES+= afterstep archivers astro audio benchmarks biology \ cad chinese comms converters databases deskutils devel \ editors elisp emulators ftp games german gnome graphics \ - ipv6 irc japanese java kde korean lang linux \ + hebrew ipv6 irc japanese java kde korean lang linux \ mail math mbone misc net news \ offix palm perl5 plan9 print python russian \ security shells sysutils \ diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile index b5eb25ede2bd..5ccb958af9f9 100644 --- a/astro/openuniverse/Makefile +++ b/astro/openuniverse/Makefile @@ -14,12 +14,12 @@ MASTER_SITES= http://plasma.gsfc.nasa.gov/Ssystem/ \ MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - GL.14:${PORTSDIR}/graphics/Mesa3 +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg MAKEFILE= Makefile.FreeBSD FETCH_BEFORE_ARGS= -b USE_X_PREFIX= yes +USE_MESA= yes USE_BISON= yes do-install: diff --git a/astro/wmmoonclock/Makefile b/astro/wmmoonclock/Makefile index e7881e9c57d4..4a267c5e1b57 100644 --- a/astro/wmmoonclock/Makefile +++ b/astro/wmmoonclock/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/ MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/${DISTNAME}/Src USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes MAN1= wmmoonclock.1 diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile index 3c50fa199a40..83ad323452bd 100644 --- a/astro/wmspaceweather/Makefile +++ b/astro/wmspaceweather/Makefile @@ -12,12 +12,11 @@ DISTNAME= wmSpaceWeather-1.04 MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/${DISTNAME}/wmSpaceWeather USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes ALL_TARGET= clean all MAN1= wmSpaceWeather.1 diff --git a/astro/wmsun/Makefile b/astro/wmsun/Makefile index d416560d176e..d43a364e6cd7 100644 --- a/astro/wmsun/Makefile +++ b/astro/wmsun/Makefile @@ -12,12 +12,11 @@ DISTNAME= wmSun-1.03 MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/${DISTNAME}/wmSun USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes ALL_TARGET= clean all MAN1= wmSun.1 diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index add6d888070b..2ae8ac879afe 100644 --- a/astro/xephem/Makefile +++ b/astro/xephem/Makefile @@ -14,8 +14,7 @@ MASTER_SITES= http://www.clearskyinstitute.com/xephem/xephem/ \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes REQUIRES_MOTIF= yes USE_IMAKE= yes MANCOMPRESSED= no diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile index 1a6886d93f93..17fc95ad49f0 100644 --- a/astro/xplanet/Makefile +++ b/astro/xplanet/Makefile @@ -17,10 +17,10 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= will@FreeBSD.org LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - GL.14:${PORTSDIR}/graphics/Mesa3 \ jpeg.9:${PORTSDIR}/graphics/jpeg USE_X_PREFIX= yes +USE_MESA= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-map-extension=jpg diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile index ecb2f4490bae..84a0eb79c37a 100644 --- a/astro/xtide/Makefile +++ b/astro/xtide/Makefile @@ -14,11 +14,11 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= patseal@hyperhost.net -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - png.4:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png IGNOREFILES= harmonics.world.gz +USE_XPM= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes MAN1= xtide.1 tide.1 diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile index 8550b19c0f00..ea169edc278f 100644 --- a/audio/ascd/Makefile +++ b/audio/ascd/Makefile @@ -13,11 +13,11 @@ DISTFILES= ${DISTNAME}-src.tgz ${DATAFILES} MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - workman.1:${PORTSDIR}/audio/libworkman +LIB_DEPENDS= workman.1:${PORTSDIR}/audio/libworkman WRKSRC= ${WRKDIR}/${PKGNAME} USE_IMAKE= yes +USE_XPM= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= default DATAFILES= ascd-0.13pr6-themes.tgz diff --git a/audio/dap/Makefile b/audio/dap/Makefile index 5fe01366d923..0f25adf43a37 100644 --- a/audio/dap/Makefile +++ b/audio/dap/Makefile @@ -13,10 +13,10 @@ EXTRACT_SUFX=.tgz MAINTAINER= yoshiaki@kt.rim.or.jp -LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms USE_X_PREFIX= yes +USE_XPM= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/ diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile index 9a5e77663d35..f0e1987d8092 100644 --- a/audio/gnapster/Makefile +++ b/audio/gnapster/Makefile @@ -13,13 +13,13 @@ MASTER_SITES= http://www.faradic.net/~jasta/files/ MAINTAINER= cpiazza@FreeBSD.org LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - Xpm.4:${PORTSDIR}/graphics/xpm \ ungif.5:${PORTSDIR}/graphics/libungif GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile index 6004e8b7ed32..a94e45b3c8c1 100644 --- a/audio/mixer.app/Makefile +++ b/audio/mixer.app/Makefile @@ -13,9 +13,8 @@ DISTNAME= Mixer.app-${PORTVERSION} MAINTAINER= cpiazza@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Mixer ${PREFIX}/bin diff --git a/audio/wmcdplay/Makefile b/audio/wmcdplay/Makefile index 273702fc6d03..548237a427a6 100644 --- a/audio/wmcdplay/Makefile +++ b/audio/wmcdplay/Makefile @@ -14,11 +14,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= clkao@CirX.ORG -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/wmcdplay USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes .include <bsd.port.mk> diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile index 83df66e6c427..3fd858f0a0a8 100644 --- a/audio/wmmixer/Makefile +++ b/audio/wmmixer/Makefile @@ -14,11 +14,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= rneswold@enteract.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/wmmixer FETCH_BEFORE_ARGS= -t USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes .include <bsd.port.mk> diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile index 37a01857fad6..92d4b22f9883 100644 --- a/audio/wmmp3/Makefile +++ b/audio/wmmp3/Makefile @@ -12,10 +12,10 @@ MASTER_SITES= http://www.dotfiles.com/software/wmmp3/ MAINTAINER= jim@FreeBSD.org RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm GNU_CONFIGURE= yes USE_X_PREFIX= yes +USE_XPM= yes post-install: @${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples/wmmp3" diff --git a/audio/wmtune/Makefile b/audio/wmtune/Makefile index 7defa3434314..6275478272ab 100644 --- a/audio/wmtune/Makefile +++ b/audio/wmtune/Makefile @@ -16,11 +16,10 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= jedgar@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes PATCH_ARGS =-p0 -d ${WRKDIR} diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile index f390d468226d..7b732e9fc402 100644 --- a/audio/xmradio/Makefile +++ b/audio/xmradio/Makefile @@ -12,13 +12,12 @@ MASTER_SITES= http://www.egd.igd.fhg.de/~runge/radio/ MAINTAINER= runge@rostock.zgdv.de -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - # This program does not actually depend on the below, but they are pretty # useful if you are into digital audio recording and playback. #RUN_DEPENDS= sox:${PORTSDIR}/audio/sox USE_IMAKE= yes +USE_XPM= yes REQUIRES_MOTIF= yes #post-install: diff --git a/audio/xtuner/Makefile b/audio/xtuner/Makefile index 25ccd103421c..6d4085586ce2 100644 --- a/audio/xtuner/Makefile +++ b/audio/xtuner/Makefile @@ -13,10 +13,10 @@ DISTNAME= Xtuner-${PORTVERSION} MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE -LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms USE_IMAKE= YES +USE_XPM= YES NO_INSTALL_MANPAGES= YES .include <bsd.port.mk> diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile index a5aed79be4f8..7b095f539aac 100644 --- a/audio/xwave/Makefile +++ b/audio/xwave/Makefile @@ -13,10 +13,9 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/./v/} MAINTAINER= martin.kraft@fal.de -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/${PORTNAME}2-981109 USE_IMAKE= yes +USE_XPM= yes DOC_FILES= README README-XWAVE2 README.v06 INSTALL diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 192c65e98f5d..0a212689f651 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -12,11 +12,11 @@ MASTER_SITES= http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript55 USE_BZIP2= yes USE_IMAKE= yes +USE_XPM= yes XMKMF= xmkmf MAN1= xcircuit.1 diff --git a/chinese/CJK/Makefile b/chinese/CJK/Makefile index 499d4b240c05..37b667f88e2b 100644 --- a/chinese/CJK/Makefile +++ b/chinese/CJK/Makefile @@ -16,12 +16,12 @@ MAINTAINER= keith@freebsd.sinica.edu.tw BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX \ ${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf \ ttf2pk:${PORTSDIR}/print/freetype:build -LIB_DEPENDS= ttf.4:${PORTSDIR}/print/freetype RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX NO_PACKAGE= "Needs ttf2pk source from FreeType" USE_GMAKE= yes +USE_FREETYPE= yes WRKSRC= ${WRKDIR}/cjk-current post-install: diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile index c43517424e69..fe70deaa8048 100644 --- a/chinese/aterm/Makefile +++ b/chinese/aterm/Makefile @@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR= foxfair MAINTAINER= davidyu@ken.csie.ntu.edu.tw -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-transparency --enable-background-image \ --disable-delete-key --disable-backspace-key \ diff --git a/chinese/rxvt/Makefile b/chinese/rxvt/Makefile index f1f30ad729a8..54f8071196e7 100644 --- a/chinese/rxvt/Makefile +++ b/chinese/rxvt/Makefile @@ -15,9 +15,8 @@ MASTER_SITE_SUBDIR= X11/terms MAINTAINER= frankch@waru.life.nthu.edu.tw -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes USE_BZIP2= yes MAN1= crxvt.1 diff --git a/chinese/xemacs/Makefile b/chinese/xemacs/Makefile index 0e09b723b359..bd7b46ba714b 100644 --- a/chinese/xemacs/Makefile +++ b/chinese/xemacs/Makefile @@ -16,13 +16,13 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-mule${EXTRACT_SUFX} MAINTAINER= keith@freebsd.sinica.edu.tw -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png RUN_DEPENDS= xcin2.5:${PORTSDIR}/chinese/xcin25 \ ${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf USE_GMAKE= yes +USE_XPM= yes STRIP= HAS_CONFIGURE= yes XEMACS_ARCH= ${MACHINE_ARCH}--freebsd diff --git a/comms/asmodem/Makefile b/comms/asmodem/Makefile index 603003a96e8b..4bf979aae88d 100644 --- a/comms/asmodem/Makefile +++ b/comms/asmodem/Makefile @@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}-0.6-1 MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= asmodem.1 diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile index 40f35ccd07dd..1f421a541512 100644 --- a/databases/xmysql/Makefile +++ b/databases/xmysql/Makefile @@ -13,10 +13,10 @@ MASTER_SITES= http://web.wt.net/~dblhack/ \ MAINTAINER= dirk@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - xforms.0:${PORTSDIR}/x11-toolkits/xforms \ +LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ mysqlclient.6:${PORTSDIR}/databases/mysql322-client USE_X_PREFIX= yes +USE_XPM= yes .include <bsd.port.mk> diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index fd92e2d7ae96..48d272ff7edb 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -14,11 +14,11 @@ MASTER_SITES= http://www.mysql.com/Downloads/Contrib/ \ MAINTAINER= dirk@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - xforms.0:${PORTSDIR}/x11-toolkits/xforms \ +LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ mysqlclient.6:${PORTSDIR}/databases/mysql322-client USE_X_PREFIX= yes +USE_XPM= yes ALL_TARGET= xmysqladmin .include <bsd.port.mk> diff --git a/deskutils/aspostit/Makefile b/deskutils/aspostit/Makefile index 36c0e139af2f..fea5246c0d9e 100644 --- a/deskutils/aspostit/Makefile +++ b/deskutils/aspostit/Makefile @@ -13,12 +13,10 @@ MASTER_SITE_SUBDIR= apps/aspostit MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm/ \ - jpeg.9:${PORTSDIR}/graphics/jpeg/ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg/ USE_X_PREFIX= yes -USE_XLIB= yes - +USE_XPM= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/deskutils/gnucash/Makefile b/deskutils/gnucash/Makefile index 44c145c4c937..b40bf59e662c 100644 --- a/deskutils/gnucash/Makefile +++ b/deskutils/gnucash/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ png.4:${PORTSDIR}/graphics/png \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ glib12.3:${PORTSDIR}/devel/glib12 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ gnome.4:${PORTSDIR}/x11/gnomelibs \ guile.6:${PORTSDIR}/lang/guile \ xml.5:${PORTSDIR}/textproc/libxml @@ -38,6 +37,7 @@ RUN_DEPENDS= slib48:${PORTSDIR}/lang/slib \ ${site_perl}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser USE_GMAKE= yes +USE_XPM= yes GNU_CONFIGURE= yes USE_PERL5= yes #USE_X_PREFIX= yes diff --git a/deskutils/wmpinboard/Makefile b/deskutils/wmpinboard/Makefile index 575abc624b28..a886e9d3ff49 100644 --- a/deskutils/wmpinboard/Makefile +++ b/deskutils/wmpinboard/Makefile @@ -12,12 +12,11 @@ MASTER_SITES= http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard/ MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/wmpinboard.app USE_BZIP2= yes USE_IMAKE= yes +USE_XPM= yes MAN1= wmpinboard.1 MANCOMPRESSED= no diff --git a/deskutils/xinvest/Makefile b/deskutils/xinvest/Makefile index e527731905ae..41b78f34d0d2 100644 --- a/deskutils/xinvest/Makefile +++ b/deskutils/xinvest/Makefile @@ -14,10 +14,9 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - REQUIRES_MOTIF= yes USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes post-install: diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 46591c0157e8..e500c3b9bb05 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -14,13 +14,12 @@ MASTER_SITE_SUBDIR= ddd MAINTAINER= obrien@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - GNU_CONFIGURE= yes CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-motif-libraries="${LIBXMDIR}" \ --with-readline-libraries=/usr/lib USE_GMAKE= yes +USE_XPM= yes REQUIRES_MOTIF= yes MAN1= ddd.1 diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile index 1005819d5cae..b063dbdff9b3 100644 --- a/devel/sdl-devel/Makefile +++ b/devel/sdl-devel/Makefile @@ -15,8 +15,7 @@ DISTNAME= SDL-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ - aa.1:${PORTSDIR}/graphics/aalib \ - ${GL_DEPENDS} + aa.1:${PORTSDIR}/graphics/aalib BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_GMAKE= yes @@ -31,10 +30,9 @@ CONFIGURE_ARGS= --enable-video-aalib CFLAGS+= -D_THREAD_SAFE .if defined(WITHOUT_GL) -GL_DEPENDS= CONFIGURE_ARGS+= --disable-video-opengl .else -GL_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 +USE_MESA= yes CONFIGURE_ARGS+= --enable-video-opengl .endif diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index 1005819d5cae..b063dbdff9b3 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -15,8 +15,7 @@ DISTNAME= SDL-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ - aa.1:${PORTSDIR}/graphics/aalib \ - ${GL_DEPENDS} + aa.1:${PORTSDIR}/graphics/aalib BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm USE_GMAKE= yes @@ -31,10 +30,9 @@ CONFIGURE_ARGS= --enable-video-aalib CFLAGS+= -D_THREAD_SAFE .if defined(WITHOUT_GL) -GL_DEPENDS= CONFIGURE_ARGS+= --disable-video-opengl .else -GL_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 +USE_MESA= yes CONFIGURE_ARGS+= --enable-video-opengl .endif diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile index b24291ddcd15..9c2376af2e1d 100644 --- a/devel/swarm/Makefile +++ b/devel/swarm/Makefile @@ -14,10 +14,10 @@ MAINTAINER= horance@freedom.ie.cycu.edu.tw LIB_DEPENDS= ffi.2:${PORTSDIR}/devel/libffi \ png.4:${PORTSDIR}/graphics/png \ - Xpm.4:${PORTSDIR}/graphics/xpm \ BLT24.2:${PORTSDIR}/x11-toolkits/blt USE_GMAKE= yes +USE_XPM= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-defaultdir=${PREFIX} \ diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile index 075cd6b032b0..3d5ce1c25366 100644 --- a/editors/cooledit/Makefile +++ b/editors/cooledit/Makefile @@ -14,12 +14,12 @@ MASTER_SITE_SUBDIR= apps/editors/X MAINTAINER= brett@peloton.runet.edu -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_LIBTOOL= yes INSTALLS_SHLIB= yes USE_XLIB= yes +USE_XPM= yes USE_GMAKE= yes CONFIGURE_ARGS= --disable-mail-author --with-libs='-lcrypt -lreadline' \ diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 8d21565b929f..96ea6a3a636c 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -14,10 +14,9 @@ DISTFILES= nedit-5.1.1-src.tar.gz nedit-5.1.app-defaults MAINTAINER= deischen@freebsd.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - REQUIRES_MOTIF= yes USE_X_PREFIX= yes +USE_XPM= yes EXTRACT_ONLY= nedit-5.1.1-src.tar.gz MAN1= nclient.1 nedit.1 ALL_TARGET= freebsd diff --git a/editors/offix-editor/Makefile b/editors/offix-editor/Makefile index c50af5b938ba..bb5473b42ab5 100644 --- a/editors/offix-editor/Makefile +++ b/editors/offix-editor/Makefile @@ -14,12 +14,12 @@ DISTNAME= Editor-${PORTVERSION} MAINTAINER= ruslan@shevchenko.kiev.ua -LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd GNU_CONFIGURE= YES USE_GMAKE= YES USE_X_PREFIX= YES +USE_XPM= YES MAN1= editor.1 .include <bsd.port.mk> diff --git a/editors/xed/Makefile b/editors/xed/Makefile index 758f85ee4c6f..850b8fbf39e8 100644 --- a/editors/xed/Makefile +++ b/editors/xed/Makefile @@ -15,9 +15,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= shanee@augusta.de -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= xed.1 .include <bsd.port.mk> diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index afc992ce4b46..020515e68ec9 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -18,8 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME} MAINTAINER?= gj@FreeBSD.org RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages -LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff @@ -29,6 +28,7 @@ DIST_SUBDIR= xemacs SLAVEDIRS+= editors/xemacs21-mule USE_XLIB= yes +USE_XPM= yes USE_GMAKE= yes STRIP= HAS_CONFIGURE= yes diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index afc992ce4b46..020515e68ec9 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -18,8 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME} MAINTAINER?= gj@FreeBSD.org RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages -LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff @@ -29,6 +28,7 @@ DIST_SUBDIR= xemacs SLAVEDIRS+= editors/xemacs21-mule USE_XLIB= yes +USE_XPM= yes USE_GMAKE= yes STRIP= HAS_CONFIGURE= yes diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile index d51eb5f66cb2..ed439d7eedca 100644 --- a/editors/xemacs20/Makefile +++ b/editors/xemacs20/Makefile @@ -18,10 +18,10 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MULEDISTFILE} MAINTAINER= gj@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png +USE_XPM= yes USE_GMAKE= yes STRIP= HAS_CONFIGURE= yes diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile index afc992ce4b46..020515e68ec9 100644 --- a/editors/xemacs21/Makefile +++ b/editors/xemacs21/Makefile @@ -18,8 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-elc${EXTRACT_SUFX} ${DISTNAME} MAINTAINER?= gj@FreeBSD.org RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages -LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff @@ -29,6 +28,7 @@ DIST_SUBDIR= xemacs SLAVEDIRS+= editors/xemacs21-mule USE_XLIB= yes +USE_XPM= yes USE_GMAKE= yes STRIP= HAS_CONFIGURE= yes diff --git a/editors/xenon/Makefile b/editors/xenon/Makefile index 96e538a9e4ff..7c8c2b741a46 100644 --- a/editors/xenon/Makefile +++ b/editors/xenon/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= ftp://ftp.proximity.com.au/pub/xenon/ MAINTAINER= jedgar@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes MAN1= xe.1 diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile index 1ab6acd6db31..9aca2876dcf2 100644 --- a/editors/yudit/Makefile +++ b/editors/yudit/Makefile @@ -19,9 +19,9 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= rch@WriteMe.Com -LIB_DEPENDS= ttf.4:${PORTSDIR}/print/freetype BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext +USE_FREETYPE= YES CONFIGURE_ENV= LC_ALL= GNU_CONFIGURE= YES MAKE_ENV= LC_ALL= diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 06e6b99e19ef..ee2a085cefda 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -15,9 +15,6 @@ DISTNAME= Wine-${PORTVERSION:S/.//g} MAINTAINER= pfeifer@dbai.tuwien.ac.at -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - GL.14:${PORTSDIR}/graphics/Mesa3 - WRKSRC= ${WRKDIR}/wine-${PORTVERSION:S/.//g} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-opengl @@ -28,6 +25,8 @@ MAN1= wine.1 MAN5= wine.conf.5 ONLY_FOR_ARCHS= i386 USE_BISON= yes +USE_XPM= yes +USE_MESA= yes .if !defined(NDEBUG) STRIP= diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 06e6b99e19ef..ee2a085cefda 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -15,9 +15,6 @@ DISTNAME= Wine-${PORTVERSION:S/.//g} MAINTAINER= pfeifer@dbai.tuwien.ac.at -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - GL.14:${PORTSDIR}/graphics/Mesa3 - WRKSRC= ${WRKDIR}/wine-${PORTVERSION:S/.//g} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-opengl @@ -28,6 +25,8 @@ MAN1= wine.1 MAN5= wine.conf.5 ONLY_FOR_ARCHS= i386 USE_BISON= yes +USE_XPM= yes +USE_MESA= yes .if !defined(NDEBUG) STRIP= diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index d91e26d3c0e7..ea77644805c8 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -15,8 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= dburr@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= YES USE_GMAKE= YES MAKEFILE= makefile.unix diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index afd6fb70758d..ffdb50d4e2c6 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -16,11 +16,10 @@ DISTFILES= ${DISTNAME}.tgz pdp1.zip #MAINTAINER= mycroft@NetBSD.ORG # NetBSD MAINTAINER= nox@jelal.kn-bremen.de -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - EXTRACT_ONLY= ${DISTNAME}.tgz USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes MAKE_ENV+= OPSYS=${OPSYS} ARCH=${ARCH} MACHINE_ARCH=${ARCH} \ DESTDIR=${DESTDIR} \ diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile index 44c145c4c937..b40bf59e662c 100644 --- a/finance/gnucash-devel/Makefile +++ b/finance/gnucash-devel/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ png.4:${PORTSDIR}/graphics/png \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ glib12.3:${PORTSDIR}/devel/glib12 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ gnome.4:${PORTSDIR}/x11/gnomelibs \ guile.6:${PORTSDIR}/lang/guile \ xml.5:${PORTSDIR}/textproc/libxml @@ -38,6 +37,7 @@ RUN_DEPENDS= slib48:${PORTSDIR}/lang/slib \ ${site_perl}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser USE_GMAKE= yes +USE_XPM= yes GNU_CONFIGURE= yes USE_PERL5= yes #USE_X_PREFIX= yes diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 44c145c4c937..b40bf59e662c 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -25,7 +25,6 @@ LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ png.4:${PORTSDIR}/graphics/png \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ glib12.3:${PORTSDIR}/devel/glib12 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ gnome.4:${PORTSDIR}/x11/gnomelibs \ guile.6:${PORTSDIR}/lang/guile \ xml.5:${PORTSDIR}/textproc/libxml @@ -38,6 +37,7 @@ RUN_DEPENDS= slib48:${PORTSDIR}/lang/slib \ ${site_perl}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser USE_GMAKE= yes +USE_XPM= yes GNU_CONFIGURE= yes USE_PERL5= yes #USE_X_PREFIX= yes diff --git a/finance/wmstock/Makefile b/finance/wmstock/Makefile index fb032b8a4abe..4690bbe80a2e 100644 --- a/finance/wmstock/Makefile +++ b/finance/wmstock/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://mattfischer.com/wmstock/src/ MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/wmstock/src USE_GMAKE= yes diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile index e527731905ae..41b78f34d0d2 100644 --- a/finance/xinvest/Makefile +++ b/finance/xinvest/Makefile @@ -14,10 +14,9 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - REQUIRES_MOTIF= yes USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes post-install: diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile index 1555a0a30560..30bea132fef5 100644 --- a/finance/xquote/Makefile +++ b/finance/xquote/Makefile @@ -13,11 +13,10 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= mph@freebsd.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - REQUIRES_MOTIF= yes USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes .include <bsd.port.mk> diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile index 542e42078f46..d7e5e6cedf64 100644 --- a/ftp/pavuk/Makefile +++ b/ftp/pavuk/Makefile @@ -24,7 +24,7 @@ USE_AUTOCONF= yes CONFIGURE_ARGS= --disable-gtk .else CONFIGURE_ARGS= --with-xpm-includes=${X11BASE}/include --disable-gtk -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm +USE_XPM= yes .endif USE_GMAKE= yes diff --git a/games/3dc/Makefile b/games/3dc/Makefile index 9f0eed45a73b..2942952e4c67 100644 --- a/games/3dc/Makefile +++ b/games/3dc/Makefile @@ -14,10 +14,10 @@ DISTNAME= 3Dc-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/3Dc/src do-install: diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile index 2b6d0faaa3e6..96a6ff32c14a 100644 --- a/games/KnightCap/Makefile +++ b/games/KnightCap/Makefile @@ -15,10 +15,7 @@ DISTNAME= KnightCap-${PORTVERSION} MAINTAINER= bugg@bugg.strangled.net -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3\ - GLU.14:${PORTSDIR}/graphics/Mesa3 \ - glut.3:${PORTSDIR}/graphics/Mesa3 - +USE_MESA= yes ALL_TARGET= KnightCap WRKSRC= ${WRKDIR}/Export diff --git a/games/actx/Makefile b/games/actx/Makefile index a91be0b135ba..bade5b45b7e4 100644 --- a/games/actx/Makefile +++ b/games/actx/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.astr.tohoku.ac.jp/~taji/ActX/ MAINTAINER= esu@yk.rim.or.jp -LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES=yes NO_CDROM= 'contains commercial character data' ACTXDIR= ${PREFIX}/share/examples/actx diff --git a/games/amphetamine/Makefile b/games/amphetamine/Makefile index 5c5c7650aa71..ed69b654cd2b 100644 --- a/games/amphetamine/Makefile +++ b/games/amphetamine/Makefile @@ -14,12 +14,12 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= SDL-1.0.2:${PORTSDIR}/devel/sdl \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= SDL-1.0.2:${PORTSDIR}/devel/sdl DATAVERSION= 0.8.6 USE_X_PREFIX= yes +USE_XPM= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/games/battalion/Makefile b/games/battalion/Makefile index cc3a31426849..1153b4b3808c 100644 --- a/games/battalion/Makefile +++ b/games/battalion/Makefile @@ -13,10 +13,9 @@ DISTFILES= battalionSource1.4.tar.Z battalionSUN4.tar.gz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - ALL_TARGET= # empty USE_X_PREFIX= yes +USE_MESA= yes WRKSRC= ${WRKDIR}/battalionSource MAN6= battalion.6 diff --git a/games/battleball/Makefile b/games/battleball/Makefile index 257872335e49..0e9827050ecb 100644 --- a/games/battleball/Makefile +++ b/games/battleball/Makefile @@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}.${PORTVERSION:S/.//}.src MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - USE_X_PREFIX= yes +USE_MESA= yes WRKSRC= ${WRKDIR}/battleball-2.1-src do-install: diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile index c546fb9e0af6..ff3671f03635 100644 --- a/games/crossfire-client/Makefile +++ b/games/crossfire-client/Makefile @@ -21,11 +21,11 @@ DISTFILES= ${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \ MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= rplay:${PORTSDIR}/audio/rplay -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm EXTRACT_ONLY= ${CF_SOURCES} ${CF_DOC} USE_PERL5= yes USE_IMAKE= yes +USE_XPM= yes PREFIX= ${LOCALBASE} MAN6= crossfire.6 crossedit.6 diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile index c546fb9e0af6..ff3671f03635 100644 --- a/games/crossfire-server/Makefile +++ b/games/crossfire-server/Makefile @@ -21,11 +21,11 @@ DISTFILES= ${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \ MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= rplay:${PORTSDIR}/audio/rplay -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm EXTRACT_ONLY= ${CF_SOURCES} ${CF_DOC} USE_PERL5= yes USE_IMAKE= yes +USE_XPM= yes PREFIX= ${LOCALBASE} MAN6= crossfire.6 crossedit.6 diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile index c546fb9e0af6..ff3671f03635 100644 --- a/games/crossfire/Makefile +++ b/games/crossfire/Makefile @@ -21,11 +21,11 @@ DISTFILES= ${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \ MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= rplay:${PORTSDIR}/audio/rplay -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm EXTRACT_ONLY= ${CF_SOURCES} ${CF_DOC} USE_PERL5= yes USE_IMAKE= yes +USE_XPM= yes PREFIX= ${LOCALBASE} MAN6= crossfire.6 crossedit.6 diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile index 49acd9875c20..a67113f2ae3d 100644 --- a/games/freeciv-gtk2/Makefile +++ b/games/freeciv-gtk2/Makefile @@ -17,11 +17,11 @@ PKGNAMESUFFIX= -gtk MAINTAINER= sheldonh@freebsd.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm .if defined(WITH_GTK) -LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib .endif +USE_XPM= yes USE_BZIP2= yes GNU_CONFIGURE= yes .if defined(WITH_GTK) diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index 49acd9875c20..a67113f2ae3d 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -17,11 +17,11 @@ PKGNAMESUFFIX= -gtk MAINTAINER= sheldonh@freebsd.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm .if defined(WITH_GTK) -LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib .endif +USE_XPM= yes USE_BZIP2= yes GNU_CONFIGURE= yes .if defined(WITH_GTK) diff --git a/games/glasteroids/Makefile b/games/glasteroids/Makefile index ec73c2f14081..67345f7bbd3a 100644 --- a/games/glasteroids/Makefile +++ b/games/glasteroids/Makefile @@ -13,13 +13,12 @@ DISTNAME= Glasteriods MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - MAKEFILE= Makefile.FreeBSD WRKSRC= ${WRKDIR}/Glasteroids USE_X_PREFIX= yes +USE_MESA= yes pre-build: @ ${CP} ${FILESDIR}/Makefile.FreeBSD ${WRKSRC} diff --git a/games/gleyes/Makefile b/games/gleyes/Makefile index c20a59be0d29..9bfd6e14adaf 100644 --- a/games/gleyes/Makefile +++ b/games/gleyes/Makefile @@ -16,10 +16,9 @@ MASTER_SITES= ftp://ftp.kddlabs.co.jp/.1/X11/acontrib/gleyes/ \ MAINTAINER= malte.lance@gmx.net -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - MAN1= gleyes.1 USE_X_PREFIX= yes +USE_MESA= yes do-install: @${INSTALL_PROGRAM} ${WRKSRC}/gleyes ${PREFIX}/bin diff --git a/games/gltron/Makefile b/games/gltron/Makefile index 7dcbe0ace7b2..78adf5128a0f 100644 --- a/games/gltron/Makefile +++ b/games/gltron/Makefile @@ -13,7 +13,6 @@ MASTER_SITES= http://gltron.sourceforge.net/download/ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \ - glut.3:${PORTSDIR}/graphics/Mesa3 \ png.4:${PORTSDIR}/graphics/png .if defined(NO_SOUND) @@ -23,6 +22,7 @@ SOUND="-DSOUND" .endif USE_X_PREFIX= yes +USE_MESA= yes GNU_CONFIGURE= yes USE_GMAKE= yes MAKE_ENV+= OPT="${CFLAGS}" SOUND="${SOUND}" diff --git a/games/gracer/Makefile b/games/gracer/Makefile index 943308beb8ee..78d349c003b0 100644 --- a/games/gracer/Makefile +++ b/games/gracer/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://arch.comp.kyutech.ac.jp/~matsu/my_products/gtk/race/ MAINTAINER= nox@jelal.kn-bremen.de BUILD_DEPENDS= ${X11BASE}/lib/libsl.a:${PORTSDIR}/x11-toolkits/plib -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 \ - ungif.5:${PORTSDIR}/graphics/libungif \ +LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tcl82.1:${PORTSDIR}/lang/tcl82 +USE_MESA= YES USE_AUTOCONF= YES CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/tcl8.2 \ diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile index 0b2f33962309..98f53fe420f9 100644 --- a/games/libshhcards/Makefile +++ b/games/libshhcards/Makefile @@ -13,10 +13,9 @@ DISTNAME= shhcards-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes INSTALLS_SHLIB= yes post-install: diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile index 658ecff3d5d2..5c7fdee051a1 100644 --- a/games/maelstrom/Makefile +++ b/games/maelstrom/Makefile @@ -13,10 +13,10 @@ DISTNAME= Maelstrom-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - SDL-1.0.2:${PORTSDIR}/devel/sdl +LIB_DEPENDS= SDL-1.0.2:${PORTSDIR}/devel/sdl USE_X_PREFIX= yes +USE_XPM= yes USE_NEWGCC= yes GNU_CONFIGURE= yes diff --git a/games/mindfocus/Makefile b/games/mindfocus/Makefile index 0910c57f2b82..6e9c53660ce4 100644 --- a/games/mindfocus/Makefile +++ b/games/mindfocus/Makefile @@ -13,9 +13,8 @@ DISTFILES= mindfocus-0.88.tar.gz mindfocus-data1.tar.gz MAINTAINER= ixtl@utmc.or.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes RESTRICTED= 'contains commercial character data' diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index e7b0ba223813..31203a5ff59a 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= games MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes post-extract: .for file in DoubleRayDoor DoubleRayFont DoubleRayFont2 DoubleRayScreen diff --git a/games/nadar/Makefile b/games/nadar/Makefile index eda5dac22ff4..803ec0aedaf1 100644 --- a/games/nadar/Makefile +++ b/games/nadar/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://www.seki.ee.kagu.sut.ac.jp/~sakai/myfreesoft/ MAINTAINER= sakai@seki.ee.kagu.sut.ac.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - ALL_TARGET= all USE_X_PREFIX= yes +USE_XPM= yes MAN1= nadars.1 nadar.1 MANCOMPRESSED= yes diff --git a/games/nethack-gtk/Makefile b/games/nethack-gtk/Makefile index 576363836f20..c864c289b064 100644 --- a/games/nethack-gtk/Makefile +++ b/games/nethack-gtk/Makefile @@ -21,9 +21,9 @@ PATCHFILES= nh-3.2.2-3.2.3.diff \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index b73d80f7ee16..c6c5f6ebed9b 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -19,7 +19,6 @@ MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= auplay:${PORTSDIR}/audio/nas \ xpmtoppm:${PORTSDIR}/graphics/netpbm -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm RUN_DEPENDS= auplay:${PORTSDIR}/audio/nas QT_PATCH= qnethack-3.2.2.1.0.1.src.tar.gz @@ -27,6 +26,7 @@ QT_SOUND= nhs.tar.gz EXTRACT_ONLY= nethack-3.2.2.tar.gz USE_QT= yes +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack/Makefile b/games/nethack/Makefile index afb0abd5cef4..9243c853cdd6 100644 --- a/games/nethack/Makefile +++ b/games/nethack/Makefile @@ -19,8 +19,7 @@ PATCHFILES= nh-3.2.2-3.2.3.diff MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack3-tty/Makefile b/games/nethack3-tty/Makefile index f3cdb9061559..fa40cd4ff0ea 100644 --- a/games/nethack3-tty/Makefile +++ b/games/nethack3-tty/Makefile @@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= nethack MAINTAINER= dscheidt@enteract.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack3/Makefile b/games/nethack3/Makefile index f3cdb9061559..fa40cd4ff0ea 100644 --- a/games/nethack3/Makefile +++ b/games/nethack3/Makefile @@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= nethack MAINTAINER= dscheidt@enteract.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack32-gtk/Makefile b/games/nethack32-gtk/Makefile index 576363836f20..c864c289b064 100644 --- a/games/nethack32-gtk/Makefile +++ b/games/nethack32-gtk/Makefile @@ -21,9 +21,9 @@ PATCHFILES= nh-3.2.2-3.2.3.diff \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile index afb0abd5cef4..9243c853cdd6 100644 --- a/games/nethack32/Makefile +++ b/games/nethack32/Makefile @@ -19,8 +19,7 @@ PATCHFILES= nh-3.2.2-3.2.3.diff MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile index f3cdb9061559..fa40cd4ff0ea 100644 --- a/games/nethack33-nox11/Makefile +++ b/games/nethack33-nox11/Makefile @@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= nethack MAINTAINER= dscheidt@enteract.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile index b73d80f7ee16..c6c5f6ebed9b 100644 --- a/games/nethack33-qt/Makefile +++ b/games/nethack33-qt/Makefile @@ -19,7 +19,6 @@ MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= auplay:${PORTSDIR}/audio/nas \ xpmtoppm:${PORTSDIR}/graphics/netpbm -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm RUN_DEPENDS= auplay:${PORTSDIR}/audio/nas QT_PATCH= qnethack-3.2.2.1.0.1.src.tar.gz @@ -27,6 +26,7 @@ QT_SOUND= nhs.tar.gz EXTRACT_ONLY= nethack-3.2.2.tar.gz USE_QT= yes +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile index f3cdb9061559..fa40cd4ff0ea 100644 --- a/games/nethack33/Makefile +++ b/games/nethack33/Makefile @@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= nethack MAINTAINER= dscheidt@enteract.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile index f3cdb9061559..fa40cd4ff0ea 100644 --- a/games/nethack34-nox11/Makefile +++ b/games/nethack34-nox11/Makefile @@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= nethack MAINTAINER= dscheidt@enteract.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile index b73d80f7ee16..c6c5f6ebed9b 100644 --- a/games/nethack34-qt/Makefile +++ b/games/nethack34-qt/Makefile @@ -19,7 +19,6 @@ MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= auplay:${PORTSDIR}/audio/nas \ xpmtoppm:${PORTSDIR}/graphics/netpbm -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm RUN_DEPENDS= auplay:${PORTSDIR}/audio/nas QT_PATCH= qnethack-3.2.2.1.0.1.src.tar.gz @@ -27,6 +26,7 @@ QT_SOUND= nhs.tar.gz EXTRACT_ONLY= nethack-3.2.2.tar.gz USE_QT= yes +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile index f3cdb9061559..fa40cd4ff0ea 100644 --- a/games/nethack34/Makefile +++ b/games/nethack34/Makefile @@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= nethack MAINTAINER= dscheidt@enteract.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 diff --git a/games/powerpak/Makefile b/games/powerpak/Makefile index cd79ba6d2f10..e56b2c330d81 100644 --- a/games/powerpak/Makefile +++ b/games/powerpak/Makefile @@ -13,11 +13,10 @@ DISTNAME= PowerPak MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= SDL-1.0.2:${PORTSDIR}/devel/sdl \ - ttf.4:${PORTSDIR}/print/freetype +LIB_DEPENDS= SDL-1.0.2:${PORTSDIR}/devel/sdl +USE_FREETYPE= yes MAKEFILE= Makefile.FreeBSD - INSTALLS_SHLIB= yes post-extract: diff --git a/games/sol/Makefile b/games/sol/Makefile index 863aa6a580c8..ef5dadc52be4 100644 --- a/games/sol/Makefile +++ b/games/sol/Makefile @@ -12,14 +12,14 @@ MASTER_SITES= http://shh.thathost.com/pub-unix/files/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - shhopt.1:${PORTSDIR}/devel/libshhopt \ +LIB_DEPENDS= shhopt.1:${PORTSDIR}/devel/libshhopt \ shhmsg.1:${PORTSDIR}/devel/libshhmsg \ xalloc.1:${PORTSDIR}/devel/libxalloc \ shhcards.1:${PORTSDIR}/games/libshhcards USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes MAN6= sol.6 diff --git a/games/speyes/Makefile b/games/speyes/Makefile index 1cc50d087de4..2394dc0ed72e 100644 --- a/games/speyes/Makefile +++ b/games/speyes/Makefile @@ -12,10 +12,9 @@ MASTER_SITES= http://www.halcyon.com/amalmin/speyes/ MAINTAINER= jedgar@fxp.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - NO_INSTALL_MANPAGES= yes USE_IMAKE= yes +USE_XPM= yes pre-configure: @${PERL} -pi.orig -e 's:__CFLAGS__:${CFLAGS}:g' ${WRKSRC}/Imakefile diff --git a/games/sxsame/Makefile b/games/sxsame/Makefile index 74d5ed9a4aa8..8646368d9a1f 100644 --- a/games/sxsame/Makefile +++ b/games/sxsame/Makefile @@ -15,9 +15,8 @@ MASTER_SITES= ftp://stardust.sfc.wide.ad.jp/pub/JG/JG-0.9.1/sources/\ MAINTAINER= aconitum@po.teleway.ne.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes INSTALL_TARGET= install install.dir BINOWN= root diff --git a/games/tank/Makefile b/games/tank/Makefile index 8ddf22023f82..a7af3fb41d46 100644 --- a/games/tank/Makefile +++ b/games/tank/Makefile @@ -13,12 +13,11 @@ DISTNAME= ${PKGNAME}-src MAINTAINER= dburr@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - BROKEN= can\'t find glaux.h WRKSRC= ${WRKDIR}/${PKGNAME} +USE_MESA= YES USE_GMAKE= YES ALL_TARGET= linux-mesa-elf diff --git a/games/wmeyes/Makefile b/games/wmeyes/Makefile index 20ed3ca43885..a132b65f8a9b 100644 --- a/games/wmeyes/Makefile +++ b/games/wmeyes/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= ftp://thrush.omix.com/pub/misc/ MAINTAINER= zenin@archive.rhps.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= wmeyes.1 .include <bsd.port.mk> diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile index 4f3754c32004..7bdaa6959224 100644 --- a/games/wmminichess/Makefile +++ b/games/wmminichess/Makefile @@ -13,11 +13,11 @@ DISTNAME= miniCHESS-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm RUN_DEPENDS= ${LOCALBASE}/bin/gnuchessx:${PORTSDIR}/games/gnuchess USE_GMAKE= YES USE_X_PREFIX= YES +USE_XPM= YES MAKE_ENV= PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ LOCAL="${LOCALBASE}" MKDIR="${MKDIR}" \ INSTALL_DATA="${INSTALL_DATA}" diff --git a/games/wmtictactoe/Makefile b/games/wmtictactoe/Makefile index 7d0af6ba6983..83941876c4f5 100644 --- a/games/wmtictactoe/Makefile +++ b/games/wmtictactoe/Makefile @@ -15,11 +15,10 @@ DISTNAME= wmtictactoe-1.1-1 MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_GMAKE= yes WRKSRC= ${WRKDIR}/wmtictactoe.app/wmtictactoe USE_X_PREFIX= yes +USE_XPM= yes post-install: @${ECHO} "===> Run 'wmtictactoe --help' for the available options" diff --git a/games/xbill/Makefile b/games/xbill/Makefile index 4ab08af045c7..8c03bf286277 100644 --- a/games/xbill/Makefile +++ b/games/xbill/Makefile @@ -15,9 +15,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= obrien@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= xbill.1 post-install: diff --git a/games/xboing/Makefile b/games/xboing/Makefile index 93fc0d6d5a8c..4bc90e7be192 100644 --- a/games/xboing/Makefile +++ b/games/xboing/Makefile @@ -13,13 +13,12 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= janek@gaja.ipan.lublin.pl -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - .if ${MACHINE_ARCH} == "alpha" PLIST= ${PKGDIR}/PLIST.alpha .endif USE_IMAKE= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/xboing MAN1= xboing.1 diff --git a/games/xcogitate/Makefile b/games/xcogitate/Makefile index 5684f4a15752..e07031648669 100644 --- a/games/xcogitate/Makefile +++ b/games/xcogitate/Makefile @@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= mph MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/XCOGITATE_SOURCE do-build: diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile index 460a8af608e8..c77af624bde0 100644 --- a/games/xdeblock/Makefile +++ b/games/xdeblock/Makefile @@ -13,10 +13,9 @@ DISTFILES= ${PORTNAME}.tgz MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/xdeblo_v1.0 USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes post-patch: diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile index 25170fdcf169..1316c050b76f 100644 --- a/games/xdemineur/Makefile +++ b/games/xdemineur/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= ftp://ftp.babafou.eu.org/pub/babafou/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= xdemineur.1 .include <bsd.port.mk> diff --git a/games/xeji/Makefile b/games/xeji/Makefile index aa151dd8b1e7..782e2a903734 100644 --- a/games/xeji/Makefile +++ b/games/xeji/Makefile @@ -14,9 +14,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= th@cis.ibaraki.ac.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes WRKSRC= ${WRKDIR}/xeji diff --git a/games/xeyesplus/Makefile b/games/xeyesplus/Makefile index 9ff05da9bbfe..b0078575d247 100644 --- a/games/xeyesplus/Makefile +++ b/games/xeyesplus/Makefile @@ -14,9 +14,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes post-install: diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile index 0d2888c5eef6..808175151b9f 100644 --- a/games/xgalaga/Makefile +++ b/games/xgalaga/Makefile @@ -13,10 +13,9 @@ MASTER_SITE_SUBDIR= games MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - HAS_CONFIGURE= yes USE_X_PREFIX= yes +USE_XPM= yes # xgalaga has a very strange usage of these variables... CONFIGURE_ARGS= --prefix=${X11BASE}/lib/X11/xgalaga \ --exec_prefix=${X11BASE}/bin diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile index 32e86f400ca9..143d992bd196 100644 --- a/games/xminehunter/Makefile +++ b/games/xminehunter/Makefile @@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= games MAINTAINER= tg@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/xminehunter REQUIRES_MOTIF= yes ALL_TARGET= xminehunter diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile index 19343c6910fd..98c73b8f314c 100644 --- a/games/xnibbles/Makefile +++ b/games/xnibbles/Makefile @@ -13,11 +13,10 @@ DISTNAME= xnibbles-1.0BETA3 MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - ALL_TARGET= linux USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/xnibbles MAN6= xnibbles.6 diff --git a/games/xoids/Makefile b/games/xoids/Makefile index 5834e2d2ec65..45f35f52df9d 100644 --- a/games/xoids/Makefile +++ b/games/xoids/Makefile @@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= games MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN6= xoids.6 MANCOMPRESSED= no diff --git a/games/xonix/Makefile b/games/xonix/Makefile index 51cf3bb986b8..661190203783 100644 --- a/games/xonix/Makefile +++ b/games/xonix/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/ MAINTAINER= joerg@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= xonix.1 .include <bsd.port.mk> diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile index 0133ff84579e..fac91481cfcd 100644 --- a/games/xpat2/Makefile +++ b/games/xpat2/Makefile @@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= games/solitaires MAINTAINER= mph@freebsd.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes MAN6= xpat2.6 post-install: diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile index d31a93d370ee..8a0b4a30ca55 100644 --- a/games/xpuyopuyo/Makefile +++ b/games/xpuyopuyo/Makefile @@ -13,8 +13,7 @@ MASTER_SITES= http://chaos2.org/xpuyopuyo/ \ MAINTAINER= yinjieh@csie.nctu.edu.tw -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 .if defined(WITH_GNOME) LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs .endif @@ -27,6 +26,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes USE_AUTOCONF= yes CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ GLIB_CONFIG="${GLIB_CONFIG}" diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile index ee02f06959fc..509052e47379 100644 --- a/games/xpuzzletama/Makefile +++ b/games/xpuzzletama/Makefile @@ -12,10 +12,9 @@ MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/os/linux/JG/JG-0.9.1/sources/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/xpuzzletama USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes post-install: diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile index 67ff4ce2466b..50744aeeb930 100644 --- a/games/xquarto/Makefile +++ b/games/xquarto/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.math.lsa.umich.edu/~mattiasj/games/xquarto/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN6= xquarto.6 pre-configure: diff --git a/games/xracer/Makefile b/games/xracer/Makefile index 51a32793daef..acfe719e228c 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -13,10 +13,10 @@ DISTFILES= xracer-0.94.tar.gz xracer-data.tar.gz MAINTAINER= troll@digitalspark.net -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - GL.14:${PORTSDIR}/graphics/Mesa3 +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg USE_XLIB= yes +USE_MESA= yes MAKEFILE= Makefile WRKSRC= ${WRKDIR}/xracer-0.94 diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile index 563ec90d355c..a0d4946bf8b6 100644 --- a/games/xscrabble/Makefile +++ b/games/xscrabble/Makefile @@ -15,9 +15,8 @@ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes post-patch: diff --git a/games/xsheep/Makefile b/games/xsheep/Makefile index 307413e7b23f..d57fba1bd095 100644 --- a/games/xsheep/Makefile +++ b/games/xsheep/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.csn.ul.ie/~caolan/publink/xsheep/ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= YES +USE_XPM= YES WRKSRC= ${WRKDIR}/xsheep do-install: diff --git a/games/xshipwars-client/Makefile b/games/xshipwars-client/Makefile index c90cf642729c..74a0b0539e99 100644 --- a/games/xshipwars-client/Makefile +++ b/games/xshipwars-client/Makefile @@ -13,10 +13,9 @@ DISTFILES= xsw1.23.tgz stimages1.3.tgz MAINTAINER= troll@digitalspark.net -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/xsw1.23/client USE_XLIB= YES +USE_XPM= yes USE_GMAKE= YES MAKEFILE= Makefile.FreeBSD diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile index 31ca682ec390..b43a79d4021f 100644 --- a/games/xshisen/Makefile +++ b/games/xshisen/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://www.techfirm.co.jp/~masaoki/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - # runs fine on ssh connection #IS_INTERACTIVE= YES # Has to create an app-defaults file USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-lxpg4" CONFIGURE_ARGS= --datadir="${X11BASE}/lib/X11" \ diff --git a/games/xsok/Makefile b/games/xsok/Makefile index 8e9250628a6b..e53e3f626e1a 100644 --- a/games/xsok/Makefile +++ b/games/xsok/Makefile @@ -15,9 +15,8 @@ EXTRACT_SUFX= -src.tar.gz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes MAN6= xsok.6x post-install: diff --git a/games/xsokoban/Makefile b/games/xsokoban/Makefile index 73f36ee7daf1..b4ffa9b66a54 100644 --- a/games/xsokoban/Makefile +++ b/games/xsokoban/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= ftp://ftp.pmg.lcs.mit.edu/pub/xsokoban/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/xsokoban ALL_TARGET= xsokoban MAN1= xsokoban.1 diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile index 5553e0d5e0c1..16c3bf8f5bda 100644 --- a/games/xsoldier/Makefile +++ b/games/xsoldier/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.surfline.ne.jp/hachi/xsoldier/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes .include <bsd.port.mk> diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile index 1b4308404d6f..29c0746c7656 100644 --- a/games/xteddy/Makefile +++ b/games/xteddy/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= ftp://ftp.leo.org/pub/comp/usenet/comp.sources.x/xteddy/ MAINTAINER= Isegrim@Wunder-Nett.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - NO_CDROM= "Can only be distributed for free" USE_IMAKE= yes +USE_XPM= yes MAN1= xteddy.1 post-install: diff --git a/games/xtic/Makefile b/games/xtic/Makefile index 03d76583f59f..a9adb7295aca 100644 --- a/games/xtic/Makefile +++ b/games/xtic/Makefile @@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= xtic.1 .include <bsd.port.mk> diff --git a/games/xtron/Makefile b/games/xtron/Makefile index 2b574896c607..be1d9b4e41d2 100644 --- a/games/xtron/Makefile +++ b/games/xtron/Makefile @@ -14,9 +14,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes post-patch: @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/xtronrc diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index cea9efd89ee2..a0f19be5a8db 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -24,8 +24,7 @@ LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2 \ jbig.1:${PORTSDIR}/graphics/jbigkit \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ - ttf.4:${PORTSDIR}/print/freetype + tiff.4:${PORTSDIR}/graphics/tiff BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript55 \ mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \ picttoppm:${PORTSDIR}/graphics/netpbm \ @@ -33,6 +32,7 @@ BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript55 \ USE_PERL5= yes USE_XLIB= yes +USE_FREETYPE= yes USE_LIBTOOL= yes USE_AUTOCONF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/aero/Makefile b/graphics/aero/Makefile index 83fcc8398913..40e3a41bf529 100644 --- a/graphics/aero/Makefile +++ b/graphics/aero/Makefile @@ -15,9 +15,9 @@ MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= ${X11BASE}/lib/libfwf.a:${PORTSDIR}/x11-toolkits/FWF RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/aero/src MAKEFILE= Makefile.linux diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile index 480b837ac544..141041d6fc17 100644 --- a/graphics/fxtv/Makefile +++ b/graphics/fxtv/Makefile @@ -14,8 +14,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= aa8vb@nc.rr.com LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \ - Xpm.4:${PORTSDIR}/graphics/xpm + Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d # This program does not actually require the programs below unless you # use audio/video recording and/or playback and save to a non-raw format. @@ -26,6 +25,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ # mplex:${PORTSDIR}/graphics/mplex USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes MAKE_FLAGS= -e MAN1= fxtv.1 diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 8d57c4be5dde..5ada5de05ba8 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -16,10 +16,9 @@ MAINTAINER= billf@FreeBSD.org LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg .if defined(WITH_X11) -LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ - Xpm.4:${PORTSDIR}/graphics/xpm - USE_XLIB= yes +USE_XPM= yes +USE_FREETYPE= yes .endif INSTALLS_SHLIB= yes diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile index 8d57c4be5dde..5ada5de05ba8 100644 --- a/graphics/gd1/Makefile +++ b/graphics/gd1/Makefile @@ -16,10 +16,9 @@ MAINTAINER= billf@FreeBSD.org LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg .if defined(WITH_X11) -LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ - Xpm.4:${PORTSDIR}/graphics/xpm - USE_XLIB= yes +USE_XPM= yes +USE_FREETYPE= yes .endif INSTALLS_SHLIB= yes diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile index 8d57c4be5dde..5ada5de05ba8 100644 --- a/graphics/gd2/Makefile +++ b/graphics/gd2/Makefile @@ -16,10 +16,9 @@ MAINTAINER= billf@FreeBSD.org LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg .if defined(WITH_X11) -LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ - Xpm.4:${PORTSDIR}/graphics/xpm - USE_XLIB= yes +USE_XPM= yes +USE_FREETYPE= yes .endif INSTALLS_SHLIB= yes diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile index e369bfa598d4..1daa2d3e19ef 100644 --- a/graphics/gdtclft/Makefile +++ b/graphics/gdtclft/Makefile @@ -14,9 +14,9 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= mi@aldan.algebra.com LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \ - gd.1:${PORTSDIR}/graphics/gd \ - ttf.4:${PORTSDIR}/print/freetype + gd.1:${PORTSDIR}/graphics/gd +USE_FREETYPE= yes MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV= TCL_VER=8.2 MKDIR="${MKDIR}" INSTALL_DATA="${INSTALL_DATA}" ALL_TARGET= all diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index 8114fe243a21..a358e617a7d7 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -15,12 +15,12 @@ DISTFILES= geomview-1.6.1-src.tar.gz MAINTAINER= fenner@freebsd.org LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - GL.14:${PORTSDIR}/graphics/Mesa3 \ tk82.1:${PORTSDIR}/x11-toolkits/tk82 WRKSRC= ${WRKDIR}/Geomview REQUIRES_MOTIF= yes USE_X_PREFIX= yes +USE_MESA= yes MAN1= addbbox.1 animate.1 anytooff.1 anytoucd.1 bdy.1 clip.1 \ cplxview.1 crayola.1 example.1 flythrough.1 geomview.1 \ diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index a6d0dd83e6c3..5308cb416cf8 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - aa.1:${PORTSDIR}/graphics/aalib \ +LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ @@ -29,6 +28,7 @@ SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index a6d0dd83e6c3..5308cb416cf8 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - aa.1:${PORTSDIR}/graphics/aalib \ +LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ @@ -29,6 +28,7 @@ SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile index a6d0dd83e6c3..5308cb416cf8 100644 --- a/graphics/gimp-devel/Makefile +++ b/graphics/gimp-devel/Makefile @@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - aa.1:${PORTSDIR}/graphics/aalib \ +LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ @@ -29,6 +28,7 @@ SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index a6d0dd83e6c3..5308cb416cf8 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - aa.1:${PORTSDIR}/graphics/aalib \ +LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ @@ -29,6 +28,7 @@ SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile index a6d0dd83e6c3..5308cb416cf8 100644 --- a/graphics/gimp1/Makefile +++ b/graphics/gimp1/Makefile @@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - aa.1:${PORTSDIR}/graphics/aalib \ +LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ @@ -29,6 +28,7 @@ SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index a6d0dd83e6c3..5308cb416cf8 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - aa.1:${PORTSDIR}/graphics/aalib \ +LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mpeg.1:${PORTSDIR}/graphics/mpeg-lib \ @@ -29,6 +28,7 @@ SHLIBVER?= ${PORTVERSION:S/1.//g} USE_BZIP2= yes USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 78f7708163fa..480e705f4e57 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -13,12 +13,12 @@ DISTNAME= Giram-${PORTVERSION} MAINTAINER= bfoz@glue.umd.edu -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - GL:${PORTSDIR}/graphics/Mesa3 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray31 GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +USE_MESA= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/gltk/Makefile b/graphics/gltk/Makefile index e0645b3f380b..a73d2b99d581 100644 --- a/graphics/gltk/Makefile +++ b/graphics/gltk/Makefile @@ -15,9 +15,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - USE_IMAKE= yes +USE_MESA= yes do-install: ${INSTALL_DATA} ${WRKSRC}/libtk.a ${PREFIX}/lib/libgltk.a diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 5b038abe87ea..24a1a6cda518 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -12,13 +12,13 @@ MASTER_SITES= http://www.csn.ul.ie/~caolan/publink/libwmf/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - png.4:${PORTSDIR}/graphics/png \ - ttf.4:${PORTSDIR}/print/freetype +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/${PORTNAME} USE_XLIB= yes +USE_XPM= yes +USE_FREETYPE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype \ diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index bbf612ebb2c2..3fc7596ddc2e 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -13,10 +13,10 @@ DISTNAME= dx-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 \ - netcdf.1:${PORTSDIR}/math/netcdf +LIB_DEPENDS= netcdf.1:${PORTSDIR}/math/netcdf USE_XLIB= yes +USE_MESA= yes REQUIRES_MOTIF= yes USE_NEWGCC= yes GNU_CONFIGURE= yes diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index 0a4b7117a525..b1fdbce1bb23 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= jmz@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/pixmap USE_IMAKE= yes +USE_XPM= yes MAN1= pixmap.1 .include <bsd.port.mk> diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index 56999d717772..28210e38e692 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -19,10 +19,9 @@ BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ ${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy RUN_DEPENDS= python:${PORTSDIR}/lang/python \ ${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/numpy -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 +USE_MESA= yes ALL_TARGET= default - WRKSRC= ${WRKDIR}/${DISTNAME}/src OSMAJOR!= /usr/bin/uname -r | sed -e 's/\..*//' diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile index 478ad42546ae..1203cec901c9 100644 --- a/graphics/togl/Makefile +++ b/graphics/togl/Makefile @@ -15,9 +15,9 @@ DISTNAME= Togl-${PORTVERSION} MAINTAINER= aa8vb@ipass.net LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ - tcl82.1:${PORTSDIR}/lang/tcl82 \ - GL.14:${PORTSDIR}/graphics/Mesa3 + tcl82.1:${PORTSDIR}/lang/tcl82 +USE_MESA= yes ALL_TARGET= default TOGL_INSTDIR= ${PREFIX}/lib/tk8.2/${DISTNAME} diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile index 4a9ff575e7e9..f58b7293238c 100644 --- a/graphics/wmgrabimage/Makefile +++ b/graphics/wmgrabimage/Makefile @@ -12,13 +12,13 @@ MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/ MAINTAINER= ozz@FreeBSD.org.ru -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick WRKSRC= ${WRKDIR}/${DISTNAME}/wmGrabImage USE_GMAKE= YES USE_X_PREFIX= YES +USE_XPM= YES MAN1= wmGrabImage.1 diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile index 59c846671259..5fd880f4d3c0 100644 --- a/graphics/xbmbrowser/Makefile +++ b/graphics/xbmbrowser/Makefile @@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= tg@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= xbmbrowser.1 USE_GMAKE= yes diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile index a54a63748166..56efa0972782 100644 --- a/graphics/xfig-devel/Makefile +++ b/graphics/xfig-devel/Makefile @@ -15,14 +15,14 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}.full MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} USE_IMAKE= yes +USE_XPM= yes MAN1= xfig.1 pre-fetch: diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index a54a63748166..56efa0972782 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -15,14 +15,14 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}.full MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} USE_IMAKE= yes +USE_XPM= yes MAN1= xfig.1 pre-fetch: diff --git a/graphics/xmrm/Makefile b/graphics/xmrm/Makefile index 9e548e4d3fc0..e75ce3eedda7 100644 --- a/graphics/xmrm/Makefile +++ b/graphics/xmrm/Makefile @@ -17,9 +17,9 @@ MAINTAINER= treif@mayn.de RUN_DEPENDS= mpeg:${PORTSDIR}/graphics/mpeg LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm \ tiff.4:${PORTSDIR}/graphics/tiff +USE_XPM= yes NO_WRKSUBDIR= yes do-install: diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index 2c586e63b073..89bd0d6ca60e 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -14,11 +14,11 @@ MASTER_SITES= http://home.worldonline.dk/~torsten/xpaint/ \ MAINTAINER= jseger@FreeBSD.org LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - Xpm.4:${PORTSDIR}/graphics/xpm \ png.4:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/xpaint USE_IMAKE= yes +USE_XPM= yes MAN1= xpaint.1 .include <bsd.port.mk> diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile index f2686ab585cc..2f610e020705 100644 --- a/graphics/xpdf/Makefile +++ b/graphics/xpdf/Makefile @@ -19,12 +19,15 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= chuckr@freebsd.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - t1x.1:${PORTSDIR}/devel/t1lib +LIB_DEPENDS= t1x.1:${PORTSDIR}/devel/t1lib -###RESTRICTED= "Contains cryptography" +### crypto +#.if !defined(PACKAGE_BUILDING) +#RESTRICTED= "Contains cryptography" +#.endif USE_XLIB= yes USE_X_PREFIX= yes +USE_XPM= yes USE_AUTOCONF= yes CONFIGURE_ARGS= --with-gzip --enable-japanese \ --with-t1-library=${LOCALBASE}/lib \ diff --git a/irc/yagirc/Makefile b/irc/yagirc/Makefile index c1c92e29afbd..749954f7c17c 100644 --- a/irc/yagirc/Makefile +++ b/irc/yagirc/Makefile @@ -14,11 +14,11 @@ MASTER_SITE_SUBDIR= mph MAINTAINER= mph@freebsd.org LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - Xpm.4:${PORTSDIR}/graphics/xpm \ esd.2:${PORTSDIR}/audio/esound GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +USE_XPM= yes USE_GMAKE= yes USE_PERL5= yes USE_LIBTOOL= yes diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile index d8bfc5af7480..2378ba228ab4 100644 --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -18,7 +18,6 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= shige@FreeBSD.org BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= kterm @@ -29,6 +28,7 @@ PATCHFILES= ${DISTNAME}.NFS-xauth.patch \ PATCH_DIST_STRIP= -p1 USE_IMAKE= yes +USE_XPM= yes MAN1= kterm.1 MANCOMPRESSED= yes diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile index 8f9d10ca810a..dde15520431e 100644 --- a/japanese/kterm16c/Makefile +++ b/japanese/kterm16c/Makefile @@ -20,7 +20,6 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= kiri@pis.toba-cmt.ac.jp BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= kterm @@ -31,6 +30,7 @@ PATCHFILES= ${DISTNAME}.NFS-xauth.patch \ PATCH_DIST_STRIP= -p1 USE_IMAKE= yes +USE_XPM= yes DOCDIR= ${PREFIX}/share/doc/kterm16c diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile index a1a66530bd88..2cbf8e9f9219 100644 --- a/japanese/lyx/Makefile +++ b/japanese/lyx/Makefile @@ -22,9 +22,9 @@ MAINTAINER= flathill@FreeBSD.ORG #.if defined(WITH_ISPELL) #RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell #.endif -LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms +USE_XPM= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LYX_LIBS="-lxpg4" diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile index 9fb5ea4d5c4e..8d48ba6c5702 100644 --- a/japanese/nethack/Makefile +++ b/japanese/nethack/Makefile @@ -17,8 +17,7 @@ PATCHFILES= j${PORTNAME}-${PORTVERSION}.gz MAINTAINER= max@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6 diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile index 9fb5ea4d5c4e..8d48ba6c5702 100644 --- a/japanese/nethack32/Makefile +++ b/japanese/nethack32/Makefile @@ -17,8 +17,7 @@ PATCHFILES= j${PORTNAME}-${PORTVERSION}.gz MAINTAINER= max@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6 diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile index 9fb5ea4d5c4e..8d48ba6c5702 100644 --- a/japanese/nethack34/Makefile +++ b/japanese/nethack34/Makefile @@ -17,8 +17,7 @@ PATCHFILES= j${PORTNAME}-${PORTVERSION}.gz MAINTAINER= max@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes USE_GMAKE= yes MAN6= dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6 diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile index 5cdae131b2e4..33cac7ffe9d7 100644 --- a/japanese/rxvt/Makefile +++ b/japanese/rxvt/Makefile @@ -12,13 +12,12 @@ MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ MAINTAINER= honda@kashio.info.mie-u.ac.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes USE_BZIP2= yes MAN1= rxvt.1 rclock.1 -CONFIGURE_ARGS+=--enable-xpm-background --enable-transparency \ +CONFIGURE_ARGS= --enable-xpm-background --enable-transparency \ --enable-menubar --enable-graphics --enable-xim \ --enable-languages --with-encoding=eucj \ --disable-backspace-key --disable-delete-key \ diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile index 622d3cfc677f..bbdc3f978aa1 100644 --- a/japanese/vflib/Makefile +++ b/japanese/vflib/Makefile @@ -15,12 +15,11 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= mita@jp.FreeBSD.org -LIB_DEPENDS= ttf.4:${PORTSDIR}/print/freetype - VFLIB_VERSION= 2.25.1 PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION} GNU_CONFIGURE= yes +USE_FREETYPE= yes USE_AUTOCONF= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-freetype \ diff --git a/japanese/wine/Makefile b/japanese/wine/Makefile index 39ef304bb0ac..67753808bbb5 100644 --- a/japanese/wine/Makefile +++ b/japanese/wine/Makefile @@ -14,8 +14,7 @@ DISTNAME= ja-Wine-${PORTVERSION:S/.//g} DISTFILES= Wine-${PORTVERSION:S/.//g}.tar.gz \ Wine${PORTVERSION:S/.//g}-ja.tar.gz -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g} PATCH_STRIP= -p1 GNU_CONFIGURE= yes diff --git a/japanese/xklock/Makefile b/japanese/xklock/Makefile index 44f680f72671..bb054d94cf6b 100644 --- a/japanese/xklock/Makefile +++ b/japanese/xklock/Makefile @@ -18,10 +18,9 @@ PATCH_SITES= ${MASTER_SITES} PATCHFILES= ${DISTNAME}+lx.diff.gz PATCH_DIST_STRIP= -p1 -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - NO_WRKSUBDIR= yes USE_X_PREFIX= yes +USE_XPM= yes pre-configure: @${MV} ${WRKDIR}/jnames.c ${WRKDIR}/jnames.c.in diff --git a/japanese/xnetmaj/Makefile b/japanese/xnetmaj/Makefile index 754a79a601f6..eb6f4a743715 100644 --- a/japanese/xnetmaj/Makefile +++ b/japanese/xnetmaj/Makefile @@ -15,9 +15,8 @@ DISTFILES= netmaj-${PORTVERSION}.tar.gz \ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes ALL_TARGET= libs all INSTALL_TARGET= install install-pf diff --git a/japanese/xyagamo/Makefile b/japanese/xyagamo/Makefile index 36685de9de38..d2d1b98f2330 100644 --- a/japanese/xyagamo/Makefile +++ b/japanese/xyagamo/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.dokidoki.ne.jp/home2/shinmaru/mahjong/ MAINTAINER= shinmaru@dokidoki.ne.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= YES +USE_XPM= yes MAN6= xyagamo.6 MANLANG= ja diff --git a/korean/ftghostscript5/Makefile b/korean/ftghostscript5/Makefile index 29ecc17582d2..c39e709a6734 100644 --- a/korean/ftghostscript5/Makefile +++ b/korean/ftghostscript5/Makefile @@ -35,10 +35,10 @@ RUN_DEPENDS= $(LOCALBASE)/share/ghostscript/fonts:${PORTSDIR}/print/gsfonts \ $(X11BASE)/lib/X11/fonts/TrueType/gulim.ttf:${PORTSDIR}/korean/baekmukfonts-ttf BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract \ /nonexistent:${PORTSDIR}/graphics/png:extract -LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ - ttf.4:${PORTSDIR}/print/freetype +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png USE_XLIB= YES +USE_FREETYPE= YES WRKSRC= ${WRKDIR}/gs5.10 MAKEFILE= unix-gcc.mak diff --git a/korean/ghostscript55httf/Makefile b/korean/ghostscript55httf/Makefile index 7a8765f60843..5670f9121c3c 100644 --- a/korean/ghostscript55httf/Makefile +++ b/korean/ghostscript55httf/Makefile @@ -26,11 +26,11 @@ Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract \ /nonexistent:${PORTSDIR}/graphics/png:extract \ unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ - ttf.4:${PORTSDIR}/print/freetype +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png RUN_DEPENDS= $(X11BASE)/lib/X11/fonts/TrueType/gulim.ttf:${PORTSDIR}/korean/baekmukfonts-ttf USE_XLIB= yes +USE_FREETYPE= yes EXTRACT_ONLY= ${GS_SOURCES} WRKSRC= ${WRKDIR}/gs5.50 USE_GMAKE= yes diff --git a/korean/hanIM/Makefile b/korean/hanIM/Makefile index c093f6d04a06..cad1fec87c23 100644 --- a/korean/hanIM/Makefile +++ b/korean/hanIM/Makefile @@ -12,10 +12,10 @@ MASTER_SITES= ftp://ftp.mizi.com/pub/hanIM/ MAINTAINER= cjh@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf USE_IMAKE= YES +USE_XPM= yes WRKSRC= ${WRKDIR}/hanIM post-install: diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile index e44445cbc17f..28a910bdcb82 100644 --- a/mail/asmail/Makefile +++ b/mail/asmail/Makefile @@ -14,9 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= brett@peloton.runet.edu -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shaping diff --git a/mail/glbiff/Makefile b/mail/glbiff/Makefile index 1a70681fb035..4fcec3e59cbd 100644 --- a/mail/glbiff/Makefile +++ b/mail/glbiff/Makefile @@ -13,9 +13,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= GL:${PORTSDIR}/graphics/Mesa3 - USE_X_PREFIX= yes +USE_MESA= yes GNU_CONFIGURE= yes MAN1= glbiff.1 diff --git a/mail/mew/Makefile b/mail/mew/Makefile index d5cd16b6bf36..079625f1a981 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -15,7 +15,8 @@ DISTNAME= mew-${PORTVERSION} MAINTAINER= kiri@kiri.toba-cmt.ac.jp -RESTRICTED= "USA ITAR export restrictions (has PGP hooks)" +### crypto +#RESTRICTED= "USA ITAR export restrictions (has PGP hooks)" RUN_DEPENDS= imali:${PORTSDIR}/mail/im diff --git a/mail/postilion/Makefile b/mail/postilion/Makefile index 7eeadd65bdfa..326c7bc0a37e 100644 --- a/mail/postilion/Makefile +++ b/mail/postilion/Makefile @@ -25,8 +25,8 @@ CONFIGURE_ARGS= --with-tcl-config=${PREFIX}/lib/tcl8.2 #LIB_DEPENDS+= tkstep80.1:${PORTSDIR}/x11-toolkits/tkstep80 \ # Dnd.1:${PORTSDIR}/x11/libdnd \ # tiff.4:${PORTSDIR}/graphics/tiff \ -# jpeg.9:${PORTSDIR}/graphics/jpeg \ -# Xpm.4:${PORTSDIR}/graphics/xpm +# jpeg.9:${PORTSDIR}/graphics/jpeg +#USE_XPM= yes #CONFIGURE_ARGS+= --with-tk-config=${PREFIX}/lib/tkstep8.0 #pre-patch: # ${SED} s/'(DND) 0/(DND) 1'/ ${FILESDIR}/options.tcl > \ diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile index da704e48321f..24e275d1e6cf 100644 --- a/mail/wmbiff/Makefile +++ b/mail/wmbiff/Makefile @@ -14,11 +14,10 @@ MASTER_SITE_SUBDIR= jim MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_GMAKE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/wmbiff USE_X_PREFIX= yes +USE_XPM= yes pre-build: @(cd ${WRKSRC} && ${GMAKE} clean) diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile index 12b5b7924238..d35c8d1a6e9a 100644 --- a/mail/wmmail/Makefile +++ b/mail/wmmail/Makefile @@ -13,14 +13,14 @@ DISTNAME= WMMail.app-${PORTVERSION} MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - PropList.2:${PORTSDIR}/devel/libPropList +LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-PL-libs="-L${LOCALBASE}/lib" \ +CONFIGURE_ARGS= --with-PL-libs="-L${LOCALBASE}/lib" \ --with-PL-incs="-I${LOCALBASE}/include" WRKSRC= ${WRKDIR}/WMMail.app-0.63a USE_X_PREFIX= yes +USE_XPM= yes post-install: @${ECHO} " " diff --git a/mail/wmpop3/Makefile b/mail/wmpop3/Makefile index eb0803fce0a6..57dc247b92e5 100644 --- a/mail/wmpop3/Makefile +++ b/mail/wmpop3/Makefile @@ -13,11 +13,10 @@ DISTNAME= WMPop3-${PORTVERSION} MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PKGNAME}/wmpop3 USE_X_PREFIX= yes +USE_XPM= yes .include <bsd.port.pre.mk> diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile index 7bf640fcfd2c..f8aca42a753a 100644 --- a/mail/xfaces/Makefile +++ b/mail/xfaces/Makefile @@ -20,10 +20,10 @@ DISTFILES= ${DISTNAME}.tar.Z xfaces-sounds.tar.gz MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE BUILD_DEPENDS= ${X11BASE}/lib/libaudio.a:${PORTSDIR}/audio/nas -LIB_DEPENDS= compface.1:${PORTSDIR}/mail/faces \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= compface.1:${PORTSDIR}/mail/faces USE_IMAKE= YES +USE_XPM= YES MAN1= xfaces.1 pre-configure: diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index b669a539c3be..797c28edeb32 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -12,11 +12,11 @@ MASTER_SITES= ftp://xfmail.ufies.org/pub/xfmail/release/1.4.0/ MAINTAINER= gena@NetVision.net.il -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - xforms.0:${PORTSDIR}/x11-toolkits/xforms +LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms USE_BZIP2= yes USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-dead-keys --with-xkb-dead-keys MAN1= xfmail.1 diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile index 6abd4f74d781..1fa5165e0637 100644 --- a/mail/xmail/Makefile +++ b/mail/xmail/Makefile @@ -14,9 +14,8 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= xmail.1 MANCOMPRESSED= no diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile index 1f419f5aeae1..d90bbe7932c6 100644 --- a/mail/xmailbox/Makefile +++ b/mail/xmailbox/Makefile @@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= xmailbox.1 post-patch: diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile index 3877551a3c98..44ae9b4a3ae5 100644 --- a/mail/xpbiff/Makefile +++ b/mail/xpbiff/Makefile @@ -14,9 +14,8 @@ DISTFILES= xpbiff-1.27-with-YOUBIN.tar.gz.uu MAINTAINER= sanpei@sanpei.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes WRKSRC= ${WRKDIR}/xpbiff diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile index 76cd33d57ae4..29cdf4a20e81 100644 --- a/mail/youbin/Makefile +++ b/mail/youbin/Makefile @@ -13,9 +13,8 @@ MASTER_SITES= ftp://ftp.nuie.nagoya-u.ac.jp/pub/nagoya-u/ \ MAINTAINER= max@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes PREFIX?= ${LOCALBASE} MTREE_FILE?= /etc/mtree/BSD.local.dist diff --git a/math/PDL/Makefile b/math/PDL/Makefile index bbb84f26ac87..21058a1d2604 100644 --- a/math/PDL/Makefile +++ b/math/PDL/Makefile @@ -17,8 +17,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/PGPLOT. ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/ExtUtils/F77.pm:${PORTSDIR}/lang/p5-F77 RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/PGPLOT.pm:${PORTSDIR}/graphics/pgperl \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Term/ReadLine/readline.pm:${PORTSDIR}/devel/p5-ReadLine-Perl -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 +USE_MESA= yes USE_PERL5= yes SCRIPTS_ENV= PERL=${PERL} diff --git a/math/abs/Makefile b/math/abs/Makefile index 7fb6d64bad5d..97c37921e3e7 100644 --- a/math/abs/Makefile +++ b/math/abs/Makefile @@ -14,9 +14,8 @@ DISTNAME= abs-src-0.6a MAINTAINER= gmarco@giovannelli.it -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_XLIB= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/abs-src-0.6a/src do-install: diff --git a/math/grace/Makefile b/math/grace/Makefile index dc955d003df2..32ad1d4bc35f 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -23,7 +23,6 @@ MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE BUILD_DEPENDS= ${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp LIB_DEPENDS= Xbae.7:${PORTSDIR}/x11-toolkits/xbae \ - Xpm.4:${PORTSDIR}/graphics/xpm \ netcdf.1:${PORTSDIR}/math/netcdf \ fftw.2:${PORTSDIR}/math/fftw \ pdf.2:${PORTSDIR}/print/pdflib \ @@ -35,6 +34,7 @@ LIB_DEPENDS= Xbae.7:${PORTSDIR}/x11-toolkits/xbae \ MAN1= grace.1 xmgrace.1 gracebat.1 grconvert.1 USE_X_PREFIX= YES +USE_XPM= yes USE_GMAKE= YES REQUIRES_MOTIF= YES HAS_CONFIGURE= YES diff --git a/math/siag/Makefile b/math/siag/Makefile index e597280d6299..bf747bbaed38 100644 --- a/math/siag/Makefile +++ b/math/siag/Makefile @@ -15,8 +15,7 @@ MASTER_SITES= ftp://ftp.siag.nu/pub/siag/ \ MAINTAINER= mi@aldan.algebra.com LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \ - Magick:${PORTSDIR}/graphics/ImageMagick \ - Xpm.4:${PORTSDIR}/graphics/xpm + Magick:${PORTSDIR}/graphics/ImageMagick RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \ mswordview:${PORTSDIR}/textproc/mswordview \ catdoc:${PORTSDIR}/textproc/catdoc @@ -51,6 +50,7 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ CPPFLAGS="${CPPFLAGS}" USE_X_PREFIX= yes +USE_XPM= yes MAN1= xedplus.1 xfiler.1 gvu.1 siod.1 siag.1 pw.1 egon.1 \ dummy_plugin.1 runcmd.1 diff --git a/math/vtk/Makefile b/math/vtk/Makefile index 1c5f8008184a..c1e1e67aef2a 100644 --- a/math/vtk/Makefile +++ b/math/vtk/Makefile @@ -13,9 +13,9 @@ DISTNAME= vtk312Unix MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 \ - tk82.1:${PORTSDIR}/x11-toolkits/tk82 +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 +USE_MESA= yes WRKSRC= ${WRKDIR}/vtk31 INSTALLS_SHLIB= yes GNU_CONFIGURE= yes diff --git a/math/vtk43/Makefile b/math/vtk43/Makefile index 1c5f8008184a..c1e1e67aef2a 100644 --- a/math/vtk43/Makefile +++ b/math/vtk43/Makefile @@ -13,9 +13,9 @@ DISTNAME= vtk312Unix MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 \ - tk82.1:${PORTSDIR}/x11-toolkits/tk82 +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 +USE_MESA= yes WRKSRC= ${WRKDIR}/vtk31 INSTALLS_SHLIB= yes GNU_CONFIGURE= yes diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 1c5f8008184a..c1e1e67aef2a 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -13,9 +13,9 @@ DISTNAME= vtk312Unix MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 \ - tk82.1:${PORTSDIR}/x11-toolkits/tk82 +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 +USE_MESA= yes WRKSRC= ${WRKDIR}/vtk31 INSTALLS_SHLIB= yes GNU_CONFIGURE= yes diff --git a/math/wmcalc/Makefile b/math/wmcalc/Makefile index 8e451ee18b32..43e80541751f 100644 --- a/math/wmcalc/Makefile +++ b/math/wmcalc/Makefile @@ -12,10 +12,9 @@ MASTER_SITES= http://members.access1.net/ehflora/wmcalc/ MAINTAINER= jedgar@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - ALL_TARGET= clean wmcalc USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/wmcalc do-install: diff --git a/misc/asbutton/Makefile b/misc/asbutton/Makefile index d7cbb4e28742..7090069a5e79 100644 --- a/misc/asbutton/Makefile +++ b/misc/asbutton/Makefile @@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= apps/asbutton MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes ALL_TARGET= asbutton do-install: diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile index f081443f5db6..8b81a4a7a765 100644 --- a/misc/magicpoint/Makefile +++ b/misc/magicpoint/Makefile @@ -13,10 +13,10 @@ MASTER_SITES= ftp://ftp.mew.org/pub/MagicPoint/ MAINTAINER?= mita@jp.FreeBSD.org -LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ - png.4:${PORTSDIR}/graphics/png +LIB_DEPENDS+= png.4:${PORTSDIR}/graphics/png USE_IMAKE= yes +USE_FREETYPE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS?=--disable-vflib diff --git a/misc/wmcp/Makefile b/misc/wmcp/Makefile index 5f0a6d36f732..ec55329a0969 100644 --- a/misc/wmcp/Makefile +++ b/misc/wmcp/Makefile @@ -12,10 +12,9 @@ MASTER_SITES= http://users.linuxbox.com/~bac/src/wmcp/ MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes pre-build: (cd ${WRKSRC} && ${GMAKE} clean) diff --git a/misc/wmmand/Makefile b/misc/wmmand/Makefile index 5b3542ca4cb6..1ad06accace6 100644 --- a/misc/wmmand/Makefile +++ b/misc/wmmand/Makefile @@ -12,12 +12,11 @@ DISTNAME= wmMand-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/${DISTNAME}/wmMand USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes ALL_TARGET= clean all MAN1= wmMand.1 diff --git a/misc/wmstock/Makefile b/misc/wmstock/Makefile index fb032b8a4abe..4690bbe80a2e 100644 --- a/misc/wmstock/Makefile +++ b/misc/wmstock/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://mattfischer.com/wmstock/src/ MAINTAINER= will@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/wmstock/src USE_GMAKE= yes diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile index 7b4592f81ce9..f4b7b24919d5 100644 --- a/misc/wmweather/Makefile +++ b/misc/wmweather/Makefile @@ -11,12 +11,11 @@ MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/ MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/${DISTNAME}/Src USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes ALL_TARGET= clean all MAN1= wmWeather.1 diff --git a/misc/xquote/Makefile b/misc/xquote/Makefile index 1555a0a30560..30bea132fef5 100644 --- a/misc/xquote/Makefile +++ b/misc/xquote/Makefile @@ -13,11 +13,10 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= mph@freebsd.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - REQUIRES_MOTIF= yes USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes .include <bsd.port.mk> diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile index 480b837ac544..141041d6fc17 100644 --- a/multimedia/fxtv/Makefile +++ b/multimedia/fxtv/Makefile @@ -14,8 +14,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= aa8vb@nc.rr.com LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \ - Xpm.4:${PORTSDIR}/graphics/xpm + Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d # This program does not actually require the programs below unless you # use audio/video recording and/or playback and save to a non-raw format. @@ -26,6 +25,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ # mplex:${PORTSDIR}/graphics/mplex USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes MAKE_FLAGS= -e MAN1= fxtv.1 diff --git a/net/cnet/Makefile b/net/cnet/Makefile index 47094704a89f..a18b80ac1527 100644 --- a/net/cnet/Makefile +++ b/net/cnet/Makefile @@ -12,10 +12,10 @@ MASTER_SITES= http://www.cs.uwa.edu.au/cnet/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes ALL_TARGET= # empty MAN1= cnet.1 diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile index 61acffcecd44..c0c6abddbff8 100644 --- a/net/ppxp/Makefile +++ b/net/ppxp/Makefile @@ -16,8 +16,7 @@ MASTER_SITES= http://www.dsl.gr.jp/~manabe/PPxP/packages/ \ MAINTAINER= nosuzuki@e-mail.ne.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - xforms.0:${PORTSDIR}/x11-toolkits/xforms +LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms .if defined(WITH_TCLJP) BUILD_DEPENDS= wish8.0jp:${PORTSDIR}/japanese/tk80 \ tclsh8.0jp:${PORTSDIR}/japanese/tcl80 @@ -32,6 +31,7 @@ RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 \ tclsh8.2:${PORTSDIR}/lang/tcl82 .endif +USE_XPM= yes WRKSRC= ${WRKDIR}/ppxp USE_GMAKE= yes MAKEFILE= makefile diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile index 8b0bd5f8fc29..7e91349f4859 100644 --- a/net/wmnet/Makefile +++ b/net/wmnet/Makefile @@ -12,8 +12,7 @@ MASTER_SITES= ftp://ftp.enteract.com/users/rneswold/ MAINTAINER= rneswold@enteract.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes MAN1= wmnet.1 .include <bsd.port.mk> diff --git a/net/xisp/Makefile b/net/xisp/Makefile index 668e5ff52f2b..ddefce82dd36 100644 --- a/net/xisp/Makefile +++ b/net/xisp/Makefile @@ -14,9 +14,9 @@ DISTFILES= xisp-2.6-noufc.tar.gz \ MAINTAINER= morishim@cig.mot.com -LIB_DEPENDS= xforms:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= xforms:${PORTSDIR}/x11-toolkits/xforms +USE_XPM= yes WRKSRC= ${WRKDIR}/xisp-2.6 MAN1= xisp.1 HAS_CONFIGURE= yes diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index dfdd328a60a7..ff8c6b3fdc33 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -14,13 +14,13 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - GL.14:${PORTSDIR}/graphics/Mesa3 \ gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \ tiff.4:${PORTSDIR}/graphics/tiff GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_MESA= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib \ --with-lib-GL diff --git a/news/knews/Makefile b/news/knews/Makefile index 7413e7b7f049..40d6e8cf37f9 100644 --- a/news/knews/Makefile +++ b/news/knews/Makefile @@ -12,13 +12,13 @@ MASTER_SITES= http://www.matematik.su.se/~kjj/ MAINTAINER= andreas@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png # compface:${PORTSDIR}/mail/faces RUN_DEPENDS= newsp:${PORTSDIR}/print/mp-letter USE_IMAKE= yes +USE_XPM= yes MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \ XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f diff --git a/palm/pose/Makefile b/palm/pose/Makefile index ad75e5bd0fdc..34c2f32e416b 100644 --- a/palm/pose/Makefile +++ b/palm/pose/Makefile @@ -13,9 +13,9 @@ DISTNAME= emulator_src_30a6 MAINTAINER= dirk@FreeBSD.org -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ - GL.14:${PORTSDIR}/graphics/Mesa3 +LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk +USE_MESA= yes WRKSRC= ${WRKDIR}/Emulator_Src_${PORTVERSION}/BuildUnix USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/palm/xcopilot/Makefile b/palm/xcopilot/Makefile index 652ef85dd8a7..98844ac17f96 100644 --- a/palm/xcopilot/Makefile +++ b/palm/xcopilot/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://xcopilot.cuspy.com/build/ MAINTAINER= nsayer@quack.kfu.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index 4a6531521995..16e4901c0e72 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -20,9 +20,9 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .endif LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext +USE_XPM= yes USE_NEWGCC= yes USE_PERL5= yes USE_LIBTOOL= yes diff --git a/print/latex-cjk/Makefile b/print/latex-cjk/Makefile index 499d4b240c05..37b667f88e2b 100644 --- a/print/latex-cjk/Makefile +++ b/print/latex-cjk/Makefile @@ -16,12 +16,12 @@ MAINTAINER= keith@freebsd.sinica.edu.tw BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX \ ${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf \ ttf2pk:${PORTSDIR}/print/freetype:build -LIB_DEPENDS= ttf.4:${PORTSDIR}/print/freetype RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX NO_PACKAGE= "Needs ttf2pk source from FreeType" USE_GMAKE= yes +USE_FREETYPE= yes WRKSRC= ${WRKDIR}/cjk-current post-install: diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile index 20aab60c1500..18822e8e0987 100644 --- a/print/lyx-devel/Makefile +++ b/print/lyx-devel/Makefile @@ -20,9 +20,9 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .endif LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext +USE_XPM= yes USE_NEWGCC= yes USE_PERL5= yes USE_LIBTOOL= yes diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 20aab60c1500..18822e8e0987 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -20,9 +20,9 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .endif LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext +USE_XPM= yes USE_NEWGCC= yes USE_PERL5= yes USE_LIBTOOL= yes diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile index 20aab60c1500..18822e8e0987 100644 --- a/print/lyx14/Makefile +++ b/print/lyx14/Makefile @@ -20,9 +20,9 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .endif LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext +USE_XPM= yes USE_NEWGCC= yes USE_PERL5= yes USE_LIBTOOL= yes diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile index 20aab60c1500..18822e8e0987 100644 --- a/print/lyx15/Makefile +++ b/print/lyx15/Makefile @@ -20,9 +20,9 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .endif LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext +USE_XPM= yes USE_NEWGCC= yes USE_PERL5= yes USE_LIBTOOL= yes diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile index 20aab60c1500..18822e8e0987 100644 --- a/print/lyx16/Makefile +++ b/print/lyx16/Makefile @@ -20,9 +20,9 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .endif LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext +USE_XPM= yes USE_NEWGCC= yes USE_PERL5= yes USE_LIBTOOL= yes diff --git a/print/mgv/Makefile b/print/mgv/Makefile index 5f001d222e69..eedeb15c9167 100644 --- a/print/mgv/Makefile +++ b/print/mgv/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.trends.net/~mu/srcs/ MAINTAINER= handy@physics.montana.edu -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes REQUIRES_MOTIF= yes GNU_CONFIGURE= yes CONFIGURE_ENV= X11BASE=${X11BASE} diff --git a/print/offix-printer/Makefile b/print/offix-printer/Makefile index efe319450321..44e8c9fde640 100644 --- a/print/offix-printer/Makefile +++ b/print/offix-printer/Makefile @@ -14,12 +14,12 @@ DISTNAME= Printer-2.4 MAINTAINER= ruslan@shevchenko.kiev.ua -LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd GNU_CONFIGURE= YES USE_GMAKE= YES USE_X_PREFIX= YES +USE_XPM= YES MAN1= printer.1 .include <bsd.port.mk> diff --git a/print/perlftlib/Makefile b/print/perlftlib/Makefile index 59f07251941b..b10a2848fad3 100644 --- a/print/perlftlib/Makefile +++ b/print/perlftlib/Makefile @@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR= sada MAINTAINER= taoka@FreeBSD.org -LIB_DEPENDS= ttf.4:${PORTSDIR}/print/freetype RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/jcode.pl:${PORTSDIR}/japanese/p5-jcode.pl +USE_FREETYPE= yes USE_PERL5= yes NOMANCOMPRESS= yes MAN1= mkttfdir.1 ftinfo.1 diff --git a/print/transfig/Makefile b/print/transfig/Makefile index 69766f739c54..6880715fde3c 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -15,11 +15,11 @@ DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= chuckr@freebsd.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm USE_IMAKE= yes +USE_XPM= yes MAN1= fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1 post-patch: diff --git a/russian/wmcyrx/Makefile b/russian/wmcyrx/Makefile index f798a4303857..c889908c37b7 100644 --- a/russian/wmcyrx/Makefile +++ b/russian/wmcyrx/Makefile @@ -16,8 +16,7 @@ DISTNAME= cyrx-${PORTVERSION} MAINTAINER= ozz@FreeBSD.org.ru -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - +USE_XPM= yes NO_INSTALL_MANPAGES= yes .include <bsd.port.pre.mk> diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 6ca53cc01430..5e41737f1735 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -13,11 +13,10 @@ MASTER_SITE_SUBDIR= apps/asapm MAINTAINER= handy@physics.montana.edu -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - ONLY_FOR_ARCHS= i386 USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes INSTALL_TARGET= install install.man diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile index 515b58694d59..2e9d6cc2fbc8 100644 --- a/sysutils/ascpu/Makefile +++ b/sysutils/ascpu/Makefile @@ -13,10 +13,10 @@ MASTER_SITES= http://www.tigr.net/afterstep/as-apps/download/ascpu/ \ MAINTAINER= dima@Chg.RU -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xpm CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/asfsm/Makefile b/sysutils/asfsm/Makefile index bce914c195d0..54b9e1d6f913 100644 --- a/sysutils/asfsm/Makefile +++ b/sysutils/asfsm/Makefile @@ -12,11 +12,10 @@ DISTNAME= asfsm-1.0pre15 MAINTAINER= jack@germanium.xtalwind.net -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--x-includes=${X11BASE}/include/X11 +CONFIGURE_ARGS= --x-includes=${X11BASE}/include/X11 MAN1= asfsm.1 diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile index a923380f3201..82e27277d3f2 100644 --- a/sysutils/asmem/Makefile +++ b/sysutils/asmem/Makefile @@ -14,12 +14,11 @@ MASTER_SITE_SUBDIR= apps/asmem MAINTAINER= jack@germanium.xtalwind.net -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes MAKEFILE= Makefile.UNIX MAN1= asmem.1 -MAKE_ENV+= PCFLAGS="${CFLAGS}" +MAKE_ENV= PCFLAGS="${CFLAGS}" .include <bsd.port.pre.mk> .if ${OSVERSION} >= 400000 diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile index eb0089b597e5..6bea94c82687 100644 --- a/sysutils/asmon/Makefile +++ b/sysutils/asmon/Makefile @@ -13,12 +13,11 @@ MASTER_SITE_SUBDIR= apps/asmon MAINTAINER= jack@germanium.xtalwind.net -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes .include <bsd.port.pre.mk> +USE_XPM= yes USE_GMAKE= yes ALL_TARGET= clean all diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile index 008e12e8cbe2..36cca0d7d070 100644 --- a/sysutils/glload/Makefile +++ b/sysutils/glload/Makefile @@ -14,9 +14,8 @@ MASTER_SITE_SUBDIR= vanilla MAINTAINER= vanilla@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - USE_X_PREFIX= yes +USE_MESA= yes MAKEFILE= Makefile.FreeBSD ALL_TARGET= glload diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile index 42500f73cffa..bd386cf047d0 100644 --- a/sysutils/gnomefind/Makefile +++ b/sysutils/gnomefind/Makefile @@ -15,8 +15,7 @@ DISTNAME= gnome-find-${PORTVERSION} MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - glade.4:${PORTSDIR}/devel/libglade \ - Xpm.4:${PORTSDIR}/graphics/xpm + glade.4:${PORTSDIR}/devel/libglade RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config @@ -28,6 +27,7 @@ CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ LDFLAGS="-lgnuregex -L${LOCALBASE}/lib" USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes MAN1= gnome-find.1 diff --git a/sysutils/wmapm/Makefile b/sysutils/wmapm/Makefile index f699a746ba9d..c588b42ce27a 100644 --- a/sysutils/wmapm/Makefile +++ b/sysutils/wmapm/Makefile @@ -12,12 +12,11 @@ MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/ MAINTAINER= taoka@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/${DISTNAME}/wmapm USE_GMAKE= yes ONLY_FOR_ARCHS= i386 USE_X_PREFIX= yes +USE_XPM= yes BINMODE= 2755 BINGRP= operator diff --git a/sysutils/wmavgload/Makefile b/sysutils/wmavgload/Makefile index 2a8e0153c7c1..161c5a6694e8 100644 --- a/sysutils/wmavgload/Makefile +++ b/sysutils/wmavgload/Makefile @@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= contrib/srcs/utils MAINTAINER= kushn@mail.kar.net -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes .include <bsd.port.mk> diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile index f5aad19594b9..83bcb4f7d167 100644 --- a/sysutils/wmbattery/Makefile +++ b/sysutils/wmbattery/Makefile @@ -13,12 +13,10 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes - +USE_XPM= yes USE_GMAKE= yes MAKE_ENV= PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}" diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile index 60a79224e639..793c32b97597 100644 --- a/sysutils/wmfire/Makefile +++ b/sysutils/wmfire/Makefile @@ -13,12 +13,11 @@ DISTNAME= wmfire-0.0.3.9pre4 MAINTAINER= jedgar@fxp.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-x -CONFIGURE_ENV+= CFLAGS="-I${PREFIX}/include ${CFLAGS}" \ +CONFIGURE_ENV= CFLAGS="-I${PREFIX}/include ${CFLAGS}" \ LIBS="-L${PREFIX}/lib" .include <bsd.port.mk> diff --git a/sysutils/wmhm/Makefile b/sysutils/wmhm/Makefile index eae665e8a459..501e8bbcd595 100644 --- a/sysutils/wmhm/Makefile +++ b/sysutils/wmhm/Makefile @@ -14,10 +14,9 @@ MASTER_SITES= ftp://muir.yi.org/pub/wmhm/ \ MAINTAINER= mmuir@es.co.nz -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/wmhm/wmhm +USE_XPM= yes GNU_CONFIGURE= yes MAN8= wmhm.8 MANCOMPRESSED= yes diff --git a/sysutils/wminet/Makefile b/sysutils/wminet/Makefile index ef7c16ebc929..a7f656a96b93 100644 --- a/sysutils/wminet/Makefile +++ b/sysutils/wminet/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.neotokyo.org/illusion/ MAINTAINER= sk-ports@vegamuse.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/wminet.app/wminet diff --git a/sysutils/wmlmmon/Makefile b/sysutils/wmlmmon/Makefile index b54a1729b5bc..9097e78af792 100644 --- a/sysutils/wmlmmon/Makefile +++ b/sysutils/wmlmmon/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.fxp.org/~jedgar/wmlmmon/ MAINTAINER= jedgar@fxp.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes MAN8= wmlmmon.8 diff --git a/sysutils/wmmon/Makefile b/sysutils/wmmon/Makefile index 3b3d682ad66b..94d373b25a5f 100644 --- a/sysutils/wmmon/Makefile +++ b/sysutils/wmmon/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://linux.tucows.com/files/x11/dock/ MAINTAINER= sk-ports@vegamuse.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/wmmon.app/wmmon USE_X_PREFIX= yes +USE_XPM= yes .if !defined(NOPORTDOCS) post-install: diff --git a/sysutils/wmmount/Makefile b/sysutils/wmmount/Makefile index 50f23340519b..39f33377de55 100644 --- a/sysutils/wmmount/Makefile +++ b/sysutils/wmmount/Makefile @@ -14,10 +14,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= ozz@FreeBSD.org.ru -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes post-patch: diff --git a/sysutils/wmpccard/Makefile b/sysutils/wmpccard/Makefile index 4d57cbac7aa5..2f25c6964b05 100644 --- a/sysutils/wmpccard/Makefile +++ b/sysutils/wmpccard/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.sra.co.jp/people/m-kasahr/wmpccard/src/ MAINTAINER= taoka@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes MAN1= wmpccard.1.gz NOMANCOMPRESS= yes diff --git a/sysutils/wmtop/Makefile b/sysutils/wmtop/Makefile index 05f9509e5a11..aff6d0efcc06 100644 --- a/sysutils/wmtop/Makefile +++ b/sysutils/wmtop/Makefile @@ -12,9 +12,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= wmtop@tanelorn.demon.co.uk -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes ALL_TARGET= freebsd MAN1= wmtop.1 diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile index 33f52f884ad2..7ade37def8b2 100644 --- a/sysutils/xbatt/Makefile +++ b/sysutils/xbatt/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://www.clave.gr.jp/~eto/xbatt/ MAINTAINER= nobu@psrc.isac.co.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - ONLY_FOR_ARCHS= i386 USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes .include <bsd.port.mk> diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile index 6143d62c2fc3..4708e557839d 100644 --- a/www/Mosaic/Makefile +++ b/www/Mosaic/Makefile @@ -14,13 +14,13 @@ DISTNAME= Mosaic-src-2.7b5 MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.4:${PORTSDIR}/graphics/png \ - Xpm.4:${PORTSDIR}/graphics/xpm \ + png.4:${PORTSDIR}/graphics/png REQUIRES_MOTIF= yes WRKSRC= ${WRKDIR}/Mosaic-src ALL_TARGET= bsdi USE_X_PREFIX= yes +USE_XPM= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/Mosaic ${PREFIX}/bin diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile index 6be554f25f68..418f12d32448 100644 --- a/www/screem-devel/Makefile +++ b/www/screem-devel/Makefile @@ -19,13 +19,13 @@ LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ xml.5:${PORTSDIR}/textproc/libxml \ glade.4:${PORTSDIR}/devel/libglade \ guile.6:${PORTSDIR}/lang/guile \ - wwwcore.1:${PORTSDIR}/www/libwww \ - Xpm.4:${PORTSDIR}/graphics/xpm + wwwcore.1:${PORTSDIR}/www/libwww RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter USE_GMAKE= yes USE_LIBTOOL= yes USE_X_PREFIX= yes +USE_XPM= yes GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config diff --git a/www/screem/Makefile b/www/screem/Makefile index 6be554f25f68..418f12d32448 100644 --- a/www/screem/Makefile +++ b/www/screem/Makefile @@ -19,13 +19,13 @@ LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ xml.5:${PORTSDIR}/textproc/libxml \ glade.4:${PORTSDIR}/devel/libglade \ guile.6:${PORTSDIR}/lang/guile \ - wwwcore.1:${PORTSDIR}/www/libwww \ - Xpm.4:${PORTSDIR}/graphics/xpm + wwwcore.1:${PORTSDIR}/www/libwww RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter USE_GMAKE= yes USE_LIBTOOL= yes USE_X_PREFIX= yes +USE_XPM= yes GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config diff --git a/www/vrweb/Makefile b/www/vrweb/Makefile index 91e411241d53..f37674abc398 100644 --- a/www/vrweb/Makefile +++ b/www/vrweb/Makefile @@ -15,10 +15,9 @@ DISTFILES= vrweb-src-1.5.tar.gz help-1.5.tar.gz MAINTAINER= saper@system.pl -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - USE_GMAKE= yes USE_X_PREFIX= yes +USE_MESA= yes do-configure: (cd ${WRKSRC}; \ diff --git a/www/wmnetselect/Makefile b/www/wmnetselect/Makefile index dc5578f4a24a..bdce28db622e 100644 --- a/www/wmnetselect/Makefile +++ b/www/wmnetselect/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://home.att.net/~apathos/code/ MAINTAINER= nugget@slacker.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes do-install: diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile index 54d69db5fd52..11580f77de67 100644 --- a/x11-clocks/asclock-xlib/Makefile +++ b/x11-clocks/asclock-xlib/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://www.asclock.org/tar/ MAINTAINER= kuriyama@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - HAS_CONFIGURE= YES WRKSRC= ${WRKDIR}/asclock-xlib USE_X_PREFIX= YES +USE_XPM= YES post-patch: @(cd ${WRKSRC}; \ diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile index d72a7eb3a973..077ca5c9d21b 100644 --- a/x11-clocks/asclock/Makefile +++ b/x11-clocks/asclock/Makefile @@ -15,9 +15,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= asclock.1 pre-configure: diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile index 953e2ac02b7e..61f5e4f8482f 100644 --- a/x11-clocks/astime/Makefile +++ b/x11-clocks/astime/Makefile @@ -14,9 +14,8 @@ MASTER_SITES= ftp://ftp.afterstep.org/apps/astime/ \ MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes INSTALL_TARGET= install install.man diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile index b45781f1e139..11f07e56c3f0 100644 --- a/x11-clocks/eyeclock/Makefile +++ b/x11-clocks/eyeclock/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://www.seki.ee.kagu.sut.ac.jp/~sakai/ MAINTAINER= kiri@pis.toba-cmt.ac.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - #ALL_TARGET= all USE_X_PREFIX= yes +USE_XPM= yes MAN1= eyeclock.1 MANCOMPRESSED= yes diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile index d2af4b58d8e1..7ec2cbf7ab39 100644 --- a/x11-clocks/glclock/Makefile +++ b/x11-clocks/glclock/Makefile @@ -14,9 +14,8 @@ MASTER_SITES= http://www.daionet.gr.jp/~masa/archives/ \ MAINTAINER= aa8vb@ipass.net -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - USE_X_PREFIX= yes +USE_MESA= yes MAKEFILE= makefile ALL_TARGET= glclock diff --git a/x11-clocks/pclock/Makefile b/x11-clocks/pclock/Makefile index bb634887dbfd..fda4d6ec4503 100644 --- a/x11-clocks/pclock/Makefile +++ b/x11-clocks/pclock/Makefile @@ -13,10 +13,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/pclock ${PREFIX}/bin diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile index ce330d2e9233..0da027632bd8 100644 --- a/x11-clocks/wmcalclock/Makefile +++ b/x11-clocks/wmcalclock/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/ MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm/ - WRKSRC= ${WRKDIR}/${DISTNAME}/Src USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes ALL_TARGET= clean all diff --git a/x11-clocks/wmdate/Makefile b/x11-clocks/wmdate/Makefile index 8841cb2aafaa..385a094af6bb 100644 --- a/x11-clocks/wmdate/Makefile +++ b/x11-clocks/wmdate/Makefile @@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR= jim MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm BUILD_DEPENDS= ${X11BASE}/include/dockapp.h:${PORTSDIR}/x11-wm/libdockapp USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes post-install: diff --git a/x11-clocks/wmitime/Makefile b/x11-clocks/wmitime/Makefile index f84ce9809275..65e7cb69eabf 100644 --- a/x11-clocks/wmitime/Makefile +++ b/x11-clocks/wmitime/Makefile @@ -12,10 +12,9 @@ MASTER_SITES= http://www.neotokyo.org/illusion/downloads/ MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/wmitime/wmitime diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile index 399582e221f8..a920abe11fd1 100644 --- a/x11-clocks/wmtime/Makefile +++ b/x11-clocks/wmtime/Makefile @@ -12,10 +12,9 @@ MASTER_SITES= ftp://ftp.enteract.com/users/rneswold/ MAINTAINER= rneswold@enteract.com -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/wmtime.app/wmtime USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= 1 post-extract: diff --git a/x11-clocks/wmtz/Makefile b/x11-clocks/wmtz/Makefile index 30d1cd97d5d5..de2c1cf928e1 100644 --- a/x11-clocks/wmtz/Makefile +++ b/x11-clocks/wmtz/Makefile @@ -14,11 +14,10 @@ MASTER_SITE_SUBDIR= jim MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_GMAKE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/wmtz USE_X_PREFIX= yes +USE_XPM= yes post-install: @${ECHO} "===> Installing wmtzrc in ${PREFIX}/share/examples/wmtz" diff --git a/x11-clocks/xtu/Makefile b/x11-clocks/xtu/Makefile index 08873f0cb7c7..bb0ea52db609 100644 --- a/x11-clocks/xtu/Makefile +++ b/x11-clocks/xtu/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.rostock.zgdv.de/~runge/xtu/ MAINTAINER= runge@rostock.zgdv.de -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes #post-install: # strip ${PREFIX}/bin/xtu diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile index d5099b70f5a1..42e496ef50ef 100644 --- a/x11-fm/asfiles/Makefile +++ b/x11-fm/asfiles/Makefile @@ -14,11 +14,11 @@ DISTNAME= ASFiles-${PORTVERSION} MAINTAINER= lukin@okbmei.msk.su -LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd GNU_CONFIGURE= yes USE_X_PREFIX= yes +USE_XPM= yes MAN1= files.1 MAN3= regexp.3 diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile index 6d460288e3e3..07cbbe555d0b 100644 --- a/x11-fm/dfm/Makefile +++ b/x11-fm/dfm/Makefile @@ -12,13 +12,13 @@ MASTER_SITES= http://linux.tucows.com/files/x11/file/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib +LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib GTK_CONFIG?= ${X11BASE}/bin/gtk12-config WRKSRC= ${WRKDIR}/${PORTNAME} USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ diff --git a/x11-fm/endeavour/Makefile b/x11-fm/endeavour/Makefile index 3669eecf6125..6da0aa0531c9 100644 --- a/x11-fm/endeavour/Makefile +++ b/x11-fm/endeavour/Makefile @@ -14,12 +14,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib WRKSRC= ${WRKDIR}/${DISTNAME}/endeavour USE_X_PREFIX= yes +USE_XPM= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/endeavour ${PREFIX}/bin diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile index e11a0e96307f..a25415ce1e48 100644 --- a/x11-fm/fsv/Makefile +++ b/x11-fm/fsv/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://fox.mit.edu/skunk/soft/src/ MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - GL.14:${PORTSDIR}/graphics/Mesa3 \ gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_MESA= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-GL-prefix=${X11BASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-fm/offix-files/Makefile b/x11-fm/offix-files/Makefile index d02a91b5207e..684e5f3b6515 100644 --- a/x11-fm/offix-files/Makefile +++ b/x11-fm/offix-files/Makefile @@ -17,12 +17,12 @@ MAINTAINER= ruslan@shevchenko.kiev.ua RUN_DEPENDS= execute:${PORTSDIR}/x11/offix-execute \ editor:${PORTSDIR}/editors/offix-editor -LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd GNU_CONFIGURE= YES USE_GMAKE= YES USE_X_PREFIX= YES +USE_XPM= YES MAN1= files.1 MAN3= regexp.3 diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile index d371f73b9df5..4fa9d6ad41ad 100644 --- a/x11-fm/xfm/Makefile +++ b/x11-fm/xfm/Makefile @@ -12,10 +12,10 @@ MASTER_SITES= ftp://ftp.uni-koeln.de/windows/xcontrib/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d USE_IMAKE= yes +USE_XPM= yes MAN1= xfm.1 xfmtype.1 .include <bsd.port.mk> diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile index a0460db0e199..e1290b240380 100644 --- a/x11-fonts/ttmkfdir/Makefile +++ b/x11-fonts/ttmkfdir/Makefile @@ -13,10 +13,9 @@ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= ttf.4:${PORTSDIR}/print/freetype - NO_WRKSUBDIR= yes USE_X_PREFIX= yes +USE_FREETYPE= yes do-build: cd ${WRKSRC}; ${CC} ${CFLAGS} -I${LOCALBASE}/include/freetype \ diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile index 7f9b47900e97..8c87768f715c 100644 --- a/x11-fonts/xmbdfed/Makefile +++ b/x11-fonts/xmbdfed/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= ftp://crl.nmsu.edu/CLR/multiling/General/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= ttf.4:${PORTSDIR}/print/freetype - USE_X_PREFIX= yes +USE_FREETYPE= yes REQUIRES_MOTIF= yes MAN1= xmbdfed.1 diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile index 18414983e0be..0e0c0dd1cbf1 100644 --- a/x11-servers/XttXF86srv-common/Makefile +++ b/x11-servers/XttXF86srv-common/Makefile @@ -15,7 +15,6 @@ DISTFILES= X336src-1.tgz xtt-${VERSION}.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp -LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype RUN_DEPENDS+= mkttfdir:${PORTSDIR}/print/perlftlib VERSION= 1.3 @@ -33,6 +32,7 @@ DISTFILES+= Wraphelp.c IGNOREFILES= Wraphelp.c .endif USE_X_PREFIX= YES +USE_FREETYPE= YES EXTRACT_ONLY= X336src-1.tgz xtt-${VERSION}.tgz BINOWN= root BINGRP= wheel diff --git a/x11-toolkits/FWF/Makefile b/x11-toolkits/FWF/Makefile index 11dc6076d917..ec33d1730161 100644 --- a/x11-toolkits/FWF/Makefile +++ b/x11-toolkits/FWF/Makefile @@ -14,14 +14,13 @@ MASTER_SITE_SUBDIR=libs/X/fwf MAINTAINER= jseger@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - .if ${MACHINE_ARCH} == "alpha" BROKEN= ../../lib/libfwf.a: cannot read symbols .endif REQUIRES_MOTIF= yes USE_IMAKE= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/FWF XMKMF= ${SETENV} X11BASE=${X11BASE} WRKSRC=${WRKSRC} sh ${FILESDIR}/xmkmf diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile index 20eeb7a5ccbf..1717ee91ccc6 100644 --- a/x11-toolkits/fltk/Makefile +++ b/x11-toolkits/fltk/Makefile @@ -18,8 +18,6 @@ DISTNAME= ${PKGNAME}-source MAINTAINER= dima@chg.ru -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - VERSION= 1.0.9 USE_BZIP2= yes INSTALLS_SHLIB= yes @@ -27,6 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared WRKSRC= ${WRKDIR}/${PKGNAME} USE_X_PREFIX= yes +USE_MESA= yes MAN1= fluid.1 post-install: diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile index 9377caa92da2..d435d5ce0f59 100644 --- a/x11-toolkits/fox-devel/Makefile +++ b/x11-toolkits/fox-devel/Makefile @@ -15,9 +15,9 @@ MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.4:${PORTSDIR}/graphics/png \ - GL.14:${PORTSDIR}/graphics/Mesa3 + png.4:${PORTSDIR}/graphics/png +USE_MESA= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-opengl=mesa --with-x diff --git a/x11-toolkits/fox/Makefile b/x11-toolkits/fox/Makefile index 9377caa92da2..d435d5ce0f59 100644 --- a/x11-toolkits/fox/Makefile +++ b/x11-toolkits/fox/Makefile @@ -15,9 +15,9 @@ MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.4:${PORTSDIR}/graphics/png \ - GL.14:${PORTSDIR}/graphics/Mesa3 + png.4:${PORTSDIR}/graphics/png +USE_MESA= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-opengl=mesa --with-x diff --git a/x11-toolkits/fox10/Makefile b/x11-toolkits/fox10/Makefile index 9377caa92da2..d435d5ce0f59 100644 --- a/x11-toolkits/fox10/Makefile +++ b/x11-toolkits/fox10/Makefile @@ -15,9 +15,9 @@ MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.4:${PORTSDIR}/graphics/png \ - GL.14:${PORTSDIR}/graphics/Mesa3 + png.4:${PORTSDIR}/graphics/png +USE_MESA= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-opengl=mesa --with-x diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index 9377caa92da2..d435d5ce0f59 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -15,9 +15,9 @@ MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.4:${PORTSDIR}/graphics/png \ - GL.14:${PORTSDIR}/graphics/Mesa3 + png.4:${PORTSDIR}/graphics/png +USE_MESA= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-opengl=mesa --with-x diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile index 491e7987435c..82c10ac5ab5a 100644 --- a/x11-toolkits/gtk13/Makefile +++ b/x11-toolkits/gtk13/Makefile @@ -20,10 +20,10 @@ LIB_DEPENDS= glib-1.3.1:${PORTSDIR}/devel/glib13 \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes +USE_XPM= yes USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 491e7987435c..82c10ac5ab5a 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -20,10 +20,10 @@ LIB_DEPENDS= glib-1.3.1:${PORTSDIR}/devel/glib13 \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes +USE_XPM= yes USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 491e7987435c..82c10ac5ab5a 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -20,10 +20,10 @@ LIB_DEPENDS= glib-1.3.1:${PORTSDIR}/devel/glib13 \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes +USE_XPM= yes USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile index 09da0f535bb6..3fb37b44e803 100644 --- a/x11-toolkits/gtkglarea/Makefile +++ b/x11-toolkits/gtkglarea/Makefile @@ -12,11 +12,11 @@ MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/ MAINTAINER= jaeger16@yahoo.com -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - GL.14:${PORTSDIR}/graphics/Mesa3 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +USE_MESA= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile index 09da0f535bb6..3fb37b44e803 100644 --- a/x11-toolkits/gtkglarea2/Makefile +++ b/x11-toolkits/gtkglarea2/Makefile @@ -12,11 +12,11 @@ MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/ MAINTAINER= jaeger16@yahoo.com -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - GL.14:${PORTSDIR}/graphics/Mesa3 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +USE_MESA= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" diff --git a/x11-toolkits/jx/Makefile b/x11-toolkits/jx/Makefile index 042e5cf41b46..e461403ea675 100644 --- a/x11-toolkits/jx/Makefile +++ b/x11-toolkits/jx/Makefile @@ -16,12 +16,12 @@ DISTNAME= ${PORTNAME}_source-${PORTVERSION} MAINTAINER= lioux@linf.unb.br -LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_X_PREFIX= yes +USE_XPM= yes INSTALLS_SHLIB= yes USE_BISON= yes USE_GMAKE= yes diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile index 19d5ad507d1d..277020daf31d 100644 --- a/x11-toolkits/plib/Makefile +++ b/x11-toolkits/plib/Makefile @@ -12,12 +12,11 @@ MASTER_SITES= http://plib.sourceforge.net/dist/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 - USE_X_PREFIX= yes +USE_MESA= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS=-I${X11BASE}/include -CONFIGURE_ARGS+= --includedir=$(PREFIX)/include/plib \ +CONFIGURE_ENV= CPPFLAGS=-I${X11BASE}/include +CONFIGURE_ARGS= --includedir=$(PREFIX)/include/plib \ --with-glut=${PREFIX} USE_GMAKE= yes USE_NEWGCC= yes diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile index 7287f77f9330..c7c714ec4703 100644 --- a/x11-toolkits/tkstep80/Makefile +++ b/x11-toolkits/tkstep80/Makefile @@ -17,11 +17,11 @@ PATCHFILES= tk8.0.4-to-tkstep8.0.4-2.patch.tar.gz MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80 +USE_XPM= yes FETCH_BEFORE_ARGS= -b PATCH_DIST_ARGS= -p1 -d ${WRKDIR}/tk8.0.4 -E --quiet WRKSRC= ${WRKDIR}/tk8.0.4/unix diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile index 80f99f162172..41b44b444dff 100644 --- a/x11-wm/afterstep-i18n/Makefile +++ b/x11-wm/afterstep-i18n/Makefile @@ -23,12 +23,11 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= issei@jp.FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - EXTRACT_ONLY= ${DISTNAME}.tar.gz \ unofficial-I18N.98Feb27.tar.gz DIST_SUBDIR= afterstep USE_X_PREFIX= yes +USE_XPM= yes INSTALL_TARGET= install install.man MANCOMPRESSED= yes MAN1= afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 \ diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index 247d6140f14e..681387f6a3ed 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -14,13 +14,13 @@ DISTNAME= AfterStep-${PORTVERSION} MAINTAINER= dima@Chg.ru -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - png.4:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg NO_LATEST_LINK= yes USE_BZIP2= yes USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ENV= X_EXTRA_LIBS="-lxpg4" CONFIGURE_ARGS= --with-png-includes="${LOCALBASE}/include" \ diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index ea4abc7ad7f0..ae307cac9d99 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -15,10 +15,9 @@ DISTNAME= AfterStep-${PORTVERSION} MAINTAINER= jfitz@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - NO_LATEST_LINK= yes USE_X_PREFIX= yes +USE_XPM= yes INSTALL_TARGET= install install.man MANCOMPRESSED= yes MAN1= afterstep.1 asclock.1 Animate.1 Audio.1 Auto.1 Banner.1 Pager.1 Wharf.1 diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile index 5f064f7c0579..26fba88f1157 100644 --- a/x11-wm/ctwm/Makefile +++ b/x11-wm/ctwm/Makefile @@ -13,13 +13,13 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ctwm-images${EXTRACT_SUFX} MAINTAINER= torstenb@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 MAKE_ENV= LOCALBASE=${LOCALBASE} USE_IMAKE= yes +USE_XPM= yes MAN1= ctwm.1 post-extract: diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile index 457533eac3cc..2f7317afd5d0 100644 --- a/x11-wm/e16/Makefile +++ b/x11-wm/e16/Makefile @@ -18,12 +18,12 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ Fnlib.0:${PORTSDIR}/graphics/fnlib \ Imlib.5:${PORTSDIR}/graphics/imlib \ - ttf.4:${PORTSDIR}/print/freetype \ ghttp.1:${PORTSDIR}/www/libghttp \ intl.1:${PORTSDIR}/devel/gettext USE_GMAKE= yes USE_X_PREFIX= yes +USE_FREETYPE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --with-included-gettext CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile index 457533eac3cc..2f7317afd5d0 100644 --- a/x11-wm/enlightenment-devel/Makefile +++ b/x11-wm/enlightenment-devel/Makefile @@ -18,12 +18,12 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ Fnlib.0:${PORTSDIR}/graphics/fnlib \ Imlib.5:${PORTSDIR}/graphics/imlib \ - ttf.4:${PORTSDIR}/print/freetype \ ghttp.1:${PORTSDIR}/www/libghttp \ intl.1:${PORTSDIR}/devel/gettext USE_GMAKE= yes USE_X_PREFIX= yes +USE_FREETYPE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --with-included-gettext CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile index 457533eac3cc..2f7317afd5d0 100644 --- a/x11-wm/enlightenment/Makefile +++ b/x11-wm/enlightenment/Makefile @@ -18,12 +18,12 @@ MAINTAINER= vanilla@FreeBSD.org LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \ Fnlib.0:${PORTSDIR}/graphics/fnlib \ Imlib.5:${PORTSDIR}/graphics/imlib \ - ttf.4:${PORTSDIR}/print/freetype \ ghttp.1:${PORTSDIR}/www/libghttp \ intl.1:${PORTSDIR}/devel/gettext USE_GMAKE= yes USE_X_PREFIX= yes +USE_FREETYPE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-fsstd --with-included-gettext CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile index 4ce49ec7e8c8..f9eead8b2066 100644 --- a/x11-wm/fvwm/Makefile +++ b/x11-wm/fvwm/Makefile @@ -13,10 +13,9 @@ MASTER_SITES= ftp://ftp.hpc.uh.edu/pub/fvwm/version-1/ \ MAINTAINER= me@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - NO_LATEST_LINK= yes USE_IMAKE= yes +USE_XPM= yes XMKMF= xmkmf ALL_TARGET= Makefiles all MAN1= FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmClean.1 \ diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile index 0b0d10cbc505..347cc5a9ddcd 100644 --- a/x11-wm/fvwm2-beta/Makefile +++ b/x11-wm/fvwm2-beta/Makefile @@ -15,9 +15,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= Cy.Schubert@uumail.gov.bc.ca -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes USE_GMAKE= yes PLIST_SUB= VER=${PORTVERSION} diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile index 0b0d10cbc505..347cc5a9ddcd 100644 --- a/x11-wm/fvwm2-devel/Makefile +++ b/x11-wm/fvwm2-devel/Makefile @@ -15,9 +15,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= Cy.Schubert@uumail.gov.bc.ca -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes USE_GMAKE= yes PLIST_SUB= VER=${PORTVERSION} diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile index c0b2bda7b93e..4e92ea226aa6 100644 --- a/x11-wm/fvwm2-i18n/Makefile +++ b/x11-wm/fvwm2-i18n/Makefile @@ -17,7 +17,7 @@ PATCHFILES= fvwm-${PORTVERSION}-I18N_MB-${FVWM_PATCHVER}.patch MAINTAINER= matusita@jp.freebsd.org .if !defined(WITHOUT_XPM) -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm +USE_XPM= yes .endif GNU_CONFIGURE= yes diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index 49cdb04dbb00..62b0733cda37 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -14,11 +14,10 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz MAINTAINER= jcwells@u.washington.edu -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--enable-extras --prefix=${PREFIX} +CONFIGURE_ARGS= --enable-extras --prefix=${PREFIX} USE_GMAKE= yes MAN1= FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \ diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile index 49cdb04dbb00..62b0733cda37 100644 --- a/x11-wm/fvwm24/Makefile +++ b/x11-wm/fvwm24/Makefile @@ -14,11 +14,10 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz MAINTAINER= jcwells@u.washington.edu -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--enable-extras --prefix=${PREFIX} +CONFIGURE_ARGS= --enable-extras --prefix=${PREFIX} USE_GMAKE= yes MAN1= FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \ diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile index 7447aa98df79..836a37daa1d4 100644 --- a/x11-wm/fvwm95-i18n/Makefile +++ b/x11-wm/fvwm95-i18n/Makefile @@ -25,12 +25,12 @@ PATCHFILES= fvwm95-2.0.43a-Autoconf.I18N.diff.gz MAINTAINER= ryo2@on.rim.or.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm BUILD_DEPENDS= ${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons EXTRACT_ONLY= ${DISTNAME}.tgz ${PKGNAME}-portKit-19981123.tgz USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ --mandir=${MANPREFIX}/man \ diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile index 45936b993f55..f671b4f03dfe 100644 --- a/x11-wm/fvwm95/Makefile +++ b/x11-wm/fvwm95/Makefile @@ -14,11 +14,11 @@ EXTRACT_SUFX= .tgz MAINTAINER= dima@Chg.RU -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm BUILD_DEPENDS= ${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \ --libdir=${LOCALBASE}/lib diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile index a26df4e190e8..0cda28c49cad 100644 --- a/x11-wm/gwm/Makefile +++ b/x11-wm/gwm/Makefile @@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= window_managers/gwm MAINTAINER= markm@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= gwm.1 .include <bsd.port.mk> diff --git a/x11-wm/icewm-i18n/Makefile b/x11-wm/icewm-i18n/Makefile index e6983d6239ca..87ca573c55c7 100644 --- a/x11-wm/icewm-i18n/Makefile +++ b/x11-wm/icewm-i18n/Makefile @@ -21,8 +21,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= yatt@msc.biglobe.ne.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext .if defined(WITH_GNOME) LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs @@ -31,6 +30,7 @@ LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs GNU_CONFIGURE= yes USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes CONFIGURE_ARGS= --enable-i18n --enable-nls CONFIGURE_ENV= CXXFLAGS=-I${LOCALBASE}/include \ diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index 0272c7a3f339..a070c160a562 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -18,12 +18,12 @@ MAINTAINER= nakai@FreeBSD.org .if defined(GNOME) LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs .endif -LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm GNU_CONFIGURE= yes USE_GMAKE= yes USE_X_PREFIX= yes -CONFIGURE_ARGS+= --enable-i18n +USE_XPM= yes +CONFIGURE_ARGS= --enable-i18n post-install: ${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/share/icewm/taskbar diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile index 020dbe5acd62..108029e9a29a 100644 --- a/x11-wm/libdockapp/Makefile +++ b/x11-wm/libdockapp/Makefile @@ -14,10 +14,9 @@ MASTER_SITE_SUBDIR= jim MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_BZIP2= yes USE_X_PREFIX= yes +USE_XPM= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile index f849fe7c7c52..f211879fe2de 100644 --- a/x11-wm/mlvwm/Makefile +++ b/x11-wm/mlvwm/Makefile @@ -15,9 +15,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= mlvwm.1 MLVWMLIBDIR= ${PREFIX}/lib/X11/mlvwm diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile index 59e0a4d06187..5098b23418d8 100644 --- a/x11-wm/olvwm/Makefile +++ b/x11-wm/olvwm/Makefile @@ -21,11 +21,11 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= green@FreeBSD.org -LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview NO_WRKSUBDIR= yes USE_IMAKE= yes +USE_XPM= yes MAN1= olvwm.1 olvwmrc.1 .include <bsd.port.mk> diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile index e0411687f88c..159e4e5169aa 100644 --- a/x11-wm/piewm/Makefile +++ b/x11-wm/piewm/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= ftp://ftp.crynwr.com/piewm/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= piewm.1 .include <bsd.port.mk> diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile index 94defe760f07..7a0ff431d83d 100644 --- a/x11-wm/qvwm/Makefile +++ b/x11-wm/qvwm/Makefile @@ -12,11 +12,11 @@ MASTER_SITES= ftp://www.qvwm.org/pub/qvwm/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - Imlib.5:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ esd.2:${PORTSDIR}/audio/esound USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes MAN1= qvwm.1x diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile index ca1bbeffa22f..229fecb9dc9d 100644 --- a/x11-wm/scwm/Makefile +++ b/x11-wm/scwm/Makefile @@ -14,8 +14,7 @@ MAINTAINER= nakai@FreeBSD.org LIB_DEPENDS= guile.6:${PORTSDIR}/lang/guile \ Imlib.5:${PORTSDIR}/graphics/imlib \ - esd.2:${PORTSDIR}/audio/esound \ - Xpm.4:${PORTSDIR}/graphics/xpm + esd.2:${PORTSDIR}/audio/esound RUN_DEPENDS= ${X11BASE}/share/scwm/pixmaps/Animator.xpm:${PORTSDIR}/graphics/scwm-icons GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -35,6 +34,7 @@ CONFIGURE_ENV+= LIBS="-L${X11BASE}/lib -lxpg4" .endif USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes MAN1= scwm.1 scwmexec.1 scwmrepl.1 diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile index 68167dbf74d8..ab07506f6642 100644 --- a/x11-wm/tvtwm/Makefile +++ b/x11-wm/tvtwm/Makefile @@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= gpalmer@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - WRKSRC= ${WRKDIR}/tvtwm USE_IMAKE= yes +USE_XPM= yes MAN1= tvtwm.1 .include <bsd.port.mk> diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile index c7f9062b8df7..f0582ce6e561 100644 --- a/x11-wm/ude/Makefile +++ b/x11-wm/ude/Makefile @@ -15,10 +15,10 @@ DISTNAME= ${PORTNAME}-0.2.7-BETA MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - intl.1:${PORTSDIR}/devel/gettext +LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile index ce3273c68c5f..d05ccf7c8855 100644 --- a/x11-wm/vtwm/Makefile +++ b/x11-wm/vtwm/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= ftp://ftp.visi.com/users/hawkeyd/X/ MAINTAINER= bmah@acm.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= vtwm.1 diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile index 5ef3ce2a732d..9ef83abb7328 100644 --- a/x11-wm/windowmaker-i18n/Makefile +++ b/x11-wm/windowmaker-i18n/Makefile @@ -14,8 +14,7 @@ DISTNAME= WindowMaker-${PORTVERSION} MAINTAINER= mac@jp.freebsd.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - ungif.5:${PORTSDIR}/graphics/libungif \ +LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ @@ -27,6 +26,7 @@ RUN_DEPENDS= ${X11BASE}/share/WindowMaker/Themes/Checker.themed/style:${PORTSDIR USE_BZIP2= yes USE_PERL5= yes USE_X_PREFIX= yes +USE_XPM= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index 989bc43edfd2..ee77eee9a08a 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -16,8 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - ungif.5:${PORTSDIR}/graphics/libungif \ +LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ @@ -25,6 +24,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ USE_BZIP2= yes USE_X_PREFIX= yes +USE_XPM= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= X11BASE=${X11BASE} LIBS=-L${LOCALBASE}/lib \ diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile index b08f6a0ba5a9..123ad2e48f0f 100644 --- a/x11-wm/wmakerconf/Makefile +++ b/x11-wm/wmakerconf/Makefile @@ -19,7 +19,6 @@ RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker \ LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ Imlib.5:${PORTSDIR}/graphics/imlib \ PropList.2:${PORTSDIR}/devel/libPropList \ - Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ png.4:${PORTSDIR}/graphics/png \ @@ -33,6 +32,7 @@ USE_GMAKE= yes USE_BZIP2= yes GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_XPM= yes CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" .if exists(${X11BASE}/bin/gnome-config) diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile index 5f0a6d36f732..ec55329a0969 100644 --- a/x11-wm/wmcp/Makefile +++ b/x11-wm/wmcp/Makefile @@ -12,10 +12,9 @@ MASTER_SITES= http://users.linuxbox.com/~bac/src/wmcp/ MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes pre-build: (cd ${WRKSRC} && ${GMAKE} clean) diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile index 22cd4bc14000..7842a2c982e6 100644 --- a/x11-wm/wmg/Makefile +++ b/x11-wm/wmg/Makefile @@ -15,7 +15,6 @@ DISTNAME= wmG-${PORTVERSION} MAINTAINER= nakai@FreeBSD.org LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - Xpm.4:${PORTSDIR}/graphics/xpm \ esd.2:${PORTSDIR}/audio/esound \ gnome.4:${PORTSDIR}/x11/gnomelibs @@ -23,6 +22,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_X_PREFIX= yes +USE_XPM= yes USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFILES= configure diff --git a/x11-wm/wmx/Makefile b/x11-wm/wmx/Makefile index e92d73d3aaa4..542eee4be4ab 100644 --- a/x11-wm/wmx/Makefile +++ b/x11-wm/wmx/Makefile @@ -14,10 +14,9 @@ DISTNAME= ${PORTNAME}-5sec6 MAINTAINER= sec@42.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes -GNU_CONFIGURE= YES +USE_XPM= yes +GNU_CONFIGURE= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmx ${PREFIX}/bin diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile index 4ca5aea3c125..d66cb6ddba66 100644 --- a/x11-wm/xfce/Makefile +++ b/x11-wm/xfce/Makefile @@ -12,14 +12,14 @@ MASTER_SITES= http://www.xfce.org/archive/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - Imlib.5:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= ${LOCALBASE}/bin/esdplay:${PORTSDIR}/audio/esound GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 4ca5aea3c125..d66cb6ddba66 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -12,14 +12,14 @@ MASTER_SITES= http://www.xfce.org/archive/ MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - Imlib.5:${PORTSDIR}/graphics/imlib \ +LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 RUN_DEPENDS= ${LOCALBASE}/bin/esdplay:${PORTSDIR}/audio/esound GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index ebb52e800fdd..17aa073a025e 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -12,11 +12,11 @@ MASTER_SITES= http://download.sourceforge.net/aterm/ MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.4:${PORTSDIR}/graphics/png USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-transparency --enable-background-image \ --disable-delete-key --disable-backspace-key \ diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile index e0ab0f59206f..bef70ce8db4c 100644 --- a/x11/bricons/Makefile +++ b/x11/bricons/Makefile @@ -15,9 +15,8 @@ EXTRACT_SUFX= -athena-3.0.tar.gz MAINTAINER= shanee@augusta.de -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes MAN1= bricons.1 post-patch: diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 30d956348644..5eca7664198c 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -15,7 +15,6 @@ DISTNAME= gnome-libs-${PORTVERSION} MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - Xpm.4:${PORTSDIR}/graphics/xpm \ ORBit.2:${PORTSDIR}/devel/ORBit \ esd.2:${PORTSDIR}/audio/esound @@ -23,6 +22,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_X_PREFIX= yes +USE_XPM= yes USE_PERL5= yes USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 30d956348644..5eca7664198c 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -15,7 +15,6 @@ DISTNAME= gnome-libs-${PORTVERSION} MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - Xpm.4:${PORTSDIR}/graphics/xpm \ ORBit.2:${PORTSDIR}/devel/ORBit \ esd.2:${PORTSDIR}/audio/esound @@ -23,6 +22,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_X_PREFIX= yes +USE_XPM= yes USE_PERL5= yes USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index cff80a6652b5..9658bb835c33 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -15,13 +15,13 @@ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} SOMAJOR= 4 SOMINOR= 0 MOC?= ${X11BASE}/bin/moc2 +USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index cff80a6652b5..9658bb835c33 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -15,13 +15,13 @@ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} SOMAJOR= 4 SOMINOR= 0 MOC?= ${X11BASE}/bin/moc2 +USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index cff80a6652b5..9658bb835c33 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -15,13 +15,13 @@ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} SOMAJOR= 4 SOMINOR= 0 MOC?= ${X11BASE}/bin/moc2 +USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile index ad2be10d63cc..9864f8a8794f 100644 --- a/x11/kdebase11/Makefile +++ b/x11/kdebase11/Makefile @@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 MAINTAINER= will@FreeBSD.org LIB_DEPENDS= kdecore.3:${PORTSDIR}/x11/kdelibs11 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext USE_XLIB= yes +USE_XPM= yes USE_BZIP2= yes USE_QT= yes GNU_CONFIGURE= yes diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index cff80a6652b5..9658bb835c33 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -15,13 +15,13 @@ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} SOMAJOR= 4 SOMINOR= 0 MOC?= ${X11BASE}/bin/moc2 +USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index cff80a6652b5..9658bb835c33 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -15,13 +15,13 @@ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} SOMAJOR= 4 SOMINOR= 0 MOC?= ${X11BASE}/bin/moc2 +USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index cff80a6652b5..9658bb835c33 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -15,13 +15,13 @@ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} SOMAJOR= 4 SOMINOR= 0 MOC?= ${X11BASE}/bin/moc2 +USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index cff80a6652b5..9658bb835c33 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -15,13 +15,13 @@ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} SOMAJOR= 4 SOMINOR= 0 MOC?= ${X11BASE}/bin/moc2 +USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index cff80a6652b5..9658bb835c33 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -15,13 +15,13 @@ MAINTAINER= will@FreeBSD.org LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22 \ kdeui.4:${PORTSDIR}/x11/kdelibs2 \ - Xpm.4:${PORTSDIR}/graphics/xpm \ intl.1:${PORTSDIR}/devel/gettext WRKSRC= ${WRKDIR}/${PORTNAME} SOMAJOR= 4 SOMINOR= 0 MOC?= ${X11BASE}/bin/moc2 +USE_XPM= yes USE_BZIP2= yes USE_NEWGCC= yes INSTALLS_SHLIB= yes diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 30d956348644..5eca7664198c 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -15,7 +15,6 @@ DISTNAME= gnome-libs-${PORTVERSION} MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - Xpm.4:${PORTSDIR}/graphics/xpm \ ORBit.2:${PORTSDIR}/devel/ORBit \ esd.2:${PORTSDIR}/audio/esound @@ -23,6 +22,7 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_X_PREFIX= yes +USE_XPM= yes USE_PERL5= yes USE_GMAKE= yes USE_LIBTOOL= yes diff --git a/x11/login.app/Makefile b/x11/login.app/Makefile index c2c8705e126b..0fe9ef9d4fea 100644 --- a/x11/login.app/Makefile +++ b/x11/login.app/Makefile @@ -14,10 +14,10 @@ DISTNAME= Login.app-2.0.0-Alpha-4 MAINTAINER= sobomax@FreeBSD.org LIB_DEPENDS= wraster.3:${PORTSDIR}/x11-wm/windowmaker \ - PropList.2:${PORTSDIR}/devel/libPropList \ - Xpm.4:${PORTSDIR}/graphics/xpm + PropList.2:${PORTSDIR}/devel/libPropList USE_X_PREFIX= yes +USE_XPM= yes ALL_TARGET= Login diff --git a/x11/offix-execute/Makefile b/x11/offix-execute/Makefile index ed94e0dc718a..42dd6c2482c9 100644 --- a/x11/offix-execute/Makefile +++ b/x11/offix-execute/Makefile @@ -14,11 +14,11 @@ DISTNAME= Execute-${PORTVERSION} MAINTAINER= ruslan@shevchenko.kiev.ua -LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd GNU_CONFIGURE= YES USE_GMAKE= YES USE_X_PREFIX= YES +USE_XPM= YES .include <bsd.port.mk> diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile index 47127029066a..483d92ade470 100644 --- a/x11/rxvt-devel/Makefile +++ b/x11/rxvt-devel/Makefile @@ -22,9 +22,8 @@ PATCH_DIST_STRIP+= -p1 MAINTAINER= lioux@linf.unb.br -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-utmp --enable-wtmp \ --with-xpm --enable-xpm-background --enable-transparency diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 47127029066a..483d92ade470 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -22,9 +22,8 @@ PATCH_DIST_STRIP+= -p1 MAINTAINER= lioux@linf.unb.br -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-utmp --enable-wtmp \ --with-xpm --enable-xpm-background --enable-transparency diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 47127029066a..483d92ade470 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -22,9 +22,8 @@ PATCH_DIST_STRIP+= -p1 MAINTAINER= lioux@linf.unb.br -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-utmp --enable-wtmp \ --with-xpm --enable-xpm-background --enable-transparency diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile index afc0329ad4a0..5e76c7792afc 100644 --- a/x11/tycoon/Makefile +++ b/x11/tycoon/Makefile @@ -13,10 +13,10 @@ MASTER_SITE_SUBDIR= X11/desktop MAINTAINER= steve@farrell.org -LIB_DEPENDS= xforms:${PORTSDIR}/x11-toolkits/xforms \ - Xpm.4:${PORTSDIR}/graphics/xpm +LIB_DEPENDS= xforms:${PORTSDIR}/x11-toolkits/xforms USE_IMAKE= yes +USE_XPM= yes NO_INSTALL_MANPAGES= yes pre-install: diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile index 79f63ebc1c62..165eb0c2193a 100644 --- a/x11/wmbutton/Makefile +++ b/x11/wmbutton/Makefile @@ -14,9 +14,8 @@ MASTER_SITE_SUBDIR= jim MAINTAINER= jim@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes do-build: @(cd ${WRKSRC} && make) diff --git a/x11/wmmatrix/Makefile b/x11/wmmatrix/Makefile index 0459aa4357c2..360fba55c771 100644 --- a/x11/wmmatrix/Makefile +++ b/x11/wmmatrix/Makefile @@ -13,10 +13,9 @@ DISTNAME= wmMatrix-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_GMAKE= yes USE_X_PREFIX= yes +USE_XPM= yes ALL_TARGET= clean all do-install: diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile index 37084defa693..53369d9104bc 100644 --- a/x11/wterm/Makefile +++ b/x11/wterm/Makefile @@ -14,9 +14,9 @@ MASTER_SITES= ftp://ftp.kddlabs.co.jp/.10/X11/acontrib/wterm/ \ MAINTAINER= cpiazza@FreeBSD.org BUILD_DEPENDS= ${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm USE_X_PREFIX= yes +USE_XPM= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-transparency --enable-xpm-background \ --disable-delete-key --disable-backspace-key \ diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile index 37b841fc3f47..d2afd09fe32b 100644 --- a/x11/xballoon/Makefile +++ b/x11/xballoon/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/ MAINTAINER= sakai@miya.ee.kagu.sut.ac.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - ALL_TARGET= xballoon USE_X_PREFIX= yes +USE_XPM= yes MAN1= xballoon.1 MANCOMPRESSED= yes diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile index 2ee5b46d1033..081b7a0657ae 100644 --- a/x11/xbanner/Makefile +++ b/x11/xbanner/Makefile @@ -16,9 +16,8 @@ DISTNAME= XBanner${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_X_PREFIX= yes +USE_XPM= yes #USE_IMAKE= yes post-patch: diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile index c07845c8baeb..273c013e484e 100644 --- a/x11/xdtm/Makefile +++ b/x11/xdtm/Makefile @@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= gpalmer@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes WRKSRC= ${WRKDIR}/xdtm MAN1= xdtm.1 diff --git a/x11/xfedor/Makefile b/x11/xfedor/Makefile index 048cd8e0db3e..0d2cd7ae4da3 100644 --- a/x11/xfedor/Makefile +++ b/x11/xfedor/Makefile @@ -14,11 +14,10 @@ CATEGORIES= x11 MASTER_SITES= ftp://ftp.kiarchive.ru/pub/x11/util/ DISTNAME= ${PORTNAME} -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - MAINTAINER= ache@FreeBSD.org USE_IMAKE= yes +USE_XPM= yes XFHELP= ${X11BASE}/lib/X11/xfedor # See patches too XCAT1= ${X11BASE}/man/cat1 diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 160001694bdb..59356da485aa 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR= applications MAINTAINER= tg@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gl --without-motif --without-sx \ --without-editres --without-dtsaver --without-rplay \ @@ -27,6 +25,7 @@ CONFIGURE_ARGS+= --enable-kerberos4 CONFIGURE_ARGS+= --enable-kerberos5 .endif USE_X_PREFIX= yes +USE_XPM= yes MAN1= xlock.1 .include <bsd.port.pre.mk> @@ -38,7 +37,7 @@ MAN1= xlock.1 WITH_MESAGL?= yes .if ${WITH_MESAGL} == yes CONFIGURE_ARGS+= --with-mesagl -LIB_DEPENDS+= GL.14:${PORTSDIR}/graphics/Mesa3 +USE_MESA= yes .else CONFIGURE_ARGS+= --without-mesagl .endif diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile index 7be3f45f1607..4feafb4627c8 100644 --- a/x11/xlupe/Makefile +++ b/x11/xlupe/Makefile @@ -12,9 +12,8 @@ MASTER_SITES= http://www.rostock.zgdv.de/~runge/xlupe/ MAINTAINER= runge@rostock.zgdv.de -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - USE_IMAKE= yes +USE_XPM= yes REQUIRES_MOTIF= no # you can build it with a motif interface as well! diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile index 70f81df9d30a..2e18e9df0d8e 100644 --- a/x11/xmangekyou/Makefile +++ b/x11/xmangekyou/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/ MAINTAINER= sakai@miya.ee.kagu.sut.ac.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - ALL_TARGET= xmangekyou USE_X_PREFIX= yes +USE_XPM= yes MAN1= xmangekyou.1 MANCOMPRESSED= yes diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index ea63e517f2d5..dcf62e58e024 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -12,12 +12,11 @@ MASTER_SITES= http://www.jwz.org/xscreensaver/ MAINTAINER= jseger@FreeBSD.org -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - GL.14:${PORTSDIR}/graphics/Mesa3 - GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm USE_X_PREFIX= yes +USE_XPM= yes +USE_MESA= yes MAN1= attraction.1 blitspin.1 bouboule.1 braid.1 \ bsod.1 bubbles.1 critical.1 decayscreen.1 \ deco.1 distort.1 drift.1 epicycle.1 flag.1 flame.1 \ diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile index 863a9e4ccfd0..7aa131be3f1b 100644 --- a/x11/xstarroll/Makefile +++ b/x11/xstarroll/Makefile @@ -12,11 +12,10 @@ MASTER_SITES= http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/ MAINTAINER= sakai@miya.ee.kagu.sut.ac.jp -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm - ALL_TARGET= xstarroll USE_X_PREFIX= yes +USE_XPM= yes MAN1= xstarroll.1 MANCOMPRESSED= yes |