diff options
| -rw-r--r-- | devel/gnustep-make/Makefile | 16 | ||||
| -rw-r--r-- | devel/gnustep-make/pkg-plist | 5 |
2 files changed, 12 insertions, 9 deletions
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 4b622b6a8f52..2fcfedfcc2dd 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnustep-make PORTVERSION= 1.13.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNUSTEP} MASTER_SITE_SUBDIR= core @@ -15,16 +15,15 @@ MASTER_SITE_SUBDIR= core MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep makefile package -GNU_CONFIGURE= yes -CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c" \ - CFLAGS="${CFLAGS}" -CONFIGURE_TARGET= -USE_GMAKE= yes USE_GNUSTEP= yes USE_GNUSTEP_PREFIX= yes -MAKEFILE= + +GNU_CONFIGURE= yes +CONFIGURE_TARGET= MAKE_FLAGS= OPTFLAG="${CFLAGS}" CFLAGS+= ${PTHREAD_CFLAGS} +CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL} -c" INSTALL_DATA="${INSTALL} -c" \ + CFLAGS="${CFLAGS}" CONFIGURE_ARGS+= --with-thread-lib="${PTHREAD_LIBS}" CONFIGURE_ARGS+= --with-config-file=${PREFIX}/GNUstep.conf @@ -35,12 +34,13 @@ GNUSTEP_WITHOUT_LIBOBJC= yes post-install: ${LN} -s Library/Makefiles ${PREFIX}/System/ -${MKDIR} ${PREFIX}/Local/Applications + -${MKDIR} ${PREFIX}/Local/Library/ApplicationSupport -${MKDIR} ${PREFIX}/Local/Library/Bundles -${MKDIR} ${PREFIX}/Local/Library/Documentation -${MKDIR} ${PREFIX}/Local/Library/Frameworks -${MKDIR} ${PREFIX}/Local/Library/Headers -${MKDIR} ${PREFIX}/Local/Library/Libraries -${MKDIR} ${PREFIX}/Local/Library/Preferences - -${MKDIR} ${PREFIX}/Local/Tools + -${MKDIR} ${PREFIX}/Local/Tools/Resources .include <bsd.port.mk> diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist index 94c0ba350705..927caf8f94c2 100644 --- a/devel/gnustep-make/pkg-plist +++ b/devel/gnustep-make/pkg-plist @@ -154,6 +154,7 @@ System/share/config.site @dirrm System/Library @dirrm System/Applications @dirrm System +@dirrm Local/Tools/Resources @dirrm Local/Tools @dirrm Local/Library/Preferences @dirrm Local/Library/Libraries @@ -161,18 +162,20 @@ System/share/config.site @dirrm Local/Library/Frameworks @dirrm Local/Library/Documentation @dirrm Local/Library/Bundles +@dirrm Local/Library/ApplicationSupport @dirrm Local/Library @dirrm Local/Applications @dirrm Local @unexec rmdir %D @exec mkdir -p %D/Local/Applications +@exec mkdir -p %D/Local/Library/ApplicationSupport @exec mkdir -p %D/Local/Library/Bundles @exec mkdir -p %D/Local/Library/Documentation @exec mkdir -p %D/Local/Library/Frameworks @exec mkdir -p %D/Local/Library/Headers @exec mkdir -p %D/Local/Library/Libraries @exec mkdir -p %D/Local/Library/Preferences -@exec mkdir -p %D/Local/Tools +@exec mkdir -p %D/Local/Tools/Resources @exec mkdir -p %D/System/Applications @exec mkdir -p %D/System/Library/ApplicationSupport @exec mkdir -p %D/System/Library/Bundles |