diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2014-03-29 00:50:40 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2014-03-29 00:50:40 +0800 |
| commit | 95b09ca9d6eb9a41da9605f1a22a0879d93e3293 (patch) | |
| tree | 3d622ecef64e72fdf5cce026d67886b23c31f9fd | |
| parent | 181c2c253b63cb6ffcc8075b605d32996f8e420f (diff) | |
| download | wspkg-95b09ca9d6eb9a41da9605f1a22a0879d93e3293.tar.gz wspkg-95b09ca9d6eb9a41da9605f1a22a0879d93e3293.tar.zst wspkg-95b09ca9d6eb9a41da9605f1a22a0879d93e3293.zip | |
支援用 sed 修改產生好的清單（目前主要當 mask 使用）
| -rw-r--r-- | debian.in/debian.sed | 3 | ||||
| -rw-r--r-- | freebsd.in/freebsd.pkg | 5 | ||||
| -rw-r--r-- | freebsd.in/freebsd.sed | 8 | ||||
| -rw-r--r-- | packages.mk | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/debian.in/debian.sed b/debian.in/debian.sed new file mode 100644 index 0000000..c4ff653 --- /dev/null +++ b/debian.in/debian.sed @@ -0,0 +1,3 @@ +# denyhosts is dropped by Debian 8 (jessie) because its upstream is dead +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732712 +/^denyhosts$/d diff --git a/freebsd.in/freebsd.pkg b/freebsd.in/freebsd.pkg index 5eb67de..5a40506 100644 --- a/freebsd.in/freebsd.pkg +++ b/freebsd.in/freebsd.pkg @@ -1,10 +1,5 @@ // vim: ft=c: et -// TODO: packages mask -#define clisp // segfault when running lisp.run -#define newmail // no more public distfiles -#define ns // needs broken package otcl - // =========================================================================== // Packages mapping started from here // =========================================================================== diff --git a/freebsd.in/freebsd.sed b/freebsd.in/freebsd.sed new file mode 100644 index 0000000..fa5f4f5 --- /dev/null +++ b/freebsd.in/freebsd.sed @@ -0,0 +1,8 @@ +# Segfault when running lisp.run +/^clisp$/d +# Conflict with xscreensaver (will be resolved when GNOME 3 is imported) +/^gnome-screensaver$/d +# No more public distfiles +/^newmail$/d +# Need broken package otcl +/^ns$/d diff --git a/packages.mk b/packages.mk index 3ca60bf..1d30783 100644 --- a/packages.mk +++ b/packages.mk @@ -16,6 +16,7 @@ PLATFORM_OUT= $(PLATFORM).out PLATFORM_DOC= $(PLATFORM).doc PKGLIST_IN= $(PLATFORM_IN)/$(PLATFORM).pkg +PKGLIST_SED= $(PLATFORM_IN)/$(PLATFORM).sed PKGLIST_OUT= $(PLATFORM_OUT)/$(PLATFORM).list # Include silent rules @@ -29,9 +30,10 @@ all: README.html $(PLATFORM) -$(AT_DOC)$(ASCIIDOC) -b html -o "$@" "$<" # Generate package list -$(PKGLIST_OUT): $(PKGLIST_IN) packages.h packages.sh +$(PKGLIST_OUT): $(PKGLIST_IN) $(PKGLIST_SED) packages.h packages.sh -$(AT_MKDIR)mkdir -p $(PLATFORM_OUT) $(AT_CPP)CPPFLAGS="-I. -I$(PLATFORM_IN)" ./packages.sh $(PLATFORM) \ + | sort | uniq | sed -f $(PKGLIST_SED) \ | sort | uniq > $(PKGLIST_OUT) $(RM_IF_FAIL) # Clean files |