diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/aalib/Makefile | 15 | ||||
| -rw-r--r-- | graphics/gd/Makefile | 6 | ||||
| -rw-r--r-- | graphics/gd/files/patch-ac | 8 | ||||
| -rw-r--r-- | graphics/gd1/Makefile | 6 | ||||
| -rw-r--r-- | graphics/gd1/files/patch-ac | 8 | ||||
| -rw-r--r-- | graphics/gd2/Makefile | 6 | ||||
| -rw-r--r-- | graphics/gd2/files/patch-ac | 8 | ||||
| -rw-r--r-- | graphics/gimp-app-devel/Makefile | 13 | ||||
| -rw-r--r-- | graphics/gimp-app/Makefile | 13 | ||||
| -rw-r--r-- | graphics/gimp-devel/Makefile | 13 | ||||
| -rw-r--r-- | graphics/gimp/Makefile | 13 | ||||
| -rw-r--r-- | graphics/gimp1/Makefile | 13 | ||||
| -rw-r--r-- | graphics/gimpshop/Makefile | 13 | ||||
| -rw-r--r-- | graphics/glx/Makefile | 8 | ||||
| -rw-r--r-- | graphics/py-opengl/Makefile | 4 | ||||
| -rw-r--r-- | graphics/utah-glx/Makefile | 8 |
16 files changed, 66 insertions, 89 deletions
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index 1b82b37..41c6bd9 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -15,14 +15,14 @@ MAINTAINER= ports@FreeBSD.org USE_AUTOCONF= yes USE_LIBTOOL= yes +.include <bsd.port.pre.mk> + # # Support for X11 is compiled in by default only if X11 is installed. # -.if !exists(${X11BASE}) -NO_X11?= yes -.endif -.if !defined(NO_X11) -USE_XLIB=YES +.if defined(WITH_X11) || (exists(${X11BASE}/lib/libX11.a) \ + && !defined(WITHOUT_X11)) +USE_XLIB= yes CONFIGURE_ARGS= --with-x --x-includes="${X11BASE}/include" \ --x-libraries="${X11BASE}/lib" .else @@ -32,7 +32,4 @@ CONFIGURE_ARGS= --with-x11-driver=no post-patch: @${PERL} -pi -e "s:/usr/local:${LOCALBASE}:g;" ${WRKSRC}/configure.in -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 71ae522..18cfb20 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -15,7 +15,7 @@ MAINTAINER= billf@FreeBSD.org LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -.if defined(WANT_X11) +.if defined(WITH_X11) LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ Xpm.4:${PORTSDIR}/graphics/xpm @@ -23,9 +23,9 @@ USE_XLIB= YES .endif pre-fetch: -.if !defined(WANT_X11) +.if !defined(WITH_X11) @${ECHO} -n "If you want to compile in X support use " - @${ECHO} "'make -DWANT_X11' instead" + @${ECHO} "'make -DWITH_X11' instead" .endif pre-install: diff --git a/graphics/gd/files/patch-ac b/graphics/gd/files/patch-ac index de989ae..451bf86 100644 --- a/graphics/gd/files/patch-ac +++ b/graphics/gd/files/patch-ac @@ -24,7 +24,7 @@ #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. See also LIBS below. -#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.else +CFLAGS+=-DHAVE_JPEG @@ -39,7 +39,7 @@ #variation of this and comment out the line above. Note that #Xpm requires X11. See also CFLAGS above. -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.endif @@ -47,7 +47,7 @@ #If yours are somewhere else, change this. -INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 +CFLAGS+=-I$(LOCALBASE)/include -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 +.endif @@ -59,7 +59,7 @@ #on your system can't cause conflicts while building a new one. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=-L. -L$(LOCALBASE)/lib -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBDIRS+=-L$(X11BASE)/lib +.endif diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile index 71ae522..18cfb20 100644 --- a/graphics/gd1/Makefile +++ b/graphics/gd1/Makefile @@ -15,7 +15,7 @@ MAINTAINER= billf@FreeBSD.org LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -.if defined(WANT_X11) +.if defined(WITH_X11) LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ Xpm.4:${PORTSDIR}/graphics/xpm @@ -23,9 +23,9 @@ USE_XLIB= YES .endif pre-fetch: -.if !defined(WANT_X11) +.if !defined(WITH_X11) @${ECHO} -n "If you want to compile in X support use " - @${ECHO} "'make -DWANT_X11' instead" + @${ECHO} "'make -DWITH_X11' instead" .endif pre-install: diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac index de989ae..451bf86 100644 --- a/graphics/gd1/files/patch-ac +++ b/graphics/gd1/files/patch-ac @@ -24,7 +24,7 @@ #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. See also LIBS below. -#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.else +CFLAGS+=-DHAVE_JPEG @@ -39,7 +39,7 @@ #variation of this and comment out the line above. Note that #Xpm requires X11. See also CFLAGS above. -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.endif @@ -47,7 +47,7 @@ #If yours are somewhere else, change this. -INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 +CFLAGS+=-I$(LOCALBASE)/include -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 +.endif @@ -59,7 +59,7 @@ #on your system can't cause conflicts while building a new one. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=-L. -L$(LOCALBASE)/lib -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBDIRS+=-L$(X11BASE)/lib +.endif diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile index 71ae522..18cfb20 100644 --- a/graphics/gd2/Makefile +++ b/graphics/gd2/Makefile @@ -15,7 +15,7 @@ MAINTAINER= billf@FreeBSD.org LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -.if defined(WANT_X11) +.if defined(WITH_X11) LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \ Xpm.4:${PORTSDIR}/graphics/xpm @@ -23,9 +23,9 @@ USE_XLIB= YES .endif pre-fetch: -.if !defined(WANT_X11) +.if !defined(WITH_X11) @${ECHO} -n "If you want to compile in X support use " - @${ECHO} "'make -DWANT_X11' instead" + @${ECHO} "'make -DWITH_X11' instead" .endif pre-install: diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac index de989ae..451bf86 100644 --- a/graphics/gd2/files/patch-ac +++ b/graphics/gd2/files/patch-ac @@ -24,7 +24,7 @@ #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. See also LIBS below. -#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +.else +CFLAGS+=-DHAVE_JPEG @@ -39,7 +39,7 @@ #variation of this and comment out the line above. Note that #Xpm requires X11. See also CFLAGS above. -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +.endif @@ -47,7 +47,7 @@ #If yours are somewhere else, change this. -INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 +CFLAGS+=-I$(LOCALBASE)/include -+.if defined(WANT_X11) ++.if defined(WITH_X11) +CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 +.endif @@ -59,7 +59,7 @@ #on your system can't cause conflicts while building a new one. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=-L. -L$(LOCALBASE)/lib -+.if defined(WANT_X11) ++.if defined(WITH_X11) +LIBDIRS+=-L$(X11BASE)/lib +.endif diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index d8b829a..f61b62b 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index d8b829a..f61b62b 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile index d8b829a..f61b62b 100644 --- a/graphics/gimp-devel/Makefile +++ b/graphics/gimp-devel/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index d8b829a..f61b62b 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile index d8b829a..f61b62b 100644 --- a/graphics/gimp1/Makefile +++ b/graphics/gimp1/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index d8b829a..f61b62b 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \ MAINTAINER= vanilla@FreeBSD.org -.if defined(USE_PERL) +.if !defined(WITHOUT_PERL) BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \ @@ -39,7 +39,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) CONFIGURE_ARGS= --disable-perl .endif @@ -51,11 +51,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gimp.1 gimptool.1 MAN5= gimprc.5 -.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config) -WITH_GNOME= yes -.endif - -.if !defined(USE_PERL) +.if defined(WITHOUT_PERL) PLISTORIG= ${PKGDIR}/PLIST PLIST= ${WRKDIR}/PLIST .else @@ -66,7 +62,8 @@ pre-fetch: @${ECHO} "'make -DWITHOUT_PERL' instead" .endif -.if defined(WITH_GNOME) && ${WITH_GNOME} == yes +.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \ + && !defined(WITHOUT_GNOME)) LIB_DEPENDS+= gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs pre-install: @${CAT} ${PLISTORIG} > ${PLIST} diff --git a/graphics/glx/Makefile b/graphics/glx/Makefile index e5e168c..0e0b70e 100644 --- a/graphics/glx/Makefile +++ b/graphics/glx/Makefile @@ -91,16 +91,16 @@ GNU_CONFIGURE= yes # we support nvidia RIVA 128, TNT.. and Matrox G200/400 cards .if defined(CHIPSET_3D) .if ${CHIPSET_3D} == RIVA -WITH_CHIPSET= --with-chipset=tnt +CONFIGURE_ARGS= --with-chipset=tnt .endif .if ${CHIPSET_3D} == MGA -WITH_CHIPSET= --with-chipset=mga +CONFIGURE_ARGS= --with-chipset=mga .endif .endif -CONFIGURE_ARGS= --with-mesa=${MESADIR} \ +CONFIGURE_ARGS+= --with-mesa=${MESADIR} \ --with-mesa-version=mesa30 \ - ${WITH_CHIPSET} # --with-mmx-asm --with-3dnow-asm + # --with-mmx-asm --with-3dnow-asm USE_GMAKE= yes diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index da18dcb..24d5a3f 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -30,7 +30,6 @@ PLIST_SUB+= OSMAJOR=${OSMAJOR} # # Support for Numeric is compiled in by default. # -WITH_NUMERIC?= yes NUMPYDIR= ${LOCALBASE}/lib/python1.5/site-packages/numerical # @@ -41,8 +40,7 @@ SETUP_FILES= ${FILESDIR}/Setup.base # # Support for Togl is compiled in by default. # -WITH_TOGL?= yes -.if defined(WITH_TOGL) && $(WITH_TOGL) == yes +.if !defined(WITHOUT_TOGL) SETUP_FILES+= ${FILESDIR}/Setup.add.togl LIB_DEPENDS+= tk82.1:${PORTSDIR}/x11-toolkits/tk82 .endif diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile index e5e168c..0e0b70e 100644 --- a/graphics/utah-glx/Makefile +++ b/graphics/utah-glx/Makefile @@ -91,16 +91,16 @@ GNU_CONFIGURE= yes # we support nvidia RIVA 128, TNT.. and Matrox G200/400 cards .if defined(CHIPSET_3D) .if ${CHIPSET_3D} == RIVA -WITH_CHIPSET= --with-chipset=tnt +CONFIGURE_ARGS= --with-chipset=tnt .endif .if ${CHIPSET_3D} == MGA -WITH_CHIPSET= --with-chipset=mga +CONFIGURE_ARGS= --with-chipset=mga .endif .endif -CONFIGURE_ARGS= --with-mesa=${MESADIR} \ +CONFIGURE_ARGS+= --with-mesa=${MESADIR} \ --with-mesa-version=mesa30 \ - ${WITH_CHIPSET} # --with-mmx-asm --with-3dnow-asm + # --with-mmx-asm --with-3dnow-asm USE_GMAKE= yes |
