summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2003-06-01 03:12:41 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2003-06-01 03:12:41 +0000
commitccc703d8a6766c0776c46d0668324a379d9d3d9f (patch)
tree16d2c8eb09361a3eadc2f2b72e389bc2e0b264ba /devel
parentDon't remove a file-entry if the file still gets installed... (diff)
- Add WITH_GNUSTEP_DEVEL
HEADS UP: New filesystem layout with gnustep-1.7.0
Diffstat (limited to 'devel')
-rw-r--r--devel/gnustep/Makefile8
-rw-r--r--devel/gnustep/bsd.gnustep.mk22
2 files changed, 27 insertions, 3 deletions
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index ad76f4b36f9e..379d6f4f58ae 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -6,7 +6,11 @@
#
PORTNAME= gnustep
+.if defined(WITH_GNUSTEP_DEVEL)
+PORTVERSION= 1.7.0
+.else
PORTVERSION= 1.6.0
+.endif
CATEGORIES= devel lang
MASTER_SITES= # empty
DISTFILES= # empty
@@ -36,7 +40,11 @@ GNU_ARCH= ix86
GNU_ARCH= ${MACHINE_ARCH}
.endif
+.if defined(WITH_GNUSTEP_DEVEL)
+SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries/${GNU_ARCH}/${OPSYS:L}
+.else
SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
+.endif
COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH}
diff --git a/devel/gnustep/bsd.gnustep.mk b/devel/gnustep/bsd.gnustep.mk
index 6f6609f14027..7ed469358c3e 100644
--- a/devel/gnustep/bsd.gnustep.mk
+++ b/devel/gnustep/bsd.gnustep.mk
@@ -64,11 +64,27 @@ PLIST_SUB+= MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
SYSTEMDIR= ${PREFIX}/System
SYSMAKEDIR= ${SYSTEMDIR}/Makefiles
-SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
-COMBOLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
-BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles
COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
+.if defined(WITH_GNUSTEP_DEVEL)
+SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries/${GNU_ARCH}/${OPSYS:L}
+COMBOLIBDIR= ${SYSTEMDIR}/Library/Libraries/${COMBOPATH}
+LOCALLIBDIR= ${PREFIX}/Local/Library/Libraries/${COMBOPATH}
+PLIST_SUB+= SYSTEMLIBRARY="System/Library"
+PLIST_SUB+= LOCALLIBRARY="Local/Library"
+PLIST_SUB+= GNUSTEP_DEVEL=""
+PLIST_SUB+= GNUSTEP_STABLE="@comment "
+PKGNAMESUFFIX?= -devel
+.else
+SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
+COMBOLIBDIR= ${SYSTEMDIR}/Libraries/${COMBOPATH}
LOCALLIBDIR= ${PREFIX}/Local/Libraries/${COMBOPATH}
+PLIST_SUB+= SYSTEMLIBRARY="System"
+PLIST_SUB+= LOCALLIBRARY="Local"
+PLIST_SUB+= GNUSTEP_DEVEL="@comment "
+PLIST_SUB+= GNUSTEP_STABLE=""
+.else
+.endif
+BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles
CC= gcc32
CXX= g++32