diff options
author | Ade Lovett <ade@FreeBSD.org> | 2001-05-04 21:41:30 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2001-05-04 21:41:30 +0000 |
commit | bc47cccc84a1837da1919cf6c75785c9646d1761 (patch) | |
tree | f7a9d348554d6994c70ad84089b6b749b7ac60fd /graphics | |
parent | Upgrade to INN 2.3.2. (diff) |
Various patches (mainly shared library revision changes) for those
ports that depend on GNOME and need to change for 1.4
Notes
Notes:
svn path=/head/; revision=42259
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/chbg/Makefile | 7 | ||||
-rw-r--r-- | graphics/gd/Makefile | 2 | ||||
-rw-r--r-- | graphics/gd/files/patch-ac | 10 | ||||
-rw-r--r-- | graphics/gd1/Makefile | 2 | ||||
-rw-r--r-- | graphics/gd1/files/patch-ac | 10 | ||||
-rw-r--r-- | graphics/gd2/Makefile | 2 | ||||
-rw-r--r-- | graphics/gd2/files/patch-ac | 10 | ||||
-rw-r--r-- | graphics/gnomeiconedit/Makefile | 7 | ||||
-rw-r--r-- | graphics/gpaint/Makefile | 3 | ||||
-rw-r--r-- | graphics/imagesort/Makefile | 4 | ||||
-rw-r--r-- | graphics/imanager/Makefile | 4 | ||||
-rw-r--r-- | graphics/ruby-gdk_pixbuf/Makefile | 6 | ||||
-rw-r--r-- | graphics/ruby-gdk_pixbuf2/Makefile | 6 |
13 files changed, 26 insertions, 47 deletions
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile index 94b26a376cae..788508c7d371 100644 --- a/graphics/chbg/Makefile +++ b/graphics/chbg/Makefile @@ -7,7 +7,8 @@ PORTNAME= chbg PORTVERSION= 1.2 -CATEGORIES= graphics +PORTREVISION= 1 +CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.idata.sk/~ondrej/sw/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,11 +16,9 @@ EXTRACT_SUFX= .tgz MAINTAINER= p@dancris.com -LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf - USE_X_PREFIX= yes +USE_GNOMECTRL= yes USE_GMAKE= yes -USE_IMLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index d12b052efb68..09ac3b3b5531 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -7,7 +7,7 @@ PORTNAME= gd PORTVERSION= 1.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ \ diff --git a/graphics/gd/files/patch-ac b/graphics/gd/files/patch-ac index 89e342477f1b..415662373e4c 100644 --- a/graphics/gd/files/patch-ac +++ b/graphics/gd/files/patch-ac @@ -49,27 +49,23 @@ #Note: for Freetype 1.x, use DHAVE_LIBTTF and -lttf instead. -@@ -45,7 +53,10 @@ +@@ -45,7 +53,8 @@ #ensure that the version of gd you are installing is used, and not an #older release in your directory tree somewhere. -INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include +INCLUDEDIRS=-I. -I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include -+.if defined(WITH_X11) -+INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include -+.endif ++INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include/freetype2 -I${X11BASE}/include #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location -@@ -55,16 +66,19 @@ +@@ -55,16 +66,17 @@ #on your system can't cause conflicts while building a new one. #This line shouldn't hurt if you don't actually have some of the #optional libraries and directories. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=-L. -L${LOCALBASE}/lib -Wl,--rpath,${LOCALBASE}/lib -+.if defined(WITH_X11) +LIBDIRS+=-L${X11BASE}/lib -Wl,--rpath,${X11BASE}/lib -+.endif #Location where libgd.a should be installed by "make install". -INSTALL_LIB=/usr/local/lib diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile index d12b052efb68..09ac3b3b5531 100644 --- a/graphics/gd1/Makefile +++ b/graphics/gd1/Makefile @@ -7,7 +7,7 @@ PORTNAME= gd PORTVERSION= 1.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ \ diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac index 89e342477f1b..415662373e4c 100644 --- a/graphics/gd1/files/patch-ac +++ b/graphics/gd1/files/patch-ac @@ -49,27 +49,23 @@ #Note: for Freetype 1.x, use DHAVE_LIBTTF and -lttf instead. -@@ -45,7 +53,10 @@ +@@ -45,7 +53,8 @@ #ensure that the version of gd you are installing is used, and not an #older release in your directory tree somewhere. -INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include +INCLUDEDIRS=-I. -I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include -+.if defined(WITH_X11) -+INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include -+.endif ++INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include/freetype2 -I${X11BASE}/include #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location -@@ -55,16 +66,19 @@ +@@ -55,16 +66,17 @@ #on your system can't cause conflicts while building a new one. #This line shouldn't hurt if you don't actually have some of the #optional libraries and directories. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=-L. -L${LOCALBASE}/lib -Wl,--rpath,${LOCALBASE}/lib -+.if defined(WITH_X11) +LIBDIRS+=-L${X11BASE}/lib -Wl,--rpath,${X11BASE}/lib -+.endif #Location where libgd.a should be installed by "make install". -INSTALL_LIB=/usr/local/lib diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile index d12b052efb68..09ac3b3b5531 100644 --- a/graphics/gd2/Makefile +++ b/graphics/gd2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gd PORTVERSION= 1.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ \ diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac index 89e342477f1b..415662373e4c 100644 --- a/graphics/gd2/files/patch-ac +++ b/graphics/gd2/files/patch-ac @@ -49,27 +49,23 @@ #Note: for Freetype 1.x, use DHAVE_LIBTTF and -lttf instead. -@@ -45,7 +53,10 @@ +@@ -45,7 +53,8 @@ #ensure that the version of gd you are installing is used, and not an #older release in your directory tree somewhere. -INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include +INCLUDEDIRS=-I. -I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include -+.if defined(WITH_X11) -+INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include -+.endif ++INCLUDEDIRS+=-I${X11BASE}/include/X11 -I${X11BASE}/include/freetype2 -I${X11BASE}/include #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location -@@ -55,16 +66,19 @@ +@@ -55,16 +66,17 @@ #on your system can't cause conflicts while building a new one. #This line shouldn't hurt if you don't actually have some of the #optional libraries and directories. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=-L. -L${LOCALBASE}/lib -Wl,--rpath,${LOCALBASE}/lib -+.if defined(WITH_X11) +LIBDIRS+=-L${X11BASE}/lib -Wl,--rpath,${X11BASE}/lib -+.endif #Location where libgd.a should be installed by "make install". -INSTALL_LIB=/usr/local/lib diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile index efe0cdd3b052..5899e90913e4 100644 --- a/graphics/gnomeiconedit/Makefile +++ b/graphics/gnomeiconedit/Makefile @@ -13,14 +13,9 @@ DISTNAME= gnome-iconedit-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ - gnomeprint.13:${PORTSDIR}/print/gnomeprint \ - bonobo.2:${PORTSDIR}/devel/bonobo -RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter - BROKEN= "Uses internals from devel/oaf that are no longer present" +USE_GNOME= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_LIBTOOL= yes diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile index e3d851cc106d..0df29fbf78b9 100644 --- a/graphics/gpaint/Makefile +++ b/graphics/gpaint/Makefile @@ -13,9 +13,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ - gnomeprint.13:${PORTSDIR}/print/gnomeprint - USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= yes diff --git a/graphics/imagesort/Makefile b/graphics/imagesort/Makefile index 3f549a5d6b33..a84d27871212 100644 --- a/graphics/imagesort/Makefile +++ b/graphics/imagesort/Makefile @@ -7,15 +7,15 @@ PORTNAME= imagesort PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/viewers/X MAINTAINER= mark@kyne.com.au -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib - USE_X_PREFIX= yes +USE_IMLIB= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/imagesort ${PREFIX}/bin diff --git a/graphics/imanager/Makefile b/graphics/imanager/Makefile index 55adc3d7088a..4caed9bb01de 100644 --- a/graphics/imanager/Makefile +++ b/graphics/imanager/Makefile @@ -7,14 +7,14 @@ PORTNAME= imanager PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.linuxberg.com/files/kde/graphics/ DISTNAME= imanager-${PORTVERSION}.final.imlib MAINTAINER= ports@freebsd.org -LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib - +USE_IMLIB= yes USE_KDELIBS_VER=1 HAS_CONFIGURE= yes USE_GMAKE= yes diff --git a/graphics/ruby-gdk_pixbuf/Makefile b/graphics/ruby-gdk_pixbuf/Makefile index 55c9544b4767..2f3153ddf497 100644 --- a/graphics/ruby-gdk_pixbuf/Makefile +++ b/graphics/ruby-gdk_pixbuf/Makefile @@ -7,7 +7,8 @@ PORTNAME= gdk_pixbuf PORTVERSION= ${RUBY_GNOME_PORTVERSION} -CATEGORIES= graphics ruby +PORTREVISION= 1 +CATEGORIES= graphics ruby gnome MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= ${RUBY_GNOME_DISTNAME} @@ -15,9 +16,9 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org -LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk +USE_GNOMECTRL= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes USE_XLIB= yes @@ -27,7 +28,6 @@ USE_GLIB= yes WRKSRC= ${RUBY_GNOME_WRKSRC}/${PORTNAME} INSTALL_TARGET= site-install -CONFIGURE_ARGS= --with-glib-config="${GLIB_CONFIG}" DOCS_EN= ChangeLog README diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile index 55c9544b4767..2f3153ddf497 100644 --- a/graphics/ruby-gdk_pixbuf2/Makefile +++ b/graphics/ruby-gdk_pixbuf2/Makefile @@ -7,7 +7,8 @@ PORTNAME= gdk_pixbuf PORTVERSION= ${RUBY_GNOME_PORTVERSION} -CATEGORIES= graphics ruby +PORTREVISION= 1 +CATEGORIES= graphics ruby gnome MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= ${RUBY_GNOME_DISTNAME} @@ -15,9 +16,9 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org -LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk +USE_GNOMECTRL= yes USE_RUBY= yes USE_RUBY_EXTCONF= yes USE_XLIB= yes @@ -27,7 +28,6 @@ USE_GLIB= yes WRKSRC= ${RUBY_GNOME_WRKSRC}/${PORTNAME} INSTALL_TARGET= site-install -CONFIGURE_ARGS= --with-glib-config="${GLIB_CONFIG}" DOCS_EN= ChangeLog README |