diff options
author | Stefan Eßer <se@FreeBSD.org> | 1997-11-03 00:25:44 +0000 |
---|---|---|
committer | Stefan Eßer <se@FreeBSD.org> | 1997-11-03 00:25:44 +0000 |
commit | 53313e608ceb1a8eb7d882d7732f20059c730940 (patch) | |
tree | f3eb774cb6d902cc9514085aed541c8b50b6584a /x11 | |
parent | Reorder variables: dependencies should be put right after the maintainer (diff) |
Add BUILD_DEPENDS on moc pre-processor.
Make LIB_DEPENDS accept both libjpeg.so.6.0 and 7.0, as
requested by TOYONAGA Tatsuto <toyonaga@msd.ts.fujitsu.co.jp>
Notes
Notes:
svn path=/head/; revision=8449
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kde4-baseapps/Makefile | 5 | ||||
-rw-r--r-- | x11/kde4-runtime/Makefile | 5 | ||||
-rw-r--r-- | x11/kde4-workspace/Makefile | 5 | ||||
-rw-r--r-- | x11/kdebase11/Makefile | 5 | ||||
-rw-r--r-- | x11/kdebase2/Makefile | 5 | ||||
-rw-r--r-- | x11/kdebase3/Makefile | 5 | ||||
-rw-r--r-- | x11/kdebase4-runtime/Makefile | 5 | ||||
-rw-r--r-- | x11/kdebase4-workspace/Makefile | 5 | ||||
-rw-r--r-- | x11/kdebase4/Makefile | 5 | ||||
-rw-r--r-- | x11/kdelibs11/Makefile | 5 | ||||
-rw-r--r-- | x11/kdelibs2/Makefile | 5 | ||||
-rw-r--r-- | x11/kdelibs3/Makefile | 5 | ||||
-rw-r--r-- | x11/kdelibs4/Makefile | 5 |
13 files changed, 39 insertions, 26 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index b66d4c838ea8..096cdd04da9b 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:28:20 se Exp $ # DISTNAME= kdebase-Beta1-3 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \ + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \ kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \ kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \ jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \ diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index b66d4c838ea8..096cdd04da9b 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:28:20 se Exp $ # DISTNAME= kdebase-Beta1-3 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \ + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \ kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \ kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \ jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \ diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index b66d4c838ea8..096cdd04da9b 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:28:20 se Exp $ # DISTNAME= kdebase-Beta1-3 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \ + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \ kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \ kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \ jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \ diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile index b66d4c838ea8..096cdd04da9b 100644 --- a/x11/kdebase11/Makefile +++ b/x11/kdebase11/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:28:20 se Exp $ # DISTNAME= kdebase-Beta1-3 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \ + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \ kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \ kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \ jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \ diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index b66d4c838ea8..096cdd04da9b 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:28:20 se Exp $ # DISTNAME= kdebase-Beta1-3 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \ + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \ kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \ kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \ jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \ diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index b66d4c838ea8..096cdd04da9b 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:28:20 se Exp $ # DISTNAME= kdebase-Beta1-3 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \ + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \ kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \ kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \ jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \ diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index b66d4c838ea8..096cdd04da9b 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:28:20 se Exp $ # DISTNAME= kdebase-Beta1-3 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \ + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \ kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \ kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \ jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \ diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index b66d4c838ea8..096cdd04da9b 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:28:20 se Exp $ # DISTNAME= kdebase-Beta1-3 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \ + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \ kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \ kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \ jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \ diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index b66d4c838ea8..096cdd04da9b 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:28:20 se Exp $ # DISTNAME= kdebase-Beta1-3 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \ + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg \ kdecore\\.0\\.1[1-9]:${PORTSDIR}/x11/kdelibs \ kdeui\\.0\\.1[0-9]:${PORTSDIR}/x11/kdelibs \ jscript\\.0\\.[1-9]:${PORTSDIR}/x11/kdelibs \ diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile index 6f61bf0f7e80..5fad54615102 100644 --- a/x11/kdelibs11/Makefile +++ b/x11/kdelibs11/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:21:16 se Exp $ # DISTNAME= kdelibs-Beta1-2 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 6f61bf0f7e80..5fad54615102 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:21:16 se Exp $ # DISTNAME= kdelibs-Beta1-2 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 6f61bf0f7e80..5fad54615102 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:21:16 se Exp $ # DISTNAME= kdelibs-Beta1-2 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 6f61bf0f7e80..5fad54615102 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -3,7 +3,7 @@ # Date created: 28 October 1997 # Whom: Stefan Eßer <se@freebsd.org> # -# $Id:$ +# $Id: Makefile,v 1.1.1.1 1997/11/01 14:21:16 se Exp $ # DISTNAME= kdelibs-Beta1-2 @@ -15,9 +15,10 @@ EXTRACT_SUFX= .src.tgz MAINTAINER= se@freebsd.org +BUILD_DEPENDS= ${X11BASE}/bin/moc:${PORTSDIR}/x11/qt LIB_DEPENDS= qt\\.1\\.[0-9]:${PORTSDIR}/x11/qt \ gif\\.[23]\\.:${PORTSDIR}/graphics/giflib \ - jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg + jpeg\\.[67]\\.:${PORTSDIR}/graphics/jpeg HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ |