summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2003-10-19 11:14:19 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2003-10-19 11:14:19 +0000
commita58da456deb459af716ac636e3d0df45598519ef (patch)
treed3c2f82af8aafbb959d418ce1835b8592f6f6969 /Mk
parent- new option WITHOUT_OPENSSL (diff)
- Layout for GnuSTEP 1.8.0
Notes
Notes: svn path=/head/; revision=91666
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.gnustep.mk26
1 files changed, 3 insertions, 23 deletions
diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk
index 2970857c9c4d..5e9834c51251 100644
--- a/Mk/bsd.gnustep.mk
+++ b/Mk/bsd.gnustep.mk
@@ -64,29 +64,21 @@ PLIST_SUB+= MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
SYSTEMDIR= ${PREFIX}/System
SYSMAKEDIR= ${SYSTEMDIR}/Makefiles
-COMBOPATH= ${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
-.if defined(WITH_GNUSTEP_DEVEL)
+BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles
SYSLIBDIR= ${SYSTEMDIR}/Library/Libraries
COMBOLIBDIR= ${SYSTEMDIR}/Library/Libraries
LOCALLIBDIR= ${PREFIX}/Local/Library/Libraries
PLIST_SUB+= SYSTEMLIBRARY="System/Library"
PLIST_SUB+= LOCALLIBRARY="Local/Library"
PLIST_SUB+= NOFLAT=""
+.if defined(WITH_GNUSTEP_DEVEL)
+PKGNAMESUFFIX?= -devel
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+= NOFLAT="${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/"
PLIST_SUB+= GNUSTEP_DEVEL="@comment "
PLIST_SUB+= GNUSTEP_STABLE=""
-.else
.endif
-BUNDLEDIR= ${SYSTEMDIR}/Library/Bundles
CC= gcc32
CXX= g++32
@@ -128,11 +120,7 @@ USE_GNUSTEP_XLIB=yes
BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
-.if defined(WITH_GNUSTEP_DEVEL)
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle
-.else
-BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH}
-.endif
MAKE_FLAGS+= GUI_BACKEND_LIB=back
.endif
@@ -143,11 +131,7 @@ MAKE_FLAGS+= GUI_BACKEND_LIB=back
BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
-.if defined(WITH_GNUSTEP_DEVEL)
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-xdps.bundle
-.else
-BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-xdps.bundle/${COMBOPATH}
-.endif
MAKE_FLAGS+= GUI_BACKEND_LIB=xdps
.endif
@@ -158,11 +142,7 @@ MAKE_FLAGS+= GUI_BACKEND_LIB=xdps
BUILD_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
RUN_DEPENDS+= ${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
-.if defined(WITH_GNUSTEP_DEVEL)
BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-art.bundle
-.else
-BACKBUNDLEDIR= ${BUNDLEDIR}/libgnustep-art.bundle/${COMBOPATH}
-.endif
MAKE_FLAGS+= GUI_BACKEND_LIB=art
.endif