pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/31750: lang/elk



The following reply was made to PR pkg/31750; it has been noted by GNATS.

From: Antoine Reilles <Antoine.Reilles%loria.fr@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/31750: lang/elk
Date: Sat, 15 Oct 2005 16:25:53 +0200

 --zhXaljGHf11kAtnf
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 I worked a little on updating lang/elk to 3.99.6.
 This release uses automake, autoconf and libtool, and is much more portable
 than before (it should works on alpha and other 64b machines).
 
 I also changed the was PLIST is built by using PLIST_SUBST, and convert to the
 option framework.
 Here i have a doubt: i have made two options: x11, for x11 support, and motif,
 which enables the motif support. motif implies x11, so having 
 PKG_OPTIONS.elk=x11 motif is strictly equivalent to PKG_OPTIONS.elk=motif
 should i then add x11 to the options if only motif is selected ?
 
 
 
 --zhXaljGHf11kAtnf
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="elk.diff"
 
 ? PLIST
 ? options.mk
 ? patches
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/lang/elk/Makefile,v
 retrieving revision 1.29
 diff -u -r1.29 Makefile
 --- Makefile   1 Jun 2005 18:02:58 -0000       1.29
 +++ Makefile   15 Oct 2005 14:19:50 -0000
 @@ -1,72 +1,16 @@
  # $NetBSD: Makefile,v 1.29 2005/06/01 18:02:58 jlam Exp $
  
 -DISTNAME=             elk-3.0
 -PKGNAME=              elk-3.0.3
 -PKGREVISION=  1
 +DISTNAME=             elk-3.99.6
  CATEGORIES=           lang
 -MASTER_SITES=         
http://www-rn.informatik.uni-bremen.de/software/elk/dist/
 +MASTER_SITES=         http://sam.zoy.org/elk/
  
  MAINTAINER=           tech-pkg%NetBSD.org@localhost
  HOMEPAGE=             http://sam.zoy.org/elk/
  COMMENT=              Embeddable Scheme interpreter
  
 -# ELF loading problems, LP64
 -NOT_FOR_PLATFORM=     *-*-alpha *-*-mips* *-*-sparc64
 +GNU_CONFIGURE=yes
 +USE_LIBTOOL=  yes
  
 -BUILD_TARGET=         default
 -
 -.include "../../mk/bsd.prefs.mk"
 -
 -ELK_GUI?=     none
 -BUILD_DEFS+=  ELK_GUI
 -
 -# We must strip the "-Wl," from the linker flags because they are saved
 -# by elk to be used to invoke the real "ld", which won't understand them.
 -#
 -.if ${ELK_GUI} != "none"
 -MAKE_ENV+=    X11_LDFLAGS="${X11_LDFLAGS:S/-Wl,//}"
 -.  if !empty(ELK_GUI:Mxaw)
 -.    include "../../mk/xaw.buildlink3.mk"
 -LIBXAW:=      ${LIBXAW:S/-Wl,//}
 -ELK_SUBDIRS+= lib/xlib lib/xt lib/xaw
 -PLIST_SRC+=   ${PKGDIR}/PLIST.X11
 -BUILD_DEFS+=  XAW_TYPE
 -.  endif
 -.  if !empty(ELK_GUI:Mmotif)
 -.    include "../../mk/motif.buildlink3.mk"
 -MOTIFLIB:=    ${MOTIFLIB:S/-Wl,//}
 -ELK_SUBDIRS+= lib/xm lib/xm/xt
 -PLIST_SRC+=   ${PKGDIR}/PLIST.Motif
 -.  endif
 -.endif
 -
 -PLIST_SRC+=   ${PKGDIR}/PLIST.base
 -MAKE_ENV+=    ELK_SUBDIRS="${ELK_SUBDIRS}"
 -
 -.include "../../mk/x11.buildlink3.mk"
 -
 -do-configure:
 -      ${MV} ${WRKSRC}/src/stab-elf.c ${WRKSRC}/src/stab-elf.c-dist
 -      ${CP} ${FILESDIR}/stab-elf.c ${WRKSRC}/src
 -      @case ${OBJECT_FMT} in                                          \
 -      a.out)  exetype=aout ;;                                         \
 -      ELF)    exetype=elf ;;                                          \
 -      *)      ${ECHO} "Unsupported object format: ${OBJECT_FMT}";     \
 -              exit 1 ;;                                               \
 -      esac;                                                           \
 -      ${ECHO} "Setting up links for $$exetype on ${LOWER_OPSYS}";     \
 -      ${RM} -f ${WRKSRC}/config/untested/elf-solaris-cc;              \
 -      ${LN} -s ${WRKSRC}/config/sun-sunos5-gcc                        \
 -              ${WRKSRC}/config/untested/elf-solaris-cc;               \
 -      ${RM} -f ${WRKSRC}/config/system ${WRKSRC}/config/site;         \
 -      ${LN} -s ${WRKSRC}/config/untested/$$exetype-${LOWER_OPSYS}-cc  \
 -              ${WRKSRC}/config/system;                                \
 -      for f in aout-netbsd elf-netbsd elf-solaris; do                 \
 -              ${RM} -f ${WRKSRC}/config/sites/$$f;                    \
 -              ${LN} -s ${WRKSRC}/config/sites/pkgsrc                  \
 -                      ${WRKSRC}/config/sites/$$f;                     \
 -      done;                                                           \
 -      ${LN} -s ${WRKSRC}/config/sites/$$exetype-${LOWER_OPSYS}        \
 -              ${WRKSRC}/config/site
 +.include "options.mk"
  
  .include "../../mk/bsd.pkg.mk"
 Index: buildlink3.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/lang/elk/buildlink3.mk,v
 retrieving revision 1.1
 diff -u -r1.1 buildlink3.mk
 --- buildlink3.mk      30 Mar 2005 19:44:44 -0000      1.1
 +++ buildlink3.mk      15 Oct 2005 14:19:50 -0000
 @@ -11,7 +11,7 @@
  BUILDLINK_PACKAGES+=  elk
  
  .if !empty(ELK_BUILDLINK3_MK:M+)
 -BUILDLINK_DEPENDS.elk+=       elk>=3.0.3nb1
 +BUILDLINK_DEPENDS.elk+=       elk>=3.99.6
  BUILDLINK_PKGSRCDIR.elk?=     ../../lang/elk
  .endif        # ELK_BUILDLINK3_MK
  
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/lang/elk/distinfo,v
 retrieving revision 1.5
 diff -u -r1.5 distinfo
 --- distinfo   24 Feb 2005 09:03:06 -0000      1.5
 +++ distinfo   15 Oct 2005 14:19:50 -0000
 @@ -1,29 +1,6 @@
  $NetBSD: distinfo,v 1.5 2005/02/24 09:03:06 agc Exp $
  
 -SHA1 (elk-3.0.tar.gz) = d62ae8a88e3206a578195611ace50168e6078661
 -RMD160 (elk-3.0.tar.gz) = 9c4b46c51109242bf591302da46b17c2bca2046e
 -Size (elk-3.0.tar.gz) = 762484 bytes
 -SHA1 (patch-aa) = 109e70fb6ba64b116c3b472b8586bf9c89c29348
 -SHA1 (patch-ab) = 62cac0487bf259aa481fbc23fd34b168475062fe
 -SHA1 (patch-ac) = 34c00b8d706834bc5ffd4dca21049b56d2ae35bd
 -SHA1 (patch-ad) = 421d3a738fa78db6c139331ca0d57987f94266bd
 -SHA1 (patch-ae) = d1514bc0391f59adbd2591b361348a2baee118f4
 -SHA1 (patch-af) = e3b2da075f099e7f3abff82afc255018c21639dd
 -SHA1 (patch-ag) = 3aebf5f386e67c2a87cb549a6c6a7d4f332db1fe
 -SHA1 (patch-ah) = 901fbd12b2d103cf1efe965d82c03b6790aa0282
 -SHA1 (patch-ai) = 0a3569151de7d78706b5c5112bc260e880c25056
 -SHA1 (patch-aj) = fc3294f5198caa7a91aafffaed9ec1b2e55c7696
 -SHA1 (patch-ak) = 59fec6f3b2d00c75d3954ccb20237dd179ac0f81
 -SHA1 (patch-al) = c17f9c1760bca6928f517bc9d2c64d1eba5b5756
 -SHA1 (patch-am) = 1950af890ce6fc3acf2340630199dd8c375f9b0e
 -SHA1 (patch-an) = a8eef0e5a1315cd5a0e3a4ce2b7ea80fd4e62db5
 -SHA1 (patch-ao) = af0d66514fb2673388658d74246d9e83c174118e
 -SHA1 (patch-ap) = 4c76aa4b44b2a3d2e2bcbed3c6d4d639c99e51a4
 -SHA1 (patch-aq) = 0d10cc53d0284ce56bb6929579962c7b29afcbe6
 -SHA1 (patch-ar) = a145d0b1aba3d201bda60b9c82eff8c642c5919f
 -SHA1 (patch-as) = 69b51d90a4e34cd7b1c3a2a290343420ffee51eb
 -SHA1 (patch-at) = 133495a41196a4017c232cf7d1de2c8283f36968
 -SHA1 (patch-au) = 6bba0055e67418cdb3a0da1c9754cad8de4bb03d
 -SHA1 (patch-av) = f764b4ca96f8c837ad1a392137e96b90d8102cd1
 -SHA1 (patch-aw) = 3fa21da8be16407ece0cfae3f6510b7ee8052e6c
 -SHA1 (patch-ax) = 3e7e0c0a4cff6b33acd818579f743bf8f6665dec
 +SHA1 (elk-3.99.6.tar.gz) = 10fb17ab7e06a34ad3067be323482091fa79d398
 +RMD160 (elk-3.99.6.tar.gz) = f7e7861bae4e996b4eac2f6d3c004f5631b73e38
 +Size (elk-3.99.6.tar.gz) = 847811 bytes
 +SHA1 (patch-aa) = 8eafcd683ad0a87003d3727a6a37e321ef92b0a4
 --- /dev/null  2005-10-15 16:12:52.000000000 +0200
 +++ options.mk 2005-10-15 16:11:27.000000000 +0200
 @@ -0,0 +1,30 @@
 +# $NetBSD$
 +
 +# Global and legacy options
 +
 +PKG_OPTIONS_VAR=      PKG_OPTIONS.elk
 +PKG_SUPPORTED_OPTIONS= x11 motif
 +PKG_SUGGESTED_OPTIONS=
 +
 +.include "../../mk/bsd.options.mk"
 +
 +###
 +### x11 support
 +###
 +.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mmotif)
 +.  include "../../mk/x11.buildlink3.mk"
 +PLIST_SUBST+= WITHX11=""
 +.  if !empty(PKG_OPTIONS:Mx11)
 +.    include "../../mk/xaw.buildlink3.mk"
 +.  endif
 +.  if !empty(PKG_OPTIONS:Mmotif)
 +.  include "../../mk/motif.buildlink3.mk"
 +PLIST_SUBST+= WITHMOTIF=""
 +.  else
 +PLIST_SUBST+= WITHMOTIF="@comment "
 +.  endif
 +.else
 +CONFIGURE_ARGS+=      --without-x
 +PLIST_SUBST+= WITHMOTIF="@comment "
 +PLIST_SUBST+= WITHX11="@comment "
 +.endif
 --- /dev/null  2005-10-15 16:12:52.000000000 +0200
 +++ PLIST      2005-10-15 16:05:20.000000000 +0200
 @@ -0,0 +1,160 @@
 +@comment $NetBSD$
 +bin/elk
 +bin/scheme-elk
 +include/elk/compat.h
 +include/elk/cstring.h
 +include/elk/exception.h
 +include/elk/extensions/unix.h
 +include/elk/extensions/xlib.h
 +include/elk/extensions/xt.h
 +include/elk/extern.h
 +include/elk/funcproto.h
 +include/elk/gc.h
 +include/elk/intern.h
 +include/elk/kernel.h
 +include/elk/misc.h
 +include/elk/object.h
 +include/elk/param.h
 +include/elk/scheme.h
 +include/elk/site.h
 +include/elk/stkmem.h
 +include/elk/type.h
 +lib/elk/bitstring.la
 +lib/elk/debug.la
 +lib/elk/elk-eval.la
 +lib/elk/hack.la
 +lib/elk/newhandler.la
 +lib/elk/record.la
 +lib/elk/regexp.la
 +lib/elk/struct.la
 +lib/elk/unix.la
 +${WITHMOTIF}lib/elk/motif.la
 +${WITHX11}lib/elk/xaw.la
 +${WITHX11}lib/elk/xlib.la
 +lib/libelk.la
 +${WITHX11}lib/libelk-xlib.la
 +${WITHX11}lib/libelk-xt.la
 +man/man1/elk.1
 +man/man1/scheme-elk.1
 +share/doc/elk/examples/c++/class.cpp
 +share/doc/elk/examples/c++/constructor.cpp
 +share/doc/elk/examples/motif/drawing-area.scm
 +share/doc/elk/examples/motif/list.scm
 +share/doc/elk/examples/motif/main-window.scm
 +share/doc/elk/examples/motif/menu-stuff.scm
 +share/doc/elk/examples/motif/message-dialog.scm
 +share/doc/elk/examples/motif/option-menu.scm
 +share/doc/elk/examples/motif/popup-menu.scm
 +share/doc/elk/examples/motif/pulldown-menu.scm
 +share/doc/elk/examples/motif/radio-stuff.scm
 +share/doc/elk/examples/motif/radio.scm
 +share/doc/elk/examples/motif/scroll-bar.scm
 +share/doc/elk/examples/motif/selection-box.scm
 +share/doc/elk/examples/motif/vcr.scm
 +share/doc/elk/examples/regexp/match.scm
 +share/doc/elk/examples/scheme/Y.scm
 +share/doc/elk/examples/scheme/acker.scm
 +share/doc/elk/examples/scheme/billiard.scm
 +share/doc/elk/examples/scheme/cc.scm
 +share/doc/elk/examples/scheme/cell.scm
 +share/doc/elk/examples/scheme/co.scm
 +share/doc/elk/examples/scheme/compile.scm
 +share/doc/elk/examples/scheme/cps.scm
 +share/doc/elk/examples/scheme/dynamic.scm
 +share/doc/elk/examples/scheme/fib.scm
 +share/doc/elk/examples/scheme/fix.scm
 +share/doc/elk/examples/scheme/flame.scm
 +share/doc/elk/examples/scheme/hanoi.scm
 +share/doc/elk/examples/scheme/kons.scm
 +share/doc/elk/examples/scheme/meissel.scm
 +share/doc/elk/examples/scheme/mondo.scm
 +share/doc/elk/examples/scheme/perm.scm
 +share/doc/elk/examples/scheme/prim.scm
 +share/doc/elk/examples/scheme/ramanujan.scm
 +share/doc/elk/examples/scheme/rungekutta.scm
 +share/doc/elk/examples/scheme/sqrt.scm
 +share/doc/elk/examples/scheme/unify.scm
 +share/doc/elk/examples/scheme/work.scm
 +share/doc/elk/examples/tests/README
 +share/doc/elk/examples/tests/r4rstest.scm
 +share/doc/elk/examples/unix/calc.scm
 +share/doc/elk/examples/unix/copy.scm
 +share/doc/elk/examples/unix/lock.scm
 +share/doc/elk/examples/unix/ls.scm
 +share/doc/elk/examples/unix/pipsiz.scm
 +share/doc/elk/examples/unix/timeout.scm
 +share/doc/elk/examples/xaw/accel.scm
 +share/doc/elk/examples/xaw/clickcount.scm
 +share/doc/elk/examples/xaw/dialog.scm
 +share/doc/elk/examples/xaw/grip.scm
 +share/doc/elk/examples/xaw/list.scm
 +share/doc/elk/examples/xaw/paned.scm
 +share/doc/elk/examples/xaw/panner.scm
 +share/doc/elk/examples/xaw/popup.scm
 +share/doc/elk/examples/xaw/porthole.scm
 +share/doc/elk/examples/xaw/pulldown.scm
 +share/doc/elk/examples/xaw/scrollbar.scm
 +share/doc/elk/examples/xaw/scrollbox.scm
 +share/doc/elk/examples/xaw/stripchart.scm
 +share/doc/elk/examples/xaw/text.scm
 +share/doc/elk/examples/xaw/tree.scm
 +share/doc/elk/examples/xaw/viewport.scm
 +share/doc/elk/examples/xlib/hello.scm
 +share/doc/elk/examples/xlib/lines.scm
 +share/doc/elk/examples/xlib/map-all.scm
 +share/doc/elk/examples/xlib/picture.scm
 +share/doc/elk/examples/xlib/poly.scm
 +share/doc/elk/examples/xlib/properties.scm
 +share/doc/elk/examples/xlib/track.scm
 +share/doc/elk/examples/xlib/useful.scm
 +share/doc/elk/examples/xlib/wm-delete.scm
 +share/doc/elk/ps/bitstring.ps
 +share/doc/elk/ps/cprog.ps
 +share/doc/elk/ps/elk.ps
 +share/doc/elk/ps/kernel.ps
 +share/doc/elk/ps/oops.ps
 +share/doc/elk/ps/record.ps
 +share/doc/elk/ps/regexp.ps
 +share/doc/elk/ps/unix.ps
 +share/doc/elk/ps/usenix.ps
 +share/doc/elk/ps/xlib.ps
 +share/doc/elk/ps/xt.ps
 +share/elk/apropos.scm
 +share/elk/bitstring.scm
 +share/elk/cscheme.scm
 +share/elk/debug.scm
 +share/elk/describe.scm
 +share/elk/initscheme.scm
 +share/elk/oops.scm
 +share/elk/parse.scm
 +share/elk/pp.scm
 +share/elk/qsort.scm
 +share/elk/record.scm
 +share/elk/recordutil.scm
 +share/elk/regexp.scm
 +share/elk/safe-env.scm
 +share/elk/setf.scm
 +share/elk/slib.scm
 +share/elk/struct.scm
 +share/elk/toplevel.scm
 +share/elk/trace.scm
 +share/elk/unix.scm
 +${WITHX11}share/elk/xaw.scm
 +${WITHX11}share/elk/xlib.scm
 +${WITHX11}share/elk/xwidgets.scm
 +${WITHMOTIF}share/elk/motif.scm
 +@dirrm share/elk
 +@dirrm share/doc/elk/ps
 +@dirrm share/doc/elk/examples/xlib
 +@dirrm share/doc/elk/examples/xaw
 +@dirrm share/doc/elk/examples/unix
 +@dirrm share/doc/elk/examples/tests
 +@dirrm share/doc/elk/examples/scheme
 +@dirrm share/doc/elk/examples/regexp
 +@dirrm share/doc/elk/examples/motif
 +@dirrm share/doc/elk/examples/c++
 +@dirrm share/doc/elk/examples
 +@dirrm share/doc/elk
 +@dirrm lib/elk
 +@dirrm include/elk/extensions
 +@dirrm include/elk
 --- /dev/null  2005-10-15 16:12:52.000000000 +0200
 +++ patches/patch-aa   2005-10-15 14:47:53.000000000 +0200
 @@ -0,0 +1,15 @@
 +$NetBSD$
 +
 +--- configure.orig    2003-12-05 13:51:16.000000000 +0100
 ++++ configure
 +@@ -25330,8 +25330,8 @@ _ACEOF
 + # The directory where all files are installed by running "make install". We
 + # cannot use AC_DEFINE_UNQUOTED here because ${prefix} is not set until the
 + # end of the configure script. Thanks to Phillip Rulon for spotting that.
 +-CPPFLAGS="${CPPFLAGS} -DSCM_DIR=\\\"\$(prefix)/share/elk\\\""
 +-CPPFLAGS="${CPPFLAGS} -DLIB_DIR=\\\"\$(prefix)/lib/elk\\\""
 ++CPPFLAGS="${CPPFLAGS} -DSCM_DIR=\"\\\"\$(prefix)/share/elk\\\"\""
 ++CPPFLAGS="${CPPFLAGS} -DLIB_DIR=\"\\\"\$(prefix)/lib/elk\\\"\""
 + 
 + #define FIND_AOUT defined(USE_LD) || defined(CAN_DUMP) || 
defined(INIT_OBJECTS)
 + 
 
 --zhXaljGHf11kAtnf--
 



Home | Main Index | Thread Index | Old Index