diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-08-09 03:25:48 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-08-09 03:25:48 +0000 |
| commit | fe8e9bf36645a88b365ebd2f92a5bd99b3f96c98 (patch) | |
| tree | e319b69082d4b017d787754d02aa1b998d161d2a /lang/gnustep-base | |
| parent | Add cdroot: a utility for automating the creation of a full FreeBSD (diff) | |
Fix PREFIX dependency in GNUstep.sh,
cleanup pkg-plist
Notes
Notes:
svn path=/head/; revision=64265
Diffstat (limited to 'lang/gnustep-base')
| -rw-r--r-- | lang/gnustep-base/Makefile | 10 | ||||
| -rw-r--r-- | lang/gnustep-base/files/GNUstep.sh | 6 | ||||
| -rw-r--r-- | lang/gnustep-base/pkg-plist | 5 |
3 files changed, 12 insertions, 9 deletions
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile index 9e728370daae..f762d0c50abf 100644 --- a/lang/gnustep-base/Makefile +++ b/lang/gnustep-base/Makefile @@ -27,6 +27,7 @@ BROKEN= "Sorry, this port does not work on FreeBSD-2.2.x" .endif PREFIX= ${LOCALBASE}/GNUstep +PLIST_SUB+= LOCALBASE=${LOCALBASE} USE_AUTOCONF= yes USE_NEWGCC= yes GNU_CONFIGURE= yes @@ -45,10 +46,14 @@ GNU_ARCH= ${MACHINE_ARCH} .endif PLIST_SUB+= GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION} \ MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1} -ETCDIR= ${PREFIX}/../etc +ETCDIR= ${LOCALBASE}/etc SYSTEMDIR= ${PREFIX}/System SYSLIBDIR= ${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L} +post-extract: + @${SED} -e "s=%%PREFIX%%=${LOCALBASE}=" ${FILESDIR}/GNUstep.sh \ + > ${WRKSRC}/GNUstep.sh + do-configure: @(cd ${WRKSRC}; . ${SYSTEMDIR}/Makefiles/GNUstep.sh; \ if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ @@ -73,8 +78,9 @@ do-install: ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) post-install: - @${MKDIR} ${ETCDIR} + -@${MKDIR} ${ETCDIR}/rc.d ${INSTALL_SCRIPT} ${FILESDIR}/GNUstep.sh ${ETCDIR}/rc.d + ${INSTALL_SCRIPT} ${WRKSRC}/GNUstep.sh ${ETCDIR}/rc.d ${INSTALL_DATA} ${FILESDIR}/gdomap_if ${ETCDIR} .include <bsd.port.post.mk> diff --git a/lang/gnustep-base/files/GNUstep.sh b/lang/gnustep-base/files/GNUstep.sh index b21ba90a8b5b..b76c3eac6432 100644 --- a/lang/gnustep-base/files/GNUstep.sh +++ b/lang/gnustep-base/files/GNUstep.sh @@ -1,10 +1,6 @@ #!/bin/sh -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - +PREFIX=%%PREFIX%% IFFILE=${PREFIX}/etc/gdomap_if PIDFILE=/var/run/gdomap.pid GNUSTEP_SYSTEM_ROOT=${PREFIX}/GNUstep/System diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist index d97f3aac5c2f..24c4427fbcef 100644 --- a/lang/gnustep-base/pkg-plist +++ b/lang/gnustep-base/pkg-plist @@ -1,5 +1,3 @@ -../etc/gdomap_if -../etc/rc.d/GNUstep.sh System/Headers/%%GNU_ARCH%%/%%OPSYS%%/GSConfig.h System/Headers/%%GNU_ARCH%%/%%OPSYS%%/mframe.h System/Headers/Foundation/Foundation.h @@ -756,3 +754,6 @@ System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/sfparse @dirrm System/Headers/gnustep/base @dirrm System/Headers/gnustep @dirrm System/Headers/Foundation +@cwd %%LOCALBASE%% +etc/gdomap_if +etc/rc.d/GNUstep.sh |