From 109a787471d61450906b821975a48dfa1dfa0133 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 11 Oct 2012 12:02:42 +0000 Subject: [PATCH] Remove some uneeded RPMs. Remove stuffs that are now taken care by Makefile.inc. Update to the latest version of all Fedora 10 RPMs. Remove @lib markers from PLIST. --- emulators/fedora/cups/Makefile | 37 +++++++-------------------------- emulators/fedora/cups/distinfo | 22 +++++++++----------- emulators/fedora/cups/pkg/PLIST | 24 ++++++++++----------- 3 files changed, 30 insertions(+), 53 deletions(-) diff --git a/emulators/fedora/cups/Makefile b/emulators/fedora/cups/Makefile index 70690096e1d..953622d8a40 100644 --- a/emulators/fedora/cups/Makefile +++ b/emulators/fedora/cups/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2012/10/11 10:16:29 robert Exp $ +# $OpenBSD: Makefile,v 1.4 2012/10/11 12:02:42 ajacoutot Exp $ COMMENT= Linux CUPS package based on Fedora Core 10 -PKGNAME= fedora_cups-10.0 - -MASTER_SITES= ${MASTER_SITE_FEDORA0:=10/Fedora/i386/os/Packages/} +PKGNAME= fedora_cups-${FEDORA_V}.0 +REVISION= 0 SHARED_LIBS += des425 3.0 SHARED_LIBS += gssapi_krb5 2.2 @@ -19,34 +18,14 @@ SHARED_LIBS += krb5support 0.1 RUN_DEPENDS= emulators/fedora/base -DISTFILES= ${RPMS} - -RPMDIR= ${FULLDISTDIR} - -RPMS= audit-libs-1.7.8-6.fc10.i386.rpm \ - cups-libs-1.3.9-2.fc10.i386.rpm \ - gnutls-2.4.2-2.fc10.i386.rpm \ - krb5-libs-1.6.3-16.fc10.i386.rpm \ - libgcrypt-1.4.3-2.fc10.i386.rpm \ +RPMS= audit-libs-1.7.13-1.fc10.i386.rpm:0 \ + cups-libs-1.3.11-4.fc10.i386.rpm:0 \ + gnutls-2.4.2-5.fc10.i386.rpm:0 \ + krb5-libs-1.6.3-18.fc10.i386.rpm:0 \ + libgcrypt-1.4.4-1.fc10.i386.rpm:0 \ libgpg-error-1.6-2.i386.rpm \ libtasn1-1.5-1.fc10.i386.rpm REMOVE_DIRS= usr/kerberos usr/share/man usr/share/doc -do-install: - ${INSTALL_DATA_DIR} ${FEDORADIR} -.for rpm in ${RPMS:S/:0//} - cd ${FEDORADIR}; rpm2cpio ${RPMDIR}/${rpm} | ${LOCALBASE}/bin/gcpio -id -.endfor - -# get rid of some unnecessary directories -.for D in ${REMOVE_DIRS} - rm -rf ${FEDORADIR}/${D} -.endfor - -# better safe than sorry - find ${FEDORADIR} -perm -4000 | xargs -r chmod u-s - find ${FEDORADIR} \( -user 37 -o -user 5041 -o -group 37 \) -print | \ - xargs -r chown -h root:wheel - .include diff --git a/emulators/fedora/cups/distinfo b/emulators/fedora/cups/distinfo index 3246799d658..e41dcc69cf8 100644 --- a/emulators/fedora/cups/distinfo +++ b/emulators/fedora/cups/distinfo @@ -1,16 +1,14 @@ -SHA256 (rpm/audit-libs-1.7.8-6.fc10.i386.rpm) = X6Rb8ZZcxp+YViEs1gxR7i7wHwGh3rb+ADvk1RC9Fm0= -SHA256 (rpm/cups-1.3.9-2.fc10.i386.rpm) = tXCKN1Hrqb22nuXIWXtyL86sxhRZD8DnkR0TcoI9mHo= -SHA256 (rpm/cups-libs-1.3.9-2.fc10.i386.rpm) = Xg7FRPgxFbB57xcrtIqkYW/uzW+kHFMdCuRRbXY/3/Y= -SHA256 (rpm/gnutls-2.4.2-2.fc10.i386.rpm) = X9xo8UDbKj3kwv1dRa4Nh3ZtwbcOgwxHusCTsh4Zojw= -SHA256 (rpm/krb5-libs-1.6.3-16.fc10.i386.rpm) = fZ57OEm/606sNcO5+ytX6nCgXAdlQXo7kaKD5rEIvng= -SHA256 (rpm/libgcrypt-1.4.3-2.fc10.i386.rpm) = P6sIo2bTravcDZ6zkw4zc8cyMGo8Ms9srpVNb0gtSlU= +SHA256 (rpm/audit-libs-1.7.13-1.fc10.i386.rpm) = ChQONwVATqkfgXVSeuiYIvWGoFkF1lhEfYgyQT1er2U= +SHA256 (rpm/cups-libs-1.3.11-4.fc10.i386.rpm) = l5+ucN4qumu7ZB5+I38GOHatrGhn6bwhSZoljNpVGNM= +SHA256 (rpm/gnutls-2.4.2-5.fc10.i386.rpm) = Yof5V6mTiosHjHkBvXPXzRYsjO7a2kPRw6kEO6RHmT4= +SHA256 (rpm/krb5-libs-1.6.3-18.fc10.i386.rpm) = EmODKaUXoa+/nM/h/vvyk8clONcGLaidQWnoz7suWEs= +SHA256 (rpm/libgcrypt-1.4.4-1.fc10.i386.rpm) = wGR0FwSfXBZUqXLozvpmwqz+QoqGxqlYFXmgXHE+iL8= SHA256 (rpm/libgpg-error-1.6-2.i386.rpm) = kWRj0wOcoE7F7hcXBrm3Fo+luZYJmgACzO9KVbPkJFM= SHA256 (rpm/libtasn1-1.5-1.fc10.i386.rpm) = eXdhd1Wfs9REoTyQNXgV8QnHtAspe+hjzac+RFipBk0= -SIZE (rpm/audit-libs-1.7.8-6.fc10.i386.rpm) = 80912 -SIZE (rpm/cups-1.3.9-2.fc10.i386.rpm) = 3707102 -SIZE (rpm/cups-libs-1.3.9-2.fc10.i386.rpm) = 207302 -SIZE (rpm/gnutls-2.4.2-2.fc10.i386.rpm) = 397580 -SIZE (rpm/krb5-libs-1.6.3-16.fc10.i386.rpm) = 738554 -SIZE (rpm/libgcrypt-1.4.3-2.fc10.i386.rpm) = 244949 +SIZE (rpm/audit-libs-1.7.13-1.fc10.i386.rpm) = 83473 +SIZE (rpm/cups-libs-1.3.11-4.fc10.i386.rpm) = 210499 +SIZE (rpm/gnutls-2.4.2-5.fc10.i386.rpm) = 398396 +SIZE (rpm/krb5-libs-1.6.3-18.fc10.i386.rpm) = 737213 +SIZE (rpm/libgcrypt-1.4.4-1.fc10.i386.rpm) = 243009 SIZE (rpm/libgpg-error-1.6-2.i386.rpm) = 66471 SIZE (rpm/libtasn1-1.5-1.fc10.i386.rpm) = 301472 diff --git a/emulators/fedora/cups/pkg/PLIST b/emulators/fedora/cups/pkg/PLIST index bfc51f3df00..937fa7b866b 100644 --- a/emulators/fedora/cups/pkg/PLIST +++ b/emulators/fedora/cups/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2012/10/11 10:16:29 robert Exp $ +@comment $OpenBSD: PLIST,v 1.3 2012/10/11 12:02:42 ajacoutot Exp $ emul/fedora/etc/gcrypt/ emul/fedora/etc/krb5.conf emul/fedora/etc/libaudit.conf @@ -7,7 +7,7 @@ emul/fedora/lib/libaudit.so.0.0.0 emul/fedora/lib/libauparse.so.0 emul/fedora/lib/libauparse.so.0.0.0 emul/fedora/lib/libgcrypt.so.11 -emul/fedora/lib/libgcrypt.so.11.5.1 +emul/fedora/lib/libgcrypt.so.11.5.2 emul/fedora/lib/libgpg-error.so.0 emul/fedora/lib/libgpg-error.so.0.4.0 emul/fedora/usr/bin/gpg-error @@ -20,7 +20,7 @@ emul/fedora/usr/lib/krb5/plugins/preauth/ emul/fedora/usr/lib/libcups.so.2 emul/fedora/usr/lib/libcupsimage.so.2 emul/fedora/usr/lib/libdes425.so.3 -@lib emul/fedora/usr/lib/libdes425.so.${LIBdes425_VERSION} +emul/fedora/usr/lib/libdes425.so.${LIBdes425_VERSION} emul/fedora/usr/lib/libgnutls-extra.so.26 emul/fedora/usr/lib/libgnutls-extra.so.26.4.6 emul/fedora/usr/lib/libgnutls-openssl.so.26 @@ -30,23 +30,23 @@ emul/fedora/usr/lib/libgnutls.so.26.4.6 emul/fedora/usr/lib/libgnutlsxx.so.26 emul/fedora/usr/lib/libgnutlsxx.so.26.4.6 emul/fedora/usr/lib/libgssapi_krb5.so.2 -@lib emul/fedora/usr/lib/libgssapi_krb5.so.${LIBgssapi_krb5_VERSION} +emul/fedora/usr/lib/libgssapi_krb5.so.${LIBgssapi_krb5_VERSION} emul/fedora/usr/lib/libgssrpc.so.4 -@lib emul/fedora/usr/lib/libgssrpc.so.${LIBgssrpc_VERSION} +emul/fedora/usr/lib/libgssrpc.so.${LIBgssrpc_VERSION} emul/fedora/usr/lib/libk5crypto.so.3 -@lib emul/fedora/usr/lib/libk5crypto.so.${LIBk5crypto_VERSION} +emul/fedora/usr/lib/libk5crypto.so.${LIBk5crypto_VERSION} emul/fedora/usr/lib/libkadm5clnt.so.5 -@lib emul/fedora/usr/lib/libkadm5clnt.so.${LIBkadm5clnt_VERSION} +emul/fedora/usr/lib/libkadm5clnt.so.${LIBkadm5clnt_VERSION} emul/fedora/usr/lib/libkadm5srv.so.5 -@lib emul/fedora/usr/lib/libkadm5srv.so.${LIBkadm5srv_VERSION} +emul/fedora/usr/lib/libkadm5srv.so.${LIBkadm5srv_VERSION} emul/fedora/usr/lib/libkdb5.so.4 -@lib emul/fedora/usr/lib/libkdb5.so.${LIBkdb5_VERSION} +emul/fedora/usr/lib/libkdb5.so.${LIBkdb5_VERSION} emul/fedora/usr/lib/libkrb4.so.2 -@lib emul/fedora/usr/lib/libkrb4.so.${LIBkrb4_VERSION} +emul/fedora/usr/lib/libkrb4.so.${LIBkrb4_VERSION} emul/fedora/usr/lib/libkrb5.so.3 -@lib emul/fedora/usr/lib/libkrb5.so.${LIBkrb5_VERSION} +emul/fedora/usr/lib/libkrb5.so.${LIBkrb5_VERSION} emul/fedora/usr/lib/libkrb5support.so.0 -@lib emul/fedora/usr/lib/libkrb5support.so.${LIBkrb5support_VERSION} +emul/fedora/usr/lib/libkrb5support.so.${LIBkrb5support_VERSION} emul/fedora/usr/lib/libtasn1.so.3 emul/fedora/usr/lib/libtasn1.so.3.0.16 emul/fedora/usr/share/locale/de/LC_MESSAGES/gnutls.mo