diff options
author | rh <rh> | 2004-04-10 23:31:39 +0000 |
---|---|---|
committer | rh <rh> | 2004-04-10 23:31:39 +0000 |
commit | 7408cfc1f6df23d563c02453dbf3a0fc32c5213f (patch) | |
tree | fe65f29a790796ab5a35298669d9707fda156241 /devel/gnustep-make | |
parent | 48278bc2e8170e69e972cc8f6c83fa87e9bad0f9 (diff) | |
download | pkgsrc-7408cfc1f6df23d563c02453dbf3a0fc32c5213f.tar.gz |
Update gnustep-make to 1.9.1.
Changes in version `1.9.1'
==========================
* Remove `--disable-import' option
* README.Darwin for darwin/MacOSX install
* Framework version and naming clarified.
Changes in version `1.9.0'
==========================
* Support for building in a separate build dir.
* Add `--enable-strip-makefiles' option to configure
* List of classes in a framework gets written to the plist file.
Diffstat (limited to 'devel/gnustep-make')
-rw-r--r-- | devel/gnustep-make/Makefile | 18 | ||||
-rw-r--r-- | devel/gnustep-make/PLIST | 66 | ||||
-rw-r--r-- | devel/gnustep-make/buildlink2.mk | 53 | ||||
-rw-r--r-- | devel/gnustep-make/buildlink3.mk | 54 | ||||
-rw-r--r-- | devel/gnustep-make/distinfo | 7 | ||||
-rw-r--r-- | devel/gnustep-make/gnustep.mk | 91 | ||||
-rw-r--r-- | devel/gnustep-make/patches/patch-ab | 22 |
7 files changed, 144 insertions, 167 deletions
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 073afe6ecb0..c5083e42ebe 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2004/03/31 19:20:26 minskim Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/10 23:31:39 rh Exp $ # -DISTNAME= gnustep-make-1.8.0 +DISTNAME= gnustep-make-1.9.1 CATEGORIES= devel gnustep MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ @@ -11,14 +11,11 @@ COMMENT= GNUstep makefile package PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_BUILDLINK3= yes -USE_GNU_TOOLS+= make -USE_X11= YES -MAKEFILE= GNUmakefile -GNU_CONFIGURE= YES -GNU_CONFIGURE_PREFIX= ${PREFIX}/share/GNUstep -GNUSTEP_HOST_CPU= ${MACHINE_GNU_ARCH:S/i386/ix86/} -CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}" +USE_BUILDLINK3= yes +USE_X11= yes +CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}" + +.include "gnustep.mk" post-patch: ${CP} ${WRKSRC}/target.make ${WRKSRC}/target.make.bak @@ -30,6 +27,7 @@ post-install: ${INSTALL_PROGRAM_DIR} ${PREFIX}/share/GNUstep/Local/Applications ${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Library ${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Library/Bundles + ${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Library/Frameworks ${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Library/Headers ${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Local/Library/Libraries diff --git a/devel/gnustep-make/PLIST b/devel/gnustep-make/PLIST index 70aa6e95265..da4a0b7f9fb 100644 --- a/devel/gnustep-make/PLIST +++ b/devel/gnustep-make/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2003/12/08 15:31:40 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/04/10 23:31:39 rh Exp $ share/GNUstep/System/Library/Makefiles/GNUstep-reset.sh share/GNUstep/System/Library/Makefiles/GNUstep.csh share/GNUstep/System/Library/Makefiles/GNUstep.sh @@ -89,6 +89,7 @@ share/GNUstep/System/Library/Makefiles/library.make share/GNUstep/System/Library/Makefiles/messages.make share/GNUstep/System/Library/Makefiles/mkinstalldirs share/GNUstep/System/Library/Makefiles/names.make +share/GNUstep/System/Library/Makefiles/native-library.make share/GNUstep/System/Library/Makefiles/objc.make share/GNUstep/System/Library/Makefiles/os.sh share/GNUstep/System/Library/Makefiles/palette.make @@ -99,6 +100,7 @@ share/GNUstep/System/Library/Makefiles/service.make share/GNUstep/System/Library/Makefiles/spec-debug-alone-rules.template share/GNUstep/System/Library/Makefiles/spec-debug-rules.template share/GNUstep/System/Library/Makefiles/spec-rules.template +share/GNUstep/System/Library/Makefiles/strip_makefiles.sh share/GNUstep/System/Library/Makefiles/subproject.make share/GNUstep/System/Library/Makefiles/target.make share/GNUstep/System/Library/Makefiles/test-application.make @@ -114,77 +116,79 @@ share/GNUstep/System/Tools/debugapp share/GNUstep/System/Tools/openapp share/GNUstep/System/Tools/opentool share/GNUstep/System/share/config.site -@exec ${MKDIR} %D/share/GNUstep/Local/Applications -@exec ${MKDIR} %D/share/GNUstep/Local/Library/Bundles -@exec ${MKDIR} %D/share/GNUstep/Local/Library/Headers -@exec ${MKDIR} %D/share/GNUstep/Local/Library/Libraries -@exec ${MKDIR} %D/share/GNUstep/Network -@exec ${MKDIR} %D/share/GNUstep/System/Applications -@exec ${MKDIR} %D/share/GNUstep/System/Library/ApplicationSupport -@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles -@exec ${MKDIR} %D/share/GNUstep/System/Library/ColorPickers -@exec ${MKDIR} %D/share/GNUstep/System/Library/Colors -@exec ${MKDIR} %D/share/GNUstep/System/Library/DocTemplates -@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/Developer -@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/User -@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/info -@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/man -@exec ${MKDIR} %D/share/GNUstep/System/Library/Fonts -@exec ${MKDIR} %D/share/GNUstep/System/Library/Frameworks -@exec ${MKDIR} %D/share/GNUstep/System/Library/Headers -@exec ${MKDIR} %D/share/GNUstep/System/Library/Images -@exec ${MKDIR} %D/share/GNUstep/System/Library/KeyBindings -@exec ${MKDIR} %D/share/GNUstep/System/Library/Libraries/Java -@exec ${MKDIR} %D/share/GNUstep/System/Library/Libraries/Resources -@exec ${MKDIR} %D/share/GNUstep/System/Library/Makefiles/Additional -@exec ${MKDIR} %D/share/GNUstep/System/Library/Makefiles/Auxiliary -@exec ${MKDIR} %D/share/GNUstep/System/Library/Makefiles/ix86 -@exec ${MKDIR} %D/share/GNUstep/System/Library/PostScript -@exec ${MKDIR} %D/share/GNUstep/System/Library/Services -@exec ${MKDIR} %D/share/GNUstep/System/Library/Sounds -@exec ${MKDIR} %D/share/GNUstep/System/Tools/Java -@exec ${MKDIR} %D/share/GNUstep/System/Tools/Resources @dirrm share/GNUstep/System/share +@exec ${MKDIR} %D/share/GNUstep/System/Tools/Resources @dirrm share/GNUstep/System/Tools/Resources +@exec ${MKDIR} %D/share/GNUstep/System/Tools/Java @dirrm share/GNUstep/System/Tools/Java @dirrm share/GNUstep/System/Tools +@exec ${MKDIR} %D/share/GNUstep/System/Library/Sounds @dirrm share/GNUstep/System/Library/Sounds +@exec ${MKDIR} %D/share/GNUstep/System/Library/Services @dirrm share/GNUstep/System/Library/Services +@exec ${MKDIR} %D/share/GNUstep/System/Library/PostScript @dirrm share/GNUstep/System/Library/PostScript +@exec ${MKDIR} %D/share/GNUstep/System/Library/Makefiles/ix86 @dirrm share/GNUstep/System/Library/Makefiles/ix86 @dirrm share/GNUstep/System/Library/Makefiles/Master @dirrm share/GNUstep/System/Library/Makefiles/Instance/Shared @dirrm share/GNUstep/System/Library/Makefiles/Instance/Documentation @dirrm share/GNUstep/System/Library/Makefiles/Instance +@exec ${MKDIR} %D/share/GNUstep/System/Library/Makefiles/Auxiliary @dirrm share/GNUstep/System/Library/Makefiles/Auxiliary +@exec ${MKDIR} %D/share/GNUstep/System/Library/Makefiles/Additional @dirrm share/GNUstep/System/Library/Makefiles/Additional @dirrm share/GNUstep/System/Library/Makefiles +@exec ${MKDIR} %D/share/GNUstep/System/Library/Libraries/Resources @dirrm share/GNUstep/System/Library/Libraries/Resources +@exec ${MKDIR} %D/share/GNUstep/System/Library/Libraries/Java @dirrm share/GNUstep/System/Library/Libraries/Java @dirrm share/GNUstep/System/Library/Libraries +@exec ${MKDIR} %D/share/GNUstep/System/Library/KeyBindings @dirrm share/GNUstep/System/Library/KeyBindings +@exec ${MKDIR} %D/share/GNUstep/System/Library/Images @dirrm share/GNUstep/System/Library/Images +@exec ${MKDIR} %D/share/GNUstep/System/Library/Headers @dirrm share/GNUstep/System/Library/Headers +@exec ${MKDIR} %D/share/GNUstep/System/Library/Frameworks @dirrm share/GNUstep/System/Library/Frameworks +@exec ${MKDIR} %D/share/GNUstep/System/Library/Fonts @dirrm share/GNUstep/System/Library/Fonts +@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/man @dirrm share/GNUstep/System/Library/Documentation/man +@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/info @dirrm share/GNUstep/System/Library/Documentation/info +@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/User @dirrm share/GNUstep/System/Library/Documentation/User +@exec ${MKDIR} %D/share/GNUstep/System/Library/Documentation/Developer @dirrm share/GNUstep/System/Library/Documentation/Developer @dirrm share/GNUstep/System/Library/Documentation +@exec ${MKDIR} %D/share/GNUstep/System/Library/DocTemplates @dirrm share/GNUstep/System/Library/DocTemplates +@exec ${MKDIR} %D/share/GNUstep/System/Library/Colors @dirrm share/GNUstep/System/Library/Colors +@exec ${MKDIR} %D/share/GNUstep/System/Library/ColorPickers @dirrm share/GNUstep/System/Library/ColorPickers +@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles @dirrm share/GNUstep/System/Library/Bundles +@exec ${MKDIR} %D/share/GNUstep/System/Library/ApplicationSupport @dirrm share/GNUstep/System/Library/ApplicationSupport @dirrm share/GNUstep/System/Library +@exec ${MKDIR} %D/share/GNUstep/System/Applications @dirrm share/GNUstep/System/Applications @dirrm share/GNUstep/System +@exec ${MKDIR} %D/share/GNUstep/Network @dirrm share/GNUstep/Network +@exec ${MKDIR} %D/share/GNUstep/Local/Library/Libraries @dirrm share/GNUstep/Local/Library/Libraries +@exec ${MKDIR} %D/share/GNUstep/Local/Library/Headers @dirrm share/GNUstep/Local/Library/Headers +@exec ${MKDIR} %D/share/GNUstep/Local/Library/Frameworks +@dirrm share/GNUstep/Local/Library/Frameworks +@exec ${MKDIR} %D/share/GNUstep/Local/Library/Bundles @dirrm share/GNUstep/Local/Library/Bundles @dirrm share/GNUstep/Local/Library +@exec ${MKDIR} %D/share/GNUstep/Local/Applications @dirrm share/GNUstep/Local/Applications @dirrm share/GNUstep/Local @dirrm share/GNUstep diff --git a/devel/gnustep-make/buildlink2.mk b/devel/gnustep-make/buildlink2.mk index 51a01baed51..79e3d4bf0cb 100644 --- a/devel/gnustep-make/buildlink2.mk +++ b/devel/gnustep-make/buildlink2.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink2.mk,v 1.8 2003/12/05 09:16:33 adam Exp $ +# $NetBSD: buildlink2.mk,v 1.9 2004/04/10 23:31:39 rh Exp $ # .if !defined(GNUSTEP_MAKE_BUILDLINK2_MK) GNUSTEP_MAKE_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= gnustep-make -BUILDLINK_DEPENDS.gnustep-make?= gnustep-make>=1.8.0 +BUILDLINK_DEPENDS.gnustep-make?= gnustep-make>=1.9.1 BUILDLINK_PKGSRCDIR.gnustep-make?= ../../devel/gnustep-make EVAL_PREFIX+= BUILDLINK_PREFIX.gnustep-make=gnustep-make @@ -13,55 +13,6 @@ BUILDLINK_PREFIX.gnustep-make_DEFAULT= ${LOCALBASE} BUILDLINK_TARGETS+= gnustep-make-buildlink -GNUSTEP_ROOT= ${PREFIX}/share/GNUstep -GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_ROOT}/System -GNUSTEP_FLATTENED= yes -#LIBRARY_COMBO= gnu-gnu-gnu -GNUSTEP_LOCAL_ROOT= ${GNUSTEP_ROOT}/Local -GNUSTEP_NETWORK_ROOT= ${GNUSTEP_ROOT}/Network -GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Makefiles -GNUSTEP_HOST= ${MACHINE_GNU_PLATFORM} -GNUSTEP_HOST_CPU= ${MACHINE_GNU_ARCH:S/i386/ix86/} -GNUSTEP_HOST_VENDOR= ${LOWER_VENDOR} -GNUSTEP_HOST_OS= ${LOWER_OPSYS} - -GNUSTEP_USER_ROOT= ${BUILDLINK_DIR}/share/GNUstep -GNUSTEP_PATHLIST= ${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_NETWORK_ROOT}:${GNUSTEP_SYSTEM_ROOT} -GNUSTEP_PATH= ${GNUSTEP_USER_ROOT}/Tools:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_LOCAL_ROOT}/Tools:${GNUSTEP_LOCAL_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_NETWORK_ROOT}/Tools:${GNUSTEP_NETWORK_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_SYSTEM_ROOT}/Tools:${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS} -GUILE_LOAD_PATH= ${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Libraries/Guile - -PATH:= ${GNUSTEP_PATH}:${PATH} - -MAKE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}" -MAKE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" -MAKE_ENV+= GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}" -MAKE_ENV+= GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}" -MAKE_ENV+= GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" -MAKE_ENV+= GNUSTEP_HOST="${GNUSTEP_HOST}" -MAKE_ENV+= GNUSTEP_HOST_CPU="${GNUSTEP_HOST_CPU}" -MAKE_ENV+= GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}" -MAKE_ENV+= GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}" -MAKE_ENV+= GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}" -MAKE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}" -MAKE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}" -MAKE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}" - -.if defined(GNU_CONFIGURE) -CONFIGURE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}" -CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" -CONFIGURE_ENV+= GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}" -CONFIGURE_ENV+= GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}" -CONFIGURE_ENV+= GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" -CONFIGURE_ENV+= GNUSTEP_HOST="${GNUSTEP_HOST}" -CONFIGURE_ENV+= GNUSTEP_HOST_CPU="${GNUSTEP_HOST_CPU}" -CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}" -CONFIGURE_ENV+= GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}" -CONFIGURE_ENV+= GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}" -CONFIGURE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}" -CONFIGURE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}" -CONFIGURE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}" -.endif - gnustep-make-buildlink: _BUILDLINK_USE .endif # GNUSTEP_MAKE_BUILDLINK2_MK diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk index fabdef137eb..37a6fa88814 100644 --- a/devel/gnustep-make/buildlink3.mk +++ b/devel/gnustep-make/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/31 19:47:59 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/04/10 23:31:39 rh Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNUSTEP_MAKE_BUILDLINK3_MK:= ${GNUSTEP_MAKE_BUILDLINK3_MK}+ @@ -11,57 +11,13 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-make} BUILDLINK_PACKAGES+= gnustep-make .if !empty(GNUSTEP_MAKE_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.gnustep-make+= gnustep-make>=1.8.0 +BUILDLINK_DEPENDS.gnustep-make+= gnustep-make>=1.9.1 BUILDLINK_PKGSRCDIR.gnustep-make?= ../../devel/gnustep-make -GNUSTEP_ROOT= ${PREFIX}/share/GNUstep -GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_ROOT}/System -GNUSTEP_FLATTENED= yes -#LIBRARY_COMBO= gnu-gnu-gnu -GNUSTEP_LOCAL_ROOT= ${GNUSTEP_ROOT}/Local -GNUSTEP_NETWORK_ROOT= ${GNUSTEP_ROOT}/Network -GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Makefiles -GNUSTEP_HOST= ${MACHINE_GNU_PLATFORM} -GNUSTEP_HOST_CPU= ${MACHINE_GNU_ARCH:S/i386/ix86/} -GNUSTEP_HOST_VENDOR= ${LOWER_VENDOR} -GNUSTEP_HOST_OS= ${LOWER_OPSYS} +.include "../../devel/gnustep-make/gnustep.mk" -GNUSTEP_USER_ROOT= ${BUILDLINK_DIR}/share/GNUstep -GNUSTEP_PATHLIST= ${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_NETWORK_ROOT}:${GNUSTEP_SYSTEM_ROOT} -GNUSTEP_PATH= ${GNUSTEP_USER_ROOT}/Tools:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_LOCAL_ROOT}/Tools:${GNUSTEP_LOCAL_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_NETWORK_ROOT}/Tools:${GNUSTEP_NETWORK_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_SYSTEM_ROOT}/Tools:${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS} -GUILE_LOAD_PATH= ${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Libraries/Guile - -PATH:= ${GNUSTEP_PATH}:${PATH} - -MAKE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}" -MAKE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" -MAKE_ENV+= GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}" -MAKE_ENV+= GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}" -MAKE_ENV+= GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" -MAKE_ENV+= GNUSTEP_HOST="${GNUSTEP_HOST}" -MAKE_ENV+= GNUSTEP_HOST_CPU="${GNUSTEP_HOST_CPU}" -MAKE_ENV+= GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}" -MAKE_ENV+= GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}" -MAKE_ENV+= GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}" -MAKE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}" -MAKE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}" -MAKE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}" - -.if defined(GNU_CONFIGURE) -CONFIGURE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}" -CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" -CONFIGURE_ENV+= GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}" -CONFIGURE_ENV+= GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}" -CONFIGURE_ENV+= GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" -CONFIGURE_ENV+= GNUSTEP_HOST="${GNUSTEP_HOST}" -CONFIGURE_ENV+= GNUSTEP_HOST_CPU="${GNUSTEP_HOST_CPU}" -CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}" -CONFIGURE_ENV+= GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}" -CONFIGURE_ENV+= GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}" -CONFIGURE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}" -CONFIGURE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}" -CONFIGURE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}" -.endif +BUILDLINK_LIBDIRS.gnustep-make= lib ${GNUSTEP_BLDIRS} +BUILDLINK_INCDIRS.gnustep-make= include ${GNUSTEP_BIDIRS} .endif # GNUSTEP_MAKE_BUILDLINK3_MK diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo index e9ad5d4553c..01cddd65127 100644 --- a/devel/gnustep-make/distinfo +++ b/devel/gnustep-make/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.7 2003/12/17 14:55:58 sketch Exp $ +$NetBSD: distinfo,v 1.8 2004/04/10 23:31:39 rh Exp $ -SHA1 (gnustep-make-1.8.0.tar.gz) = 7fcac2b059c269ebce2df4fa414658790bb9bb3a -Size (gnustep-make-1.8.0.tar.gz) = 359394 bytes +SHA1 (gnustep-make-1.9.1.tar.gz) = c71dde7f8d3fba18526d70f1effe26117a0cb1aa +Size (gnustep-make-1.9.1.tar.gz) = 370625 bytes SHA1 (patch-aa) = 4969ea2cbd61e4bc2dab109abcbbdf5177ebdd8c -SHA1 (patch-ab) = c8ac2f268ffc046817b074e050964c528d10bb58 SHA1 (patch-ac) = bdc80e22663848eab3b805d34264c567ad323160 SHA1 (patch-ad) = 7e480b05aa92340aae18cc1a6837acf87027e4dd SHA1 (patch-ae) = b7af49c45fed5fb72a7b455b533a23e78f6f20ce diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk new file mode 100644 index 00000000000..201bbf6c41d --- /dev/null +++ b/devel/gnustep-make/gnustep.mk @@ -0,0 +1,91 @@ +# $NetBSD: gnustep.mk,v 1.1 2004/04/10 23:31:39 rh Exp $ + +.if !defined(GNUSTEP_MK) +GNUSTEP_MK= #defined + +.include "../../mk/bsd.prefs.mk" + +GNUSTEP_SUBDIR= share/GNUstep +GNUSTEP_ROOT= ${PREFIX}/${GNUSTEP_SUBDIR} +GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_ROOT}/System +GNUSTEP_LOCAL_ROOT= ${GNUSTEP_ROOT}/Local +GNUSTEP_NETWORK_ROOT= ${GNUSTEP_ROOT}/Network +GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Makefiles +GNUSTEP_HOST= ${MACHINE_GNU_PLATFORM} +GNUSTEP_HOST_CPU= ${MACHINE_GNU_ARCH:S/i386/ix86/} +GNUSTEP_HOST_VENDOR= ${LOWER_VENDOR} +GNUSTEP_HOST_OS= ${LOWER_OPSYS} + +GNUSTEP_FLATTENED= yes + +GNUSTEP_USER_ROOT= ${BUILDLINK_DIR}/share/GNUstep +GNUSTEP_PATHLIST= ${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_NETWORK_ROOT}:${GNUSTEP_SYSTEM_ROOT} +GNUSTEP_PATH= ${GNUSTEP_USER_ROOT}/Tools:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_LOCAL_ROOT}/Tools:${GNUSTEP_LOCAL_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_NETWORK_ROOT}/Tools:${GNUSTEP_NETWORK_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_SYSTEM_ROOT}/Tools:${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS} +GUILE_LOAD_PATH= ${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Libraries/Guile +GNUSTEP_LDIR= Library/Libraries +GNUSTEP_IDIR= Library/Headers +GNUSTEP_LFLAGS= ${GNUSTEP_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${GNUSTEP_LOCAL_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${GNUSTEP_NETWORK_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${GNUSTEP_SYSTEM_ROOT:S/^/-L/}/${GNUSTEP_LDIR} +GNUSTEP_IFLAGS= ${GNUSTEP_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${GNUSTEP_LOCAL_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${GNUSTEP_NETWORK_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${GNUSTEP_SYSTEM_ROOT:S/^/-I/}/${GNUSTEP_IDIR} +GNUSTEP_LDIRS= ${GNUSTEP_LFLAGS:S/-L//g} +GNUSTEP_IDIRS= ${GNUSTEP_IFLAGS:S/-I//g} +GNUSTEP_BLDIRS= ${GNUSTEP_LDIRS:S/${PREFIX}\///g} +GNUSTEP_BIDIRS= ${GNUSTEP_IDIRS:S/${PREFIX}\///g} +.if empty(_USE_RPATH:M[nN][oO]) +GNUSTEP_RFLAGS= ${GNUSTEP_LFLAGS:S/-L/-Wl,${_OPSYS_RPATH_NAME}/g} +.else +GNUSTEP_RFLAGS?= +.endif +GNUSTEP_LDFLAGS= ${GNUSTEP_LFLAGS} ${GNUSTEP_RFLAGS} + +.if !defined(NO_GNUSTEP_ENV) + +PATH:= ${GNUSTEP_PATH}:${PATH} + +LDFLAGS+= ${GNUSTEP_LDFLAGS} +CPPFLAGS+= ${GNUSTEP_IFLAGS} +CFLAGS+= ${GNUSTEP_IFLAGS} + +USE_GNU_TOOLS+= make +.if defined(GNUSTEP_MAKEFILE) +MAKEFILE= ${GNUSTEP_MAKEFILE} +.else +MAKEFILE= GNUmakefile +.endif + +.if !defined(NO_CONFIGURE) +GNU_CONFIGURE= yes +.endif + +MAKE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}" +MAKE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" +MAKE_ENV+= GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}" +MAKE_ENV+= GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}" +MAKE_ENV+= GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" +MAKE_ENV+= GNUSTEP_HOST="${GNUSTEP_HOST}" +MAKE_ENV+= GNUSTEP_HOST_CPU="${GNUSTEP_HOST_CPU}" +MAKE_ENV+= GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}" +MAKE_ENV+= GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}" +MAKE_ENV+= GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}" +MAKE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}" +MAKE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}" +MAKE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}" + +.if defined(GNU_CONFIGURE) +GNU_CONFIGURE_PREFIX?= ${GNUSTEP_ROOT} +CONFIGURE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}" +CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" +CONFIGURE_ENV+= GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}" +CONFIGURE_ENV+= GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}" +CONFIGURE_ENV+= GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" +CONFIGURE_ENV+= GNUSTEP_HOST="${GNUSTEP_HOST}" +CONFIGURE_ENV+= GNUSTEP_HOST_CPU="${GNUSTEP_HOST_CPU}" +CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}" +CONFIGURE_ENV+= GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}" +CONFIGURE_ENV+= GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}" +CONFIGURE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}" +CONFIGURE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}" +CONFIGURE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}" +.endif # GNU_CONFIGURE +.endif # !NO_GNUSTEP_ENV + +.endif # !defined(GNUSTEP_MK) diff --git a/devel/gnustep-make/patches/patch-ab b/devel/gnustep-make/patches/patch-ab deleted file mode 100644 index 29eeea78076..00000000000 --- a/devel/gnustep-make/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2003/12/05 09:16:33 adam Exp $ - ---- common.make.orig 2003-09-16 05:43:06.000000000 +0200 -+++ common.make -@@ -275,12 +275,16 @@ ifeq ($(REMOVE_EMPTY_DIRS),yes) - # default - by default we put all directories in compilation commands. - GNUSTEP_HEADERS_FLAGS = \ - $(addprefix -I,$(foreach dir,$(GNUSTEP_HEADERS_DIRS),$(remove_if_empty))) -+comma:= , - GNUSTEP_LIBRARIES_FLAGS = \ -- $(addprefix -L,$(foreach dir,$(GNUSTEP_LIBRARIES_DIRS),$(remove_if_empty))) -+ $(addprefix -L,$(foreach dir,$(GNUSTEP_LIBRARIES_DIRS),$(remove_if_empty))) \ -+ $(addprefix -Wl$(comma)-R,$(foreach dir,$(GNUSTEP_LIBRARIES_DIRS),$(remove_if_empty))) - else -+comma:= , - # Default case, just add -I / -L - GNUSTEP_HEADERS_FLAGS = $(addprefix -I,$(GNUSTEP_HEADERS_DIRS)) - GNUSTEP_LIBRARIES_FLAGS = $(addprefix -L,$(GNUSTEP_LIBRARIES_DIRS)) -+ GNUSTEP_LIBRARIES_FLAGS+= $(addprefix -Wl$(comma)-R,$(GNUSTEP_LIBRARIES_DIRS)) - endif - - # |