pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/gnustep-make Changes 2.0.2:

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c654f47a5813
branches:  trunk
changeset: 535667:c654f47a5813
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun Nov 25 14:42:01 2007 +0000

description:
Changes 2.0.2:
Update license to GPLv3. Bug fixes.

Changes 2.0.1:
Bug fixes in filesystem layout and framework installation.

diffstat:

 devel/gnustep-make/Makefile         |  50 ++++++++++++++++++++++++++----------
 devel/gnustep-make/PLIST            |  17 +++++++-----
 devel/gnustep-make/buildlink3.mk    |   6 ++--
 devel/gnustep-make/distinfo         |  12 ++++----
 devel/gnustep-make/gnustep.mk       |  16 +++++-----
 devel/gnustep-make/patches/patch-ad |  14 +++++-----
 devel/gnustep-make/patches/patch-ae |  21 ++++-----------
 7 files changed, 76 insertions(+), 60 deletions(-)

diffs (286 lines):

diff -r ee918b70d21f -r c654f47a5813 devel/gnustep-make/Makefile
--- a/devel/gnustep-make/Makefile       Sun Nov 25 13:19:04 2007 +0000
+++ b/devel/gnustep-make/Makefile       Sun Nov 25 14:42:01 2007 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2007/06/28 03:00:39 minskim Exp $
+# $NetBSD: Makefile,v 1.38 2007/11/25 14:42:01 adam Exp $
 
-DISTNAME=      gnustep-make-1.13.0
-PKGREVISION=   1
+DISTNAME=      gnustep-make-2.0.2
 CATEGORIES=    devel gnustep
 MASTER_SITES=  ${MASTER_SITE_GNUSTEP:=core/}
 
@@ -11,9 +10,8 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-USE_LANGUAGES= objc
-USE_TOOLS+=    csh
-
+USE_LANGUAGES=         objc
+USE_TOOLS+=            csh
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
 CONFIGURE_ARGS+=       --disable-importing-config-file
@@ -42,13 +40,37 @@
 SUBST_FILES.target=    target.make
 SUBST_SED.target+=     -e 's|/usr/pkg|${LOCALBASE}|g'
 
-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
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/GNUstep/Network
+INSTALLATION_DIRS+=    share/GNUstep/Local/Applications
+INSTALLATION_DIRS+=    share/GNUstep/Local/Library
+INSTALLATION_DIRS+=    share/GNUstep/Local/Library/Bundles
+INSTALLATION_DIRS+=    share/GNUstep/Local/Library/Frameworks
+INSTALLATION_DIRS+=    share/GNUstep/Local/Library/Headers
+INSTALLATION_DIRS+=    share/GNUstep/Local/Library/Libraries
+INSTALLATION_DIRS+=    share/GNUstep/Network
+INSTALLATION_DIRS+=    share/GNUstep/System/Applications
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/ApplicationSupport
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Bundles
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/ColorPickers
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Colors
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/DocTemplates
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Documentation/Developer
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Documentation/User
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Documentation/info
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Documentation/man
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Fonts
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Frameworks
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Headers
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Images
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/KeyBindings
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Libraries/Java
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Libraries/Resources
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Makefiles/${GNUSTEP_ARCH}
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Makefiles/Additional
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Makefiles/Auxiliary
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/PostScript
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Services
+INSTALLATION_DIRS+=    share/GNUstep/System/Library/Sounds
+INSTALLATION_DIRS+=    share/GNUstep/System/Tools/Java
+INSTALLATION_DIRS+=    share/GNUstep/System/Tools/Resources
 
 .include "../../mk/bsd.pkg.mk"
diff -r ee918b70d21f -r c654f47a5813 devel/gnustep-make/PLIST
--- a/devel/gnustep-make/PLIST  Sun Nov 25 13:19:04 2007 +0000
+++ b/devel/gnustep-make/PLIST  Sun Nov 25 14:42:01 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/07/28 01:50:58 minskim Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/11/25 14:42:01 adam Exp $
 share/GNUstep/System/Library/Makefiles/GNUstep-reset.sh
 share/GNUstep/System/Library/Makefiles/GNUstep.csh
 share/GNUstep/System/Library/Makefiles/GNUstep.sh
@@ -59,6 +59,7 @@
 share/GNUstep/System/Library/Makefiles/Master/test-tool.make
 share/GNUstep/System/Library/Makefiles/Master/tool.make
 share/GNUstep/System/Library/Makefiles/aggregate.make
+share/GNUstep/System/Library/Makefiles/app-wrapper.template
 share/GNUstep/System/Library/Makefiles/application.make
 share/GNUstep/System/Library/Makefiles/bundle.make
 share/GNUstep/System/Library/Makefiles/clean_cpu.sh
@@ -66,15 +67,21 @@
 share/GNUstep/System/Library/Makefiles/clean_vendor.sh
 share/GNUstep/System/Library/Makefiles/clibrary.make
 share/GNUstep/System/Library/Makefiles/common.make
+share/GNUstep/System/Library/Makefiles/config-noarch.make
 share/GNUstep/System/Library/Makefiles/config.guess
 share/GNUstep/System/Library/Makefiles/config.make
 share/GNUstep/System/Library/Makefiles/config.sub
 share/GNUstep/System/Library/Makefiles/cpu.sh
 share/GNUstep/System/Library/Makefiles/ctool.make
 share/GNUstep/System/Library/Makefiles/documentation.make
+share/GNUstep/System/Library/Makefiles/empty.make
 share/GNUstep/System/Library/Makefiles/executable.template
+share/GNUstep/System/Library/Makefiles/filesystem.csh
+share/GNUstep/System/Library/Makefiles/filesystem.make
+share/GNUstep/System/Library/Makefiles/filesystem.sh
 share/GNUstep/System/Library/Makefiles/fixpath.sh
 share/GNUstep/System/Library/Makefiles/framework.make
+share/GNUstep/System/Library/Makefiles/gnustep-make-help
 share/GNUstep/System/Library/Makefiles/gswapp.make
 share/GNUstep/System/Library/Makefiles/gswbundle.make
 share/GNUstep/System/Library/Makefiles/install-sh
@@ -93,12 +100,11 @@
 share/GNUstep/System/Library/Makefiles/objc.make
 share/GNUstep/System/Library/Makefiles/os.sh
 share/GNUstep/System/Library/Makefiles/palette.make
+share/GNUstep/System/Library/Makefiles/print_unique_pathlist.sh
 share/GNUstep/System/Library/Makefiles/relative_path.sh
 share/GNUstep/System/Library/Makefiles/resource-set.make
 share/GNUstep/System/Library/Makefiles/rules.make
 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
@@ -108,16 +114,13 @@
 share/GNUstep/System/Library/Makefiles/test-library.make
 share/GNUstep/System/Library/Makefiles/test-tool.make
 share/GNUstep/System/Library/Makefiles/tool.make
-share/GNUstep/System/Library/Makefiles/transform_paths.sh
 share/GNUstep/System/Library/Makefiles/vendor.sh
-share/GNUstep/System/Library/Makefiles/which_lib
 share/GNUstep/System/Tools/debugapp
+share/GNUstep/System/Tools/gnustep-config
 share/GNUstep/System/Tools/openapp
 share/GNUstep/System/Tools/opentool
-share/GNUstep/System/share/config.site
 share/examples/GNUstep/GNUstep.conf
 @dirrm share/examples/GNUstep
-@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
diff -r ee918b70d21f -r c654f47a5813 devel/gnustep-make/buildlink3.mk
--- a/devel/gnustep-make/buildlink3.mk  Sun Nov 25 13:19:04 2007 +0000
+++ b/devel/gnustep-make/buildlink3.mk  Sun Nov 25 14:42:01 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/11/25 14:42:02 adam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GNUSTEP_MAKE_BUILDLINK3_MK:=   ${GNUSTEP_MAKE_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@
 BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-make
 
 .if !empty(GNUSTEP_MAKE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gnustep-make+=   gnustep-make>=1.9.1
-BUILDLINK_ABI_DEPENDS.gnustep-make?=   gnustep-make>=1.11.2nb1
+BUILDLINK_API_DEPENDS.gnustep-make+=   gnustep-make>=2.0.2
+BUILDLINK_ABI_DEPENDS.gnustep-make?=   gnustep-make>=2.0.2
 BUILDLINK_PKGSRCDIR.gnustep-make?=     ../../devel/gnustep-make
 
 .include "../../devel/gnustep-make/gnustep.mk"
diff -r ee918b70d21f -r c654f47a5813 devel/gnustep-make/distinfo
--- a/devel/gnustep-make/distinfo       Sun Nov 25 13:19:04 2007 +0000
+++ b/devel/gnustep-make/distinfo       Sun Nov 25 14:42:01 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2006/08/30 14:53:28 adam Exp $
+$NetBSD: distinfo,v 1.20 2007/11/25 14:42:02 adam Exp $
 
-SHA1 (gnustep-make-1.13.0.tar.gz) = 91f0494d58233e59254c365b338bca1bd684bea6
-RMD160 (gnustep-make-1.13.0.tar.gz) = b1d619d7c677463bf1a4adae82a412ad95157dc2
-Size (gnustep-make-1.13.0.tar.gz) = 400157 bytes
+SHA1 (gnustep-make-2.0.2.tar.gz) = 102e36485d4582832d87ea53e0963f6553aaf7d2
+RMD160 (gnustep-make-2.0.2.tar.gz) = bd5e3aefdaa98729a18954102500783e23c0a48a
+Size (gnustep-make-2.0.2.tar.gz) = 449260 bytes
 SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
-SHA1 (patch-ad) = fa8dd2528659f9247dcade96bfc449f064a6c747
-SHA1 (patch-ae) = 37bbb2561a1079d058df8c17107756d4ee7b0f07
+SHA1 (patch-ad) = 263c887b63a7d3d51e4626730d210d1c5c45f071
+SHA1 (patch-ae) = 882a726126ef25fb06f65eab5a3e752b9328adcb
diff -r ee918b70d21f -r c654f47a5813 devel/gnustep-make/gnustep.mk
--- a/devel/gnustep-make/gnustep.mk     Sun Nov 25 13:19:04 2007 +0000
+++ b/devel/gnustep-make/gnustep.mk     Sun Nov 25 14:42:01 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: gnustep.mk,v 1.7 2006/09/24 16:01:51 joerg Exp $
+#      $NetBSD: gnustep.mk,v 1.8 2007/11/25 14:42:02 adam Exp $
 
 .if !defined(GNUSTEP_MK)
 GNUSTEP_MK=            #defined
@@ -46,15 +46,15 @@
 CFLAGS+=       ${GNUSTEP_IFLAGS}
 
 USE_TOOLS+=    gmake
-.if defined(GNUSTEP_MAKEFILE)
+.  if defined(GNUSTEP_MAKEFILE)
 MAKE_FILE=     ${GNUSTEP_MAKEFILE}
-.else
+.  else
 MAKE_FILE=     GNUmakefile
-.endif
+.  endif
 
-.if !defined(NO_CONFIGURE) && !defined(HAS_CONFIGURE)
+.  if !defined(NO_CONFIGURE) && !defined(HAS_CONFIGURE)
 GNU_CONFIGURE= yes
-.endif
+.  endif
 
 MAKE_ENV+=     GNUSTEP_ROOT=${GNUSTEP_ROOT:Q}
 MAKE_ENV+=     GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q}
@@ -70,7 +70,7 @@
 MAKE_ENV+=     GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
 MAKE_ENV+=     GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q}
 
-.if defined(GNU_CONFIGURE) || defined(HAS_CONFIGURE)
+.  if defined(GNU_CONFIGURE) || defined(HAS_CONFIGURE)
 GNU_CONFIGURE_PREFIX?= ${GNUSTEP_ROOT}
 CONFIGURE_ENV+=        GNUSTEP_ROOT=${GNUSTEP_ROOT:Q}
 CONFIGURE_ENV+=        GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q}
@@ -85,7 +85,7 @@
 CONFIGURE_ENV+=        GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
 CONFIGURE_ENV+=        GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
 CONFIGURE_ENV+=        GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q}
-.endif # GNU_CONFIGURE
+.  endif       # GNU_CONFIGURE
 .endif # !NO_GNUSTEP_ENV
 
 .endif # !defined(GNUSTEP_MK)
diff -r ee918b70d21f -r c654f47a5813 devel/gnustep-make/patches/patch-ad
--- a/devel/gnustep-make/patches/patch-ad       Sun Nov 25 13:19:04 2007 +0000
+++ b/devel/gnustep-make/patches/patch-ad       Sun Nov 25 14:42:01 2007 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.5 2006/08/30 14:53:28 adam Exp $
+$NetBSD: patch-ad,v 1.6 2007/11/25 14:42:02 adam Exp $
 
---- configure.orig     2006-07-29 16:52:03.000000000 +0200
+--- configure.orig     2007-05-25 15:12:35.000000000 +0200
 +++ configure
-@@ -6084,7 +6084,7 @@ echo $ECHO_N "checking if the compiler s
- 
+@@ -4716,7 +4716,7 @@ echo $ECHO_N "checking if the compiler s
  # What we want to do: set AUTO_DEPENDENCIES to yes if gcc => 3.x
  
+ AUTO_DEPENDENCIES=""
 -if test ! ${GCC} = "yes" ; then
 +if test "X${GCC}" != "Xyes" ; then
-   AUTO_DEPENDENCIES=""
-   { echo "$as_me:$LINENO: result: no: it's not gcc" >&5
- echo "${ECHO_T}no: it's not gcc" >&6; }
+   echo "$as_me:$LINENO: result: no: it's not gcc" >&5
+ echo "${ECHO_T}no: it's not gcc" >&6
+ else
diff -r ee918b70d21f -r c654f47a5813 devel/gnustep-make/patches/patch-ae
--- a/devel/gnustep-make/patches/patch-ae       Sun Nov 25 13:19:04 2007 +0000
+++ b/devel/gnustep-make/patches/patch-ae       Sun Nov 25 14:42:01 2007 +0000
@@ -1,17 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2006/08/30 14:53:28 adam Exp $
+$NetBSD: patch-ae,v 1.6 2007/11/25 14:42:02 adam Exp $
 
---- GNUmakefile.in.orig        2006-07-05 19:35:10.000000000 +0200
+--- GNUmakefile.in.orig        2007-03-08 18:15:05.000000000 +0100
 +++ GNUmakefile.in
-@@ -115,7 +115,7 @@ all: generated-files which_lib$(EXEEXT)
- # used. (I mean: 'cd core/make; cd ..; mkdir make-build; cd
- # make-build; ../make/configure --disable-import; make;' must work)
- which_lib$(EXEEXT): which_lib.c config.h
--      $(CC) @CFLAGS@ -Wall -I. -o $@ $<
-+      $(CC) @CFLAGS@ -I. -o $@ $<
- 
- ifeq ($(messages),yes)
-   EC = 
-@@ -144,9 +144,9 @@ install: all @GNUSTEP_MOVE_OBSOLETE@
+@@ -133,9 +133,9 @@ install: generated-files
                $(makedir)/Instance \
                $(makedir)/Instance/Shared \
                $(makedir)/Instance/Documentation)
@@ -21,6 +12,6 @@
 +      $(EC)(echo "Installing GNUstep configuration file"; \
 +       $(srcdir)/mkinstalldirs "${PREFIX}/share/examples/GNUstep"; \
 +       $(INSTALL_DATA) GNUstep.conf "${PREFIX}/share/examples/GNUstep")
-       -$(EC) rm -f "$(GNUSTEP_SYSTEM_ROOT)/Makefiles"
-        $(EC)(echo "Installing gnustep-make support software"; \
-          $(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) \
+        $(EC)(echo "Installing gnustep-make support software")
+        $(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
+               clean_cpu.sh clean_os.sh \
Home | Main Index | Thread Index | Old Index