summaryrefslogtreecommitdiff
path: root/package/cups
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-30 20:39:07 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-30 20:39:07 +0200
commitba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (patch)
tree10c726d162bc0ded85eb7aeacf8f246bd39ad63a /package/cups
parentbbd610f15a71b27c955175cb98392b114717fd47 (diff)
optimize ipkg package management
- generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig
Diffstat (limited to 'package/cups')
-rw-r--r--package/cups/Makefile14
-rw-r--r--package/cups/files/cups.conffiles (renamed from package/cups/ipkg/cups.conffiles)0
-rw-r--r--package/cups/files/cups.postinst (renamed from package/cups/ipkg/cups.postinst)0
-rw-r--r--package/cups/files/cupsd.init3
-rw-r--r--package/cups/ipkg/cups.control5
5 files changed, 10 insertions, 12 deletions
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 9bb75ffa1..d17d58cda 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -9,13 +9,18 @@ PKG_NAME:= cups
PKG_VERSION:= 1.3.10
PKG_RELEASE:= 1
PKG_MD5SUM:= 84fffe96b8537c81a463faccead80026
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
-MASTER_SITES:= http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${PKG_VERSION}/ \
+PKG_DESCR:= Common Unix Printing System
+PKG_SECTION:= net
+PKG_DEPENDS:= zlib libpthread
+PKG_URL:= http://www.cups.org
+PKG_SITES:= http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${PKG_VERSION}/ \
ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
+
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= ac_cv_func_sigset=no \
@@ -43,7 +48,6 @@ FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true"
XAKE_FLAGS+= OPTIM=''
post-install:
- ${INSTALL_DIR} ${IDIR_CUPS}/etc/init.d
${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups
${INSTALL_DIR} ${IDIR_CUPS}/usr/bin
${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin
@@ -71,7 +75,5 @@ post-install:
${IDIR_CUPS}/usr/share/cups/templates/
${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
- ${INSTALL_BIN} ./files/cupsd.init \
- ${IDIR_CUPS}/etc/init.d/cupsd
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cups/ipkg/cups.conffiles b/package/cups/files/cups.conffiles
index bed6faa3f..bed6faa3f 100644
--- a/package/cups/ipkg/cups.conffiles
+++ b/package/cups/files/cups.conffiles
diff --git a/package/cups/ipkg/cups.postinst b/package/cups/files/cups.postinst
index fa191bee7..fa191bee7 100644
--- a/package/cups/ipkg/cups.postinst
+++ b/package/cups/files/cups.postinst
diff --git a/package/cups/files/cupsd.init b/package/cups/files/cupsd.init
index d22f55c96..03be3300f 100644
--- a/package/cups/files/cupsd.init
+++ b/package/cups/files/cupsd.init
@@ -1,5 +1,6 @@
#!/bin/sh
-#FWINIT 60
+#PKG cups
+#INIT 60
. /etc/rc.conf
case $1 in
diff --git a/package/cups/ipkg/cups.control b/package/cups/ipkg/cups.control
deleted file mode 100644
index de3d14250..000000000
--- a/package/cups/ipkg/cups.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: cups
-Priority: optional
-Section: net
-Depends: zlib, libpthread
-Description: Common Unix Printing System