summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2002-06-07 17:34:38 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2002-06-07 17:34:38 +0000
commit45c5678a74429b0fe5d794269e3b8e4b8dd5f7cd (patch)
tree4c7afbf8f7a87fb3a4b4fef0656bf1f2425bf4b6
parentrepllace inactive MASTER_SITE (diff)
- Take Maintainership
- use defined dirs consistently in each makefile
Notes
Notes: svn path=/head/; revision=60784
-rw-r--r--devel/gnustep-make/Makefile2
-rw-r--r--devel/gnustep/Makefile2
-rw-r--r--lang/gnustep-base/Makefile10
-rw-r--r--lang/gnustep-guile/Makefile8
-rw-r--r--lang/gnustep-objc/Makefile2
-rw-r--r--mail/gnumail/Makefile2
-rw-r--r--mail/pantomime/Makefile2
-rw-r--r--x11-toolkits/gnustep-gui/Makefile10
-rw-r--r--x11-toolkits/gnustep-xgps/Makefile10
-rw-r--r--x11-toolkits/gtoolkit/Makefile2
10 files changed, 27 insertions, 23 deletions
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 482ec83b1cde..6e51695a7af0 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.3.2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
.include <bsd.port.pre.mk>
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index 0f0e716c4fd3..23d7906355ef 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= # empty
DISTFILES= # empty
EXTRACT_ONLY= # empty
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make \
${SYSLIBDIR}/libobjc.so:${PORTSDIR}/lang/gnustep-objc \
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 738fe25bde63..481af2598e3a 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -10,11 +10,11 @@ PORTVERSION= 1.3.2
CATEGORIES= lang devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
-BUILD_DEPENDS= ${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/libobjc.so:${PORTSDIR}/lang/gnustep-objc
+BUILD_DEPENDS= ${SYSLIBDIR}/libobjc.so:${PORTSDIR}/lang/gnustep-objc
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS= ${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/libobjc.so:${PORTSDIR}/lang/gnustep-objc
+RUN_DEPENDS= ${SYSLIBDIR}/libobjc.so:${PORTSDIR}/lang/gnustep-objc
BREAKS_IF_PEDANTIC= yes
@@ -44,8 +44,8 @@ GNU_ARCH= ${MACHINE_ARCH}
PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION} \
MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
ETCDIR= ${PREFIX}/../etc
-SYSTEMDIR= ${LOCALBASE}/GNUstep/System
-SYSLIBDIR= ${SYSTEMDIR}/Libraries
+SYSTEMDIR= ${PREFIX}/System
+SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
do-configure:
@(cd ${WRKSRC}; . ${SYSTEMDIR}/Makefiles/GNUstep.sh; \
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 72899a3a62b5..72e4c144bd6a 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -10,10 +10,10 @@ PORTVERSION= 1.0.3
CATEGORIES= lang
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/libs/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
-BUILD_DEPENDS= ${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
-RUN_DEPENDS= ${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
+BUILD_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
+RUN_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
.include <bsd.port.pre.mk>
@@ -40,7 +40,7 @@ GNU_ARCH= ${MACHINE_ARCH}
.endif
PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION}
-SYSLIBDIR= ${PREFIX}/System/Libraries
+COMBOLIBDIR= ${PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
do-configure:
@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
diff --git a/lang/gnustep-objc/Makefile b/lang/gnustep-objc/Makefile
index 253663cd3b79..9bd1324f2f5a 100644
--- a/lang/gnustep-objc/Makefile
+++ b/lang/gnustep-objc/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.2.2
CATEGORIES= lang devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/libs/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
BUILD_DEPENDS= ${SYSTEMDIR}/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make \
${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index cbdd8fa273ec..645744beedbc 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.collaboration-world.com/mirror/ \
http://extrovert.screwdriver.net/~extra/
DISTNAME= GNUMail-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
BUILD_DEPENDS= ${XGPSBUNDLEDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps \
${LOCALLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libPantomime.so:${PORTSDIR}/mail/pantomime
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index a90281547060..e89216f5ffbb 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.collaboration-world.com/mirror/ \
ftp://ftp.tuwien.ac.at/z6/publishing/gnustep/libs/
DISTNAME= Pantomime-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
BUILD_DEPENDS= ${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
RUN_DEPENDS= ${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 312dcf8864e1..c931909b42b0 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -12,12 +12,14 @@ MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
http://ftp.codefactory.se/pub/gnu/gstep/ \
http://planetmirror.com/pub/gnustep/core/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
-BUILD_DEPENDS= ${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
-RUN_DEPENDS= ${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
+BUILD_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
+RUN_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
+BREAKS_IF_PEDANTIC= yes
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 300000
@@ -41,7 +43,7 @@ GNU_ARCH= ${MACHINE_ARCH}
PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION} \
MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
-SYSLIBDIR= ${PREFIX}/System/Libraries
+COMBOLIBDIR= ${PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
post-extract:
.for file in config.guess config.sub install-sh
diff --git a/x11-toolkits/gnustep-xgps/Makefile b/x11-toolkits/gnustep-xgps/Makefile
index b2c2810e3d5e..4c55654729e2 100644
--- a/x11-toolkits/gnustep-xgps/Makefile
+++ b/x11-toolkits/gnustep-xgps/Makefile
@@ -10,13 +10,15 @@ PORTVERSION= 0.7.6
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
-BUILD_DEPENDS= ${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui
-RUN_DEPENDS= ${SYSLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui
+BUILD_DEPENDS= ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui
+RUN_DEPENDS= ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
+BREAKS_IF_PEDANTIC= yes
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 300000
@@ -44,7 +46,7 @@ GNU_ARCH= ${MACHINE_ARCH}
.endif
PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION}
-SYSLIBDIR= ${PREFIX}/System/Libraries
+COMBOLIBDIR= ${PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
do-configure:
@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
diff --git a/x11-toolkits/gtoolkit/Makefile b/x11-toolkits/gtoolkit/Makefile
index c8570adaff59..33c66d7a7c86 100644
--- a/x11-toolkits/gtoolkit/Makefile
+++ b/x11-toolkits/gtoolkit/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.9.4
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dinoex@FreeBSD.org
BUILD_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
RUN_DEPENDS= ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base