diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2014-07-31 20:14:52 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2014-07-31 20:14:52 +0800 |
| commit | 9877c83c07557f8387f10e32437f4be3f614d480 (patch) | |
| tree | 16a8348147f2a8977ee8be48d0a5d5d01f78091f | |
| parent | a0c2b8a1101ebc119cdee3a6b861faa4d4eb6fb1 (diff) | |
| download | wspkg-data-9877c83c07557f8387f10e32437f4be3f614d480.tar.gz wspkg-data-9877c83c07557f8387f10e32437f4be3f614d480.tar.zst wspkg-data-9877c83c07557f8387f10e32437f4be3f614d480.zip | |
改用新的方式填寫設定值，移除所有不再需要的變數
| -rw-r--r-- | pkgbuild.mk | 26 | ||||
| -rw-r--r-- | pkgbuild/pkgbuild.makefile.in | 2 | ||||
| -rw-r--r-- | wsbsd.mk | 29 | ||||
| -rw-r--r-- | wsbsd/wsbsd.makefile.in | 2 | ||||
| -rw-r--r-- | wslinux.mk | 22 | ||||
| -rw-r--r-- | wslinux/wslinux.control.in | 2 |
6 files changed, 10 insertions, 73 deletions
diff --git a/pkgbuild.mk b/pkgbuild.mk index 0a596a1..ee277d7 100644 --- a/pkgbuild.mk +++ b/pkgbuild.mk @@ -1,36 +1,16 @@ # vim: set ts=8 sts=8 sw=8 ft=make: # CSIE package builder -# My name and my directories NAME= pkgbuild -INDIR= $(NAME) -OUTDIR= $(NAME)/out - -# Platform-independent settings USE_MACRO= cpp WSPKG_IN_COMMON= pkgbuild.h -WSPKG_IN_PLATFORM_PKG= $(INDIR)/$(NAME).pkg -WSPKG_IN_PLATFORM_SED= $(INDIR)/$(NAME).sed -WSPKG_OUT_LIST= $(OUTDIR)/$(NAME).list - -# Backend-specific settings BACKEND= freebsd -FREEBSD_OUT_PORTS= $(OUTDIR)/$(NAME).ports -FREEBSD_IN_MAKEFILE_IN= $(INDIR)/$(NAME).makefile.in -FREEBSD_OUT_MAKEFILE= $(OUTDIR)/$(NAME).makefile +PKGNAME= pkgbuild -FREEBSD_IN_PKGDESC= $(INDIR)/$(NAME).local.pkgbuild.pkg-descr -FREEBSD_OUT_PKGDIR= $(OUTDIR)/pkgbuild -FREEBSD_OUT_PKGDESC= $(FREEBSD_OUT_PKGDIR)/pkg-descr -FREEBSD_OUT_PKG= $(FREEBSD_OUT_PKGDIR)/Makefile +include $(WSPKGDIR)/wspkg-mk/defaults.mk -# Update the ports tree +# Put overrides here FREEBSD_OUT_PORTS_CATEGORY_MAKEFILE= /dev/null FREEBSD_OUT_PORTS_CATEGORY_MAKEFILE_INC= /dev/null -FREEBSD_OUT_PORTS_CATEGORY= local include $(WSPKGDIR)/wspkg-mk/packages.mk - -clean: - rm -rf $(OUTDIR) - diff --git a/pkgbuild/pkgbuild.makefile.in b/pkgbuild/pkgbuild.makefile.in index 91a2f59..6b5d009 100644 --- a/pkgbuild/pkgbuild.makefile.in +++ b/pkgbuild/pkgbuild.makefile.in @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE NO_BUILD= yes -RUN_DEPENDS+= @FREEBSD_DOT_PORTS@ +RUN_DEPENDS+= @DEPS@ do-install: @${DO_NADA} @@ -1,36 +1,11 @@ # vim: set ts=8 sts=8 sw=8 ft=make: # CSIE workstation bsd meta-package -# My name and my directories NAME= wsbsd -INDIR= $(NAME) -OUTDIR= $(NAME)/out - -# Platform-independent settings USE_MACRO= cpp WSPKG_IN_COMMON= wscommon.h -WSPKG_IN_PLATFORM_PKG= $(INDIR)/$(NAME).pkg -WSPKG_IN_PLATFORM_SED= $(INDIR)/$(NAME).sed -WSPKG_OUT_LIST= $(OUTDIR)/$(NAME).list - -# Backend-specific settings BACKEND= freebsd -FREEBSD_OUT_PORTS= $(OUTDIR)/$(NAME).ports -FREEBSD_IN_MAKEFILE_IN= $(INDIR)/$(NAME).makefile.in -FREEBSD_OUT_MAKEFILE= $(OUTDIR)/$(NAME).makefile - -FREEBSD_IN_PKGDESC= $(INDIR)/$(NAME).local.217.pkg-descr -FREEBSD_OUT_PKGDIR= $(OUTDIR)/217 -FREEBSD_OUT_PKGDESC= $(FREEBSD_OUT_PKGDIR)/pkg-descr -FREEBSD_OUT_PKG= $(FREEBSD_OUT_PKGDIR)/Makefile - -# Update the ports tree -FREEBSD_OUT_PORTS_CATEGORY_MAKEFILE= $(INDIR)/$(NAME).local.Makefile -FREEBSD_OUT_PORTS_CATEGORY_MAKEFILE_INC= $(INDIR)/$(NAME).local.Makefile.inc -FREEBSD_OUT_PORTS_CATEGORY= local +PKGNAME= 217 +include $(WSPKGDIR)/wspkg-mk/defaults.mk include $(WSPKGDIR)/wspkg-mk/packages.mk - -clean: - rm -rf $(OUTDIR) - diff --git a/wsbsd/wsbsd.makefile.in b/wsbsd/wsbsd.makefile.in index eb11c14..a6967a9 100644 --- a/wsbsd/wsbsd.makefile.in +++ b/wsbsd/wsbsd.makefile.in @@ -16,7 +16,7 @@ LICENSE= BSD2CLAUSE NO_BUILD= yes -RUN_DEPENDS+= @FREEBSD_DOT_PORTS@ +RUN_DEPENDS+= @DEPS@ do-install: @${DO_NADA} @@ -1,29 +1,11 @@ # vim: set ts=8 sts=8 sw=8 ft=make: # CSIE workstation linux meta-package -# My name and my directories NAME= wslinux -INDIR= $(NAME) -OUTDIR= $(NAME)/out - -# Platform-independent settings USE_MACRO= cpp WSPKG_IN_COMMON= wscommon.h -WSPKG_IN_PLATFORM_PKG= $(INDIR)/$(NAME).pkg -WSPKG_IN_PLATFORM_SED= $(INDIR)/$(NAME).sed -WSPKG_OUT_LIST= $(OUTDIR)/$(NAME).list - -# Backend-specific settings BACKEND= debian -DEBIAN_IN_CONTROL_IN= $(INDIR)/$(NAME).control.in -DEBIAN_OUT_CONTROL= $(OUTDIR)/$(NAME).control -DEBIAN_OUT_PKGDIR= $(OUTDIR)/217-meta -DEBIAN_OUT_PKG= $(OUTDIR)/217-meta.deb - -# Repository -DEBIAN_OUT_REPO= $(OUTDIR)/repo +PKGNAME= 217-meta +include $(WSPKGDIR)/wspkg-mk/defaults.mk include $(WSPKGDIR)/wspkg-mk/packages.mk - -clean: - rm -rf $(OUTDIR) diff --git a/wslinux/wslinux.control.in b/wslinux/wslinux.control.in index 8fdf839..39b095d 100644 --- a/wslinux/wslinux.control.in +++ b/wslinux/wslinux.control.in @@ -4,7 +4,7 @@ Section: admin Priority: required Architecture: all Pre-Depends: debconf (>= 0.5) | debconf-2.0 -Depends: @DEBIAN_DOT_LIST@ +Depends: @DEPS@ Replaces: dict Maintainer: 217TA <217ta@csie.ntu.edu.tw> Description: 217 meta package |