pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/sather Remove info files entries from PLIST.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0bd899f38e8d
branches:  trunk
changeset: 470214:0bd899f38e8d
user:      seb <seb%pkgsrc.org@localhost>
date:      Sun Mar 07 09:29:04 2004 +0000

description:
Remove info files entries from PLIST.
While here replace ad hoc substing with subst.mk framework.
Don't install manpages twice.
Fix missing PLIST entries.

Bump PKGREVISION.

diffstat:

 lang/sather/Makefile |  68 ++++++++++++++++++++++++++-------------------------
 lang/sather/PLIST    |  51 ++++++++++++++++++++++++++++----------
 2 files changed, 72 insertions(+), 47 deletions(-)

diffs (300 lines):

diff -r 6145d2f9a005 -r 0bd899f38e8d lang/sather/Makefile
--- a/lang/sather/Makefile      Sun Mar 07 08:23:13 2004 +0000
+++ b/lang/sather/Makefile      Sun Mar 07 09:29:04 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/01/27 00:53:11 heinz Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/07 09:29:04 seb Exp $
 
 DISTNAME=              sather-1.2.1
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_GNU:=sather/}
 
@@ -21,35 +21,34 @@
 
 REPLACE_PERL=          Browser/Web/ps2gif
 
-do-configure:
-       for f in                                                                \
-               ${WRKSRC}/Boot/sacomp.code/Makefile                             \
-               ${WRKSRC}/Library/System/unix.sa                                \
-               ${WRKSRC}/System/Common/CONFIG.proto                            \
-               ${WRKSRC}/System/Platforms/netbsd/CONFIG                        \
-               ${WRKSRC}/System/Platforms/X/Platform.module                    \
-               ${WRKSRC}/debian/bin-wrapper                                    \
-               ${WRKSRC}/Browser/Web/convert-1.1                               \
-               ${WRKSRC}/Browser/Web/gen_html_class_index                      \
-               ${WRKSRC}/Browser/Web/gen_html_sa_files                         \
-               ${WRKSRC}/Browser/Web/gen_html_shortflat                        \
-               ${WRKSRC}/Browser/Web/gen_html_top_level                        \
-               ${WRKSRC}/Browser/Web/gen_mml_sa_files                          \
-               ${WRKSRC}/Browser/Web/gen_mml_shortflat                         \
-               ${WRKSRC}/Browser/Web/graph2dot;                                \
-       do                                                                      \
-               ${SED}  -e 's:@CC@:${CC}:g'                                     \
-                       -e 's:@CFLAGS@:${CFLAGS}:g'                             \
-                       -e 's:@GMAKE@:${GMAKE}:g'                               \
-                       -e 's:@PREFIX@:${PREFIX}:g'                             \
-                       -e 's:@X11BASE@:${X11BASE}:g'                           \
-                       -e 's:@GC_PREFIX@:${BUILDLINK_PREFIX.boehm-gc}:g'       \
-                       -e 's:@TCL_PREFIX@:${BUILDLINK_PREFIX.tcl}:g'           \
-                       -e 's:@TK_PREFIX@:${BUILDLINK_PREFIX.tk}:g'             \
-                       -e 's:@_OPSYS_RPATH_NAME@:${_OPSYS_RPATH_NAME}:g'       \
-                       $$f > $$f.tmp;                                          \
-               ${MV} -f $$f.tmp $$f;                                           \
-       done
+SUBST_CLASSES+=                sather-configure
+SUBST_STAGE.sather-configure=  configure
+SUBST_MESSAGE.sather-configure=        "Configuring sources"
+SUBST_FILES.sather-configure=                  \
+       Boot/sacomp.code/Makefile               \
+       Library/System/unix.sa                  \
+       System/Common/CONFIG.proto              \
+       System/Platforms/netbsd/CONFIG          \
+       System/Platforms/X/Platform.module      \
+       debian/bin-wrapper                      \
+       Browser/Web/convert-1.1                 \
+       Browser/Web/gen_html_class_index        \
+       Browser/Web/gen_html_sa_files           \
+       Browser/Web/gen_html_shortflat          \
+       Browser/Web/gen_html_top_level          \
+       Browser/Web/gen_mml_sa_files            \
+       Browser/Web/gen_mml_shortflat           \
+       Browser/Web/graph2dot
+SUBST_SED.sather-configure=                                    \
+       -e 's:@CC@:${CC}:g'                                     \
+       -e 's:@CFLAGS@:${CFLAGS}:g'                             \
+       -e 's:@GMAKE@:${GMAKE}:g'                               \
+       -e 's:@PREFIX@:${PREFIX}:g'                             \
+       -e 's:@X11BASE@:${X11BASE}:g'                           \
+       -e 's:@GC_PREFIX@:${BUILDLINK_PREFIX.boehm-gc}:g'       \
+       -e 's:@TCL_PREFIX@:${BUILDLINK_PREFIX.tcl}:g'           \
+       -e 's:@TK_PREFIX@:${BUILDLINK_PREFIX.tk}:g'             \
+       -e 's:@_OPSYS_RPATH_NAME@:${_OPSYS_RPATH_NAME}:g'
 
 post-build:
        cd ${WRKSRC}/Emacs; ${MAKEINFO} sather.texinfo;                 \
@@ -68,7 +67,9 @@
        cd ${PREFIX}/bin;                                               \
                 ${LN} -sf ../lib/sather/Bin/bin-wrapper sacomp;        \
                 ${LN} -sf ../lib/sather/Bin/bin-wrapper sabrowse;      \
-       cd ${WRKSRC} && ${PAX} -rw Library System/FORBID System/Debug   \
+       cd ${WRKSRC} && ${PAX} -s ',.*\.sav,,' -rw Library              \
+               System/FORBID                                           \
+               System/Debug                                            \
                System/Common/*.c System/Common/*.h                     \
                System/Common/*.module System/Common/CONFIG             \
                System/Platforms/f77 System/Platforms/netbsd            \
@@ -81,7 +82,8 @@
                -o -name \*.orig -print | ${XARGS} ${RM} -f
        ${INSTALL_DATA} ${WRKSRC}/Emacs/*.info* ${PREFIX}/info
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sather
-       cd ${WRKSRC}/Doc && ${PAX} -rw . ${PREFIX}/share/doc/sather
+       cd ${WRKSRC}/Doc && ${PAX} -rw -s ',.*/man.*,,' .               \
+               ${PREFIX}/share/doc/sather
        ${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sacomp.1 ${PREFIX}/man/man1
        ${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/sabrowse.1 ${PREFIX}/man/man1
        ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
diff -r 6145d2f9a005 -r 0bd899f38e8d lang/sather/PLIST
--- a/lang/sather/PLIST Sun Mar 07 08:23:13 2004 +0000
+++ b/lang/sather/PLIST Sun Mar 07 09:29:04 2004 +0000
@@ -1,11 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2003/07/06 16:27:42 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/03/07 09:29:04 seb Exp $
 bin/sabrowse
 bin/sacomp
-info/sather.info
-info/sather.info-1
-info/sather.info-2
-info/sather-mode.info
-info/sather-tutorial.info
 lib/sather/Bin/PP
 lib/sather/Bin/bin-wrapper
 lib/sather/Bin/gen_html
@@ -91,28 +86,37 @@
 lib/sather/Browser/browser.module
 lib/sather/Browser/gen_lib
 lib/sather/Browser/test.sa
+lib/sather/Library/Base/Base.config
 lib/sather/Library/Base/Base.module
 lib/sather/Library/Base/abstract.sa
+lib/sather/Library/Base/aref.config
 lib/sather/Library/Base/aref.sa
 lib/sather/Library/Base/aref_test.sa
+lib/sather/Library/Base/aval.config
 lib/sather/Library/Base/aval.sa
+lib/sather/Library/Base/bool.config
 lib/sather/Library/Base/bool.sa
 lib/sather/Library/Base/bool_test.sa
+lib/sather/Library/Base/char.config
 lib/sather/Library/Base/char.sa
 lib/sather/Library/Base/char_test.sa
 lib/sather/Library/Base/compare.sa
 lib/sather/Library/Base/elt_alg.sa
+lib/sather/Library/Base/flt.config
 lib/sather/Library/Base/flt.sa
 lib/sather/Library/Base/flt_dummy.sa
 lib/sather/Library/Base/flt_other.sa
+lib/sather/Library/Base/fltd.config
 lib/sather/Library/Base/fltd.sa
 lib/sather/Library/Base/fltd_test.sa
+lib/sather/Library/Base/int.config
 lib/sather/Library/Base/int.sa
 lib/sather/Library/Base/int_test.sa
 lib/sather/Library/Base/math_test.sa
 lib/sather/Library/Base/misc.sa
 lib/sather/Library/Base/number.sa
 lib/sather/Library/Base/succ_stream.sa
+lib/sather/Library/Containers/Containers.config
 lib/sather/Library/Containers/Containers.module
 lib/sather/Library/Containers/ContainersArrays.module
 lib/sather/Library/Containers/ContainersBags.module
@@ -132,6 +136,7 @@
 lib/sather/Library/Containers/arr_search_alg.sa
 lib/sather/Library/Containers/arr_select_alg.sa
 lib/sather/Library/Containers/arr_sort_alg.sa
+lib/sather/Library/Containers/array.config
 lib/sather/Library/Containers/array.sa
 lib/sather/Library/Containers/array2.sa
 lib/sather/Library/Containers/array2_test.sa
@@ -190,10 +195,13 @@
 lib/sather/Library/Containers/stack_test.sa
 lib/sather/Library/Containers/tup.sa
 lib/sather/Library/Containers/tup_test.sa
+lib/sather/Library/Ext/Ext.config
 lib/sather/Library/Ext/External.module
 lib/sather/Library/Ext/bind_fortran.sa
+lib/sather/Library/Ext/c.config
 lib/sather/Library/Ext/c.sa
 lib/sather/Library/Ext/c_ptr.sa
+lib/sather/Library/Ext/fortran.config
 lib/sather/Library/Ext/fortran.sa
 lib/sather/Library/Ext/other_c_ptrs.sa
 lib/sather/Library/Graphs/Graphs.module
@@ -216,13 +224,17 @@
 lib/sather/Library/Graphs/wtd_digraph.sa
 lib/sather/Library/Graphs/wtd_digraph_alg.sa
 lib/sather/Library/Graphs/wtd_digraph_test.sa
+lib/sather/Library/IO/IO.config
 lib/sather/Library/IO/IO.module
 lib/sather/Library/IO/err.sa
+lib/sather/Library/IO/file.config
 lib/sather/Library/IO/file.sa
+lib/sather/Library/IO/in.config
 lib/sather/Library/IO/in.sa
 lib/sather/Library/IO/out.sa
 lib/sather/Library/IO/str_stream.sa
 lib/sather/Library/IO/stream.sa
+lib/sather/Library/Library.config
 lib/sather/Library/Library.module
 lib/sather/Library/Math/Math.module
 lib/sather/Library/Math/Matvec.module
@@ -248,9 +260,11 @@
 lib/sather/Library/Math/vec.sa
 lib/sather/Library/Math/veccpx.sa
 lib/sather/Library/Math/vecd.sa
+lib/sather/Library/Strings/Strings.config
 lib/sather/Library/Strings/Strings.module
 lib/sather/Library/Strings/base_format.sa
 lib/sather/Library/Strings/format.sa
+lib/sather/Library/Strings/fstr.config
 lib/sather/Library/Strings/fstr.sa
 lib/sather/Library/Strings/fstr_test.sa
 lib/sather/Library/Strings/glob.sa
@@ -258,6 +272,7 @@
 lib/sather/Library/Strings/regex.h
 lib/sather/Library/Strings/regexp.c
 lib/sather/Library/Strings/regexp.sa
+lib/sather/Library/Strings/str.config
 lib/sather/Library/Strings/str.sa
 lib/sather/Library/Strings/str_cursor.sa
 lib/sather/Library/Strings/str_cursor_test.sa
@@ -315,6 +330,7 @@
 lib/sather/Library/System/Socket/socket_support_unix.c
 lib/sather/Library/System/Socket/socket_support_win32.c
 lib/sather/Library/System/Socket/socket_test.sa
+lib/sather/Library/System/System.config
 lib/sather/Library/System/System.module
 lib/sather/Library/System/TclTk/TclTk.module
 lib/sather/Library/System/TclTk/c_interface.c
@@ -325,10 +341,13 @@
 lib/sather/Library/System/TclTk/tkRasterBuiltIn.c
 lib/sather/Library/System/TclTk/tkRasterBuiltIn.h
 lib/sather/Library/System/Zones/Zones.module
+lib/sather/Library/System/Zones/zone.config
 lib/sather/Library/System/Zones/zone.sa
 lib/sather/Library/System/runtime.sa
+lib/sather/Library/System/sys.config
 lib/sather/Library/System/sys.sa
 lib/sather/Library/System/test.sa
+lib/sather/Library/System/time.config
 lib/sather/Library/System/time.sa
 lib/sather/Library/System/unix.sa
 lib/sather/Library/pSather/pSather.module
@@ -352,17 +371,21 @@
 lib/sather/System/Debug/print.c
 lib/sather/System/FORBID
 lib/sather/System/Platforms/X/CONFIG
+lib/sather/System/Platforms/X/Makefile
 lib/sather/System/Platforms/X/Platform.module
 lib/sather/System/Platforms/X/header.h
 lib/sather/System/Platforms/dualgui/CONFIG
 lib/sather/System/Platforms/dualgui/GuiServer.module
+lib/sather/System/Platforms/dualgui/Makefile
 lib/sather/System/Platforms/dualgui/Platform.module
 lib/sather/System/Platforms/dualgui/dual_gui_server
 lib/sather/System/Platforms/dualgui/header.h
 lib/sather/System/Platforms/f77/CONFIG
+lib/sather/System/Platforms/f77/Makefile
 lib/sather/System/Platforms/f77/Platform.module
 lib/sather/System/Platforms/f77/header.h
 lib/sather/System/Platforms/gui/CONFIG
+lib/sather/System/Platforms/gui/Makefile
 lib/sather/System/Platforms/gui/Platform.module
 lib/sather/System/Platforms/gui/TclCode/README
 lib/sather/System/Platforms/gui/TclCode/gui_post_socket_init.tcl
@@ -375,11 +398,13 @@
 lib/sather/System/Platforms/gui/gui_post_socket_init.tcl
 lib/sather/System/Platforms/gui/gui_setup.tcl
 lib/sather/System/Platforms/gui/header.h
-lib/sather/System/Platforms/netbsd/CONFIG
-lib/sather/System/Platforms/netbsd/Platform.module
-lib/sather/System/Platforms/netbsd/header.h
+lib/sather/System/Platforms/${LOWER_OPSYS}/CONFIG
+lib/sather/System/Platforms/${LOWER_OPSYS}/Makefile
+lib/sather/System/Platforms/${LOWER_OPSYS}/Platform.module
+lib/sather/System/Platforms/${LOWER_OPSYS}/header.h
 lib/sather/System/Platforms/tcltk/CONFIG
 lib/sather/System/Platforms/tcltk/Make.target.inc
+lib/sather/System/Platforms/tcltk/Makefile
 lib/sather/System/Platforms/tcltk/Platform.module
 lib/sather/System/Platforms/tcltk/header.h
 lib/sather/System/Platforms/tcltk/init/button.tcl
@@ -434,8 +459,6 @@
 share/doc/sather/header/sa-lgpl
 share/doc/sather/index.html
 share/doc/sather/iterators.ps
-share/doc/sather/man/man1/sabrowse.1
-share/doc/sather/man/man1/sacomp.1
 share/doc/sather/pSather-notes
 share/doc/sather/programmer-manual.ps
 share/doc/sather/runtime_spec
@@ -443,14 +466,14 @@
 share/emacs/site-lisp/sather-lib.el
 share/emacs/site-lisp/sather-module.el
 share/emacs/site-lisp/sather.el
-@dirrm share/doc/sather/man/man1
-@dirrm share/doc/sather/man
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
 @dirrm share/doc/sather/header
 @dirrm share/doc/sather/Gui
 @dirrm share/doc/sather
 @dirrm lib/sather/System/Platforms/tcltk/init
 @dirrm lib/sather/System/Platforms/tcltk
-@dirrm lib/sather/System/Platforms/netbsd
+@dirrm lib/sather/System/Platforms/${LOWER_OPSYS}
 @dirrm lib/sather/System/Platforms/gui/TclCode
 @dirrm lib/sather/System/Platforms/gui
 @dirrm lib/sather/System/Platforms/f77



Home | Main Index | Thread Index | Old Index