From c1eba2d83eb1b997b5906a1458529c5c6a6a2fa4 Mon Sep 17 00:00:00 2001 From: Alexander Leidinger Date: Mon, 1 May 2006 17:28:17 +0000 Subject: - convert to use bsd.linux-rpm.mk (get rid of include of linux-gtk/Makefile) [1] - use fixed plists [1] - category "linux" added to those ports without it [1] - update some ports to a recent FC3 one [1] - remove plists/... for Alpha (there's no support since linux_base-8 for Alpha anymore) - don't hardcode version numbers in some plists, use PLIST_SUB instead (any errors are mine, don't keep them, send them to me) Regarding linux-ungif I declare a maintainer timeout (one month, Boris tried to contact the maintainer) and also pull the "sweeping commit"-card (the port which it uses as some kind of master port can not be used for this anymore). Besides this, I don't think he will be upset when other people do the work instead of adding an entry to his TODO list. :-) This commit brings us just before the switch of the default linux base port to the fc3 one, modulo some bugs which may appear. So: Beta testers wanted! To test: sed -i.old -e 's:linux-XFree86-libs:linux-xorg-libs:' /usr/ports/Mk/bsd.port.mk echo OVERRIDE_LINUX_BASE_PORT=fc3 >> /etc/make.conf portupgrade -f -o emulators/linux_base-fc3 -f linux_base-8 portupgrade -o x11/linux-xorg-libs linux-XFree86-libs portupgrade linux-\* The first two steps are necessary to switch to fc3 as the new default linux base port, the last 3 steps to upgrade to fc3. And feel free to send a big "Thank you!" to Boris, he did a lot of the work! I just provided some hints and answered some questions (besides from committing all the necessary changes for FC3 and doing some minor changes+comments/improvements to/of his work), even when he tries to tell you something else. ;-) Submitted by: Boris Samorodov [1] --- graphics/linux-jpeg/Makefile | 16 +++++++--------- graphics/linux-jpeg/distinfo.i386 | 9 ++++++--- graphics/linux-jpeg/pkg-plist | 16 ++++++++++++++++ graphics/linux-jpeg/pkg-plist.i386 | 16 ---------------- 4 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 graphics/linux-jpeg/pkg-plist delete mode 100644 graphics/linux-jpeg/pkg-plist.i386 (limited to 'graphics/linux-jpeg') diff --git a/graphics/linux-jpeg/Makefile b/graphics/linux-jpeg/Makefile index 03de0fa8e4cd..b542ab05c935 100644 --- a/graphics/linux-jpeg/Makefile +++ b/graphics/linux-jpeg/Makefile @@ -7,20 +7,18 @@ PORTNAME= jpeg PORTVERSION= 6b.33 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics linux -MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} -MASTER_SITE_SUBDIR= 3/${ARCH}/os/Fedora/RPMS +DISTNAME= libjpeg-6b-33 MAINTAINER= freebsd-emulation@FreeBSD.org COMMENT= RPM of the JPEG lib +USE_LINUX_RPM= yes +LINUX_DIST_VER= 3 +INSTALLS_SHLIB= yes ONLY_FOR_ARCHS= i386 amd64 -RPM_SET= libjpeg-6b-33.${ARCH}.rpm -post-install: - @${BRANDELF} -t Linux ${PREFIX}/usr/bin/cjpeg ${PREFIX}/usr/bin/djpeg \ - ${PREFIX}/usr/bin/jpegtran ${PREFIX}/usr/bin/rdjpgcom \ - ${PREFIX}/usr/bin/wrjpgcom +BRANDELF_DIRS= usr/bin -.include "../../x11-toolkits/linux-gtk/Makefile" +.include diff --git a/graphics/linux-jpeg/distinfo.i386 b/graphics/linux-jpeg/distinfo.i386 index 3de09d4b69b1..8a7321881584 100644 --- a/graphics/linux-jpeg/distinfo.i386 +++ b/graphics/linux-jpeg/distinfo.i386 @@ -1,3 +1,6 @@ -MD5 (rpm/libjpeg-6b-33.i386.rpm) = a7c91c619462c521ba27b6caad50bd41 -SHA256 (rpm/libjpeg-6b-33.i386.rpm) = 19f1e874b23caee40603a8dce0380eed95205fe55fd70cbbe682bfb06b7f534f -SIZE (rpm/libjpeg-6b-33.i386.rpm) = 129589 +MD5 (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = a7c91c619462c521ba27b6caad50bd41 +SHA256 (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = 19f1e874b23caee40603a8dce0380eed95205fe55fd70cbbe682bfb06b7f534f +SIZE (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = 129589 +MD5 (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = 791bc284e9ab6a85c88734d1385dfa1d +SHA256 (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = bcbc4f67920dccccc93a17d4145fb14895e0b4fd565c8ce6e6fea7d82bfdffcc +SIZE (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = 544433 diff --git a/graphics/linux-jpeg/pkg-plist b/graphics/linux-jpeg/pkg-plist new file mode 100644 index 000000000000..c9c21d293f90 --- /dev/null +++ b/graphics/linux-jpeg/pkg-plist @@ -0,0 +1,16 @@ +usr/bin/cjpeg +usr/bin/djpeg +usr/bin/jpegtran +usr/bin/rdjpgcom +usr/bin/wrjpgcom +usr/lib/libjpeg.so.62.0.0 +usr/share/doc/libjpeg-6b/README +usr/share/doc/libjpeg-6b/usage.doc +usr/share/man/man1/cjpeg.1.gz +usr/share/man/man1/djpeg.1.gz +usr/share/man/man1/jpegtran.1.gz +usr/share/man/man1/rdjpgcom.1.gz +usr/share/man/man1/wrjpgcom.1.gz +@exec ln -sf %D/usr/lib/libjpeg.so.62.0.0 %D/usr/lib/libjpeg.so.62 +@unexec rm -f %D/usr/lib/libjpeg.so.62 +@dirrm usr/share/doc/libjpeg-6b diff --git a/graphics/linux-jpeg/pkg-plist.i386 b/graphics/linux-jpeg/pkg-plist.i386 deleted file mode 100644 index c9c21d293f90..000000000000 --- a/graphics/linux-jpeg/pkg-plist.i386 +++ /dev/null @@ -1,16 +0,0 @@ -usr/bin/cjpeg -usr/bin/djpeg -usr/bin/jpegtran -usr/bin/rdjpgcom -usr/bin/wrjpgcom -usr/lib/libjpeg.so.62.0.0 -usr/share/doc/libjpeg-6b/README -usr/share/doc/libjpeg-6b/usage.doc -usr/share/man/man1/cjpeg.1.gz -usr/share/man/man1/djpeg.1.gz -usr/share/man/man1/jpegtran.1.gz -usr/share/man/man1/rdjpgcom.1.gz -usr/share/man/man1/wrjpgcom.1.gz -@exec ln -sf %D/usr/lib/libjpeg.so.62.0.0 %D/usr/lib/libjpeg.so.62 -@unexec rm -f %D/usr/lib/libjpeg.so.62 -@dirrm usr/share/doc/libjpeg-6b -- cgit v1.2.3