aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2006-05-02 01:28:17 +0800
committernetchild <netchild@FreeBSD.org>2006-05-02 01:28:17 +0800
commit3faa8845b28c901780a3a4b7488d6236a8282a12 (patch)
tree749f4f39c0633a1d8ddffe3ef1917d396b853f43 /graphics
parent1cbb1cc4f74650df31523d50cb04de767fd857f7 (diff)
downloadfreebsd-ports-gnome-3faa8845b28c901780a3a4b7488d6236a8282a12.tar.gz
freebsd-ports-gnome-3faa8845b28c901780a3a4b7488d6236a8282a12.tar.zst
freebsd-ports-gnome-3faa8845b28c901780a3a4b7488d6236a8282a12.zip
- 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 <bsam@ipt.ru> [1]
Diffstat (limited to 'graphics')
-rw-r--r--graphics/linux-f10-imlib/Makefile13
-rw-r--r--graphics/linux-f10-imlib/distinfo.alpha2
-rw-r--r--graphics/linux-f10-imlib/distinfo.i3868
-rw-r--r--graphics/linux-f10-imlib/pkg-plist.alpha21
-rw-r--r--graphics/linux-f10-imlib/pkg-plist.i38616
-rw-r--r--graphics/linux-f10-jpeg/Makefile16
-rw-r--r--graphics/linux-f10-jpeg/distinfo.i3869
-rw-r--r--graphics/linux-f10-jpeg/pkg-plist (renamed from graphics/linux-f10-jpeg/pkg-plist.i386)0
-rw-r--r--graphics/linux-f10-png/Makefile12
-rw-r--r--graphics/linux-f10-png/distinfo.i3869
-rw-r--r--graphics/linux-f10-png10/Makefile12
-rw-r--r--graphics/linux-f10-png10/distinfo.i3868
-rw-r--r--graphics/linux-f10-tiff/Makefile25
-rw-r--r--graphics/linux-f10-tiff/distinfo.i3869
-rw-r--r--graphics/linux-f10-ungif/Makefile16
-rw-r--r--graphics/linux-f10-ungif/distinfo.alpha2
-rw-r--r--graphics/linux-f10-ungif/distinfo.i3868
-rw-r--r--graphics/linux-f10-ungif/pkg-plist.alpha20
-rw-r--r--graphics/linux-f10-ungif/pkg-plist.i38634
-rw-r--r--graphics/linux-f8-imlib/Makefile13
-rw-r--r--graphics/linux-f8-imlib/distinfo.alpha2
-rw-r--r--graphics/linux-f8-imlib/distinfo.i3868
-rw-r--r--graphics/linux-f8-imlib/pkg-plist.alpha21
-rw-r--r--graphics/linux-f8-imlib/pkg-plist.i38616
-rw-r--r--graphics/linux-f8-jpeg/Makefile16
-rw-r--r--graphics/linux-f8-jpeg/distinfo.i3869
-rw-r--r--graphics/linux-f8-jpeg/pkg-plist (renamed from graphics/linux-f8-jpeg/pkg-plist.i386)0
-rw-r--r--graphics/linux-f8-png/Makefile12
-rw-r--r--graphics/linux-f8-png/distinfo.i3869
-rw-r--r--graphics/linux-f8-png10/Makefile12
-rw-r--r--graphics/linux-f8-png10/distinfo.i3868
-rw-r--r--graphics/linux-f8-tiff/Makefile25
-rw-r--r--graphics/linux-f8-tiff/distinfo.i3869
-rw-r--r--graphics/linux-f8-ungif/Makefile16
-rw-r--r--graphics/linux-f8-ungif/distinfo.alpha2
-rw-r--r--graphics/linux-f8-ungif/distinfo.i3868
-rw-r--r--graphics/linux-f8-ungif/pkg-plist.alpha20
-rw-r--r--graphics/linux-f8-ungif/pkg-plist.i38634
-rw-r--r--graphics/linux-imlib/Makefile13
-rw-r--r--graphics/linux-imlib/distinfo.alpha2
-rw-r--r--graphics/linux-imlib/distinfo.i3868
-rw-r--r--graphics/linux-imlib/pkg-plist.alpha21
-rw-r--r--graphics/linux-imlib/pkg-plist.i38616
-rw-r--r--graphics/linux-jpeg/Makefile16
-rw-r--r--graphics/linux-jpeg/distinfo.i3869
-rw-r--r--graphics/linux-jpeg/pkg-plist (renamed from graphics/linux-jpeg/pkg-plist.i386)0
-rw-r--r--graphics/linux-png/Makefile12
-rw-r--r--graphics/linux-png/distinfo.i3869
-rw-r--r--graphics/linux-png10/Makefile12
-rw-r--r--graphics/linux-png10/distinfo.i3868
-rw-r--r--graphics/linux-tiff/Makefile25
-rw-r--r--graphics/linux-tiff/distinfo.i3869
-rw-r--r--graphics/linux-ungif/Makefile16
-rw-r--r--graphics/linux-ungif/distinfo.alpha2
-rw-r--r--graphics/linux-ungif/distinfo.i3868
-rw-r--r--graphics/linux-ungif/pkg-plist.alpha20
-rw-r--r--graphics/linux-ungif/pkg-plist.i38634
57 files changed, 306 insertions, 414 deletions
diff --git a/graphics/linux-f10-imlib/Makefile b/graphics/linux-f10-imlib/Makefile
index df6beaab5186..1ac1a642ea9b 100644
--- a/graphics/linux-f10-imlib/Makefile
+++ b/graphics/linux-f10-imlib/Makefile
@@ -6,13 +6,18 @@
#
PORTNAME= imlib
-PORTVERSION= 1.9.8.1
-PORTREVISION= 2
+PORTVERSION= 1.9.13
CATEGORIES= graphics linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-21
MAINTAINER= ports@FreeBSD.org
COMMENT= RPM of imlib
-RPM_SET= imlib-${PORTVERSION}-2.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-imlib/distinfo.alpha b/graphics/linux-f10-imlib/distinfo.alpha
deleted file mode 100644
index 13f2314b4a34..000000000000
--- a/graphics/linux-f10-imlib/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/imlib-1.9.8.1-2.alpha.rpm) = 1e55a013ac2058d1100393ec6e795fa4
-SIZE (rpm/imlib-1.9.8.1-2.alpha.rpm) = 525669
diff --git a/graphics/linux-f10-imlib/distinfo.i386 b/graphics/linux-f10-imlib/distinfo.i386
index a979248ec87a..e7a7b12e0f0e 100644
--- a/graphics/linux-f10-imlib/distinfo.i386
+++ b/graphics/linux-f10-imlib/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/imlib-1.9.8.1-2.i386.rpm) = 64a1a27bc1e276af8aecefa261ab9b3b
-SIZE (rpm/imlib-1.9.8.1-2.i386.rpm) = 162510
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 547f6292ad0b85281b79773ae81ec6fe
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 06f59a3497e001dfa92e549c3c69db6c8827af056c0757cb488f5689e042326b
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 403667
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 6925c73e807665ecb0c728b848350ee0
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 61e73dcf484730bf38a3ea873be30dedf08ac6793f21366ffd97e7c5a9e01ecf
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 773178
diff --git a/graphics/linux-f10-imlib/pkg-plist.alpha b/graphics/linux-f10-imlib/pkg-plist.alpha
deleted file mode 100644
index f19ff0727e49..000000000000
--- a/graphics/linux-f10-imlib/pkg-plist.alpha
+++ /dev/null
@@ -1,21 +0,0 @@
-etc/im_palette-small.pal
-etc/im_palette-tiny.pal
-etc/im_palette.pal
-etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
-usr/lib/libimlib-bmp.so
-usr/lib/libimlib-gif.so
-usr/lib/libimlib-jpeg.so
-usr/lib/libimlib-png.so
-usr/lib/libimlib-ppm.so
-usr/lib/libimlib-ps.so
-usr/lib/libimlib-tiff.so
-usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
-usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
diff --git a/graphics/linux-f10-imlib/pkg-plist.i386 b/graphics/linux-f10-imlib/pkg-plist.i386
index f19ff0727e49..414ff141244a 100644
--- a/graphics/linux-f10-imlib/pkg-plist.i386
+++ b/graphics/linux-f10-imlib/pkg-plist.i386
@@ -2,8 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
+usr/lib/libImlib.so.11.0.0
+usr/lib/libgdk_imlib.so.%%PORTVERSION%%
usr/lib/libimlib-bmp.so
usr/lib/libimlib-gif.so
usr/lib/libimlib-jpeg.so
@@ -12,10 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
+usr/share/doc/imlib-%%PORTVERSION%%/AUTHORS
+usr/share/doc/imlib-%%PORTVERSION%%/ChangeLog
+usr/share/doc/imlib-%%PORTVERSION%%/NEWS
+usr/share/doc/imlib-%%PORTVERSION%%/README
+usr/lib/libImlib.so.11
usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
+@dirrm usr/share/doc/imlib-%%PORTVERSION%%
diff --git a/graphics/linux-f10-jpeg/Makefile b/graphics/linux-f10-jpeg/Makefile
index 03de0fa8e4cd..b542ab05c935 100644
--- a/graphics/linux-f10-jpeg/Makefile
+++ b/graphics/linux-f10-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 <bsd.port.mk>
diff --git a/graphics/linux-f10-jpeg/distinfo.i386 b/graphics/linux-f10-jpeg/distinfo.i386
index 3de09d4b69b1..8a7321881584 100644
--- a/graphics/linux-f10-jpeg/distinfo.i386
+++ b/graphics/linux-f10-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-f10-jpeg/pkg-plist.i386 b/graphics/linux-f10-jpeg/pkg-plist
index c9c21d293f90..c9c21d293f90 100644
--- a/graphics/linux-f10-jpeg/pkg-plist.i386
+++ b/graphics/linux-f10-jpeg/pkg-plist
diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile
index f827ffa4fdbb..12332642db94 100644
--- a/graphics/linux-f10-png/Makefile
+++ b/graphics/linux-f10-png/Makefile
@@ -7,18 +7,18 @@
PORTNAME= png
PORTVERSION= 1.2.8
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
+DISTNAME= libpng-${PORTVERSION}-1.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib
-DIST_SUBDIR= rpm/i386/fc3
# no alpha rpm is available
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= libpng-${PORTVERSION}-1.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= \
usr/lib/libpng.so.3 \
@@ -29,4 +29,4 @@ PLIST_FILES= \
DOCSDIR= ${PREFIX}/usr/share/doc/libpng-${PORTVERSION}
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-png/distinfo.i386 b/graphics/linux-f10-png/distinfo.i386
index 8dec2c825a09..48ed864c0a5a 100644
--- a/graphics/linux-f10-png/distinfo.i386
+++ b/graphics/linux-f10-png/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
-SHA256 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
-SIZE (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = c8c663262abf784cb176c5efd763587d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 415f069d18a88dffa4cac6e773070a0bd47204b4e1dcae194f2601b51509c080
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 397948
diff --git a/graphics/linux-f10-png10/Makefile b/graphics/linux-f10-png10/Makefile
index 5307a31714f5..7adefa0d6c88 100644
--- a/graphics/linux-f10-png10/Makefile
+++ b/graphics/linux-f10-png10/Makefile
@@ -7,23 +7,23 @@
PORTNAME= png
PORTVERSION= 1.0.16
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics linux
-MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
- http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
+DISTNAME= libpng10-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib (old 1.0 version)
LATEST_LINK= linux-png10
-DIST_SUBDIR= rpm/i386/fc3
ONLY_FOR_ARCHS= i386
-RPM_SET= libpng10-${PORTVERSION}-1.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= usr/lib/libpng.so.2.1.0.16 \
usr/lib/libpng.so.2
DOCSDIR= ${PREFIX}/usr/share/doc/libpng10-1.0.16
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-png10/distinfo.i386 b/graphics/linux-f10-png10/distinfo.i386
index 3fb95b9032b2..5dc28d08c979 100644
--- a/graphics/linux-f10-png10/distinfo.i386
+++ b/graphics/linux-f10-png10/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
-SIZE (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 6bbcf1ed1388357e3c81e13dd13e9e853603f3399c0366c6b940c82407bf3f4f
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 1174c6f9c2ba2326cae9cb6c61a3aeee
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 90f72ec8081e847a57e18186b8b8db1a46f442a442161ac3507a88ca4fddc186
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 388311
diff --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile
index 736756df7463..8e98c17b8750 100644
--- a/graphics/linux-f10-tiff/Makefile
+++ b/graphics/linux-f10-tiff/Makefile
@@ -7,11 +7,9 @@
PORTNAME= tiff
PORTVERSION= 3.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
-PKGNAMEPREFIX= linux-
+DISTNAME= libtiff-${PORTVERSION}-10.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= TIFF library, Linux/i386 binary
@@ -19,17 +17,10 @@ COMMENT= TIFF library, Linux/i386 binary
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
ONLY_FOR_ARCHS= amd64 i386
-RPM_SET= libtiff-${PORTVERSION}-10.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-BINFILES= fax2ps fax2tiff gif2tiff pal2rgb ppm2tiff ras2tiff raw2tiff \
- rgb2ycbcr thumbnail tiff2bw tiff2pdf tiff2ps tiff2rgba tiffcmp \
- tiffcp tiffdither tiffdump tiffinfo tiffmedian tiffset tiffsplit
-
-.for file in ${BINFILES}
-BRANDFILES+= ${PREFIX}/usr/bin/${file}
-.endfor
-
-post-install:
- @${BRANDELF} -t Linux ${BRANDFILES}
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-tiff/distinfo.i386 b/graphics/linux-f10-tiff/distinfo.i386
index 7a27d5aee7d7..e5ae94ebb82e 100644
--- a/graphics/linux-f10-tiff/distinfo.i386
+++ b/graphics/linux-f10-tiff/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
-SHA256 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
-SIZE (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 9d67f8e29173588835406d3eb91e33a9
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = eb9432f77de2d21c97381f649b903551b2b2fa492f5c2bbf8395a7e9ebd8f7be
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 1095994
diff --git a/graphics/linux-f10-ungif/Makefile b/graphics/linux-f10-ungif/Makefile
index c3fff197ca4c..5c8218e4fc27 100644
--- a/graphics/linux-f10-ungif/Makefile
+++ b/graphics/linux-f10-ungif/Makefile
@@ -4,19 +4,19 @@
# $FreeBSD$
#
PORTNAME= ungif
-PORTVERSION= 4.1.0
-PORTREVISION= 3
+PORTVERSION= 4.1.3
CATEGORIES= graphics linux
+DISTNAME= libungif-${PORTVERSION}-1
MAINTAINTER= maho@FreeBSD.org
COMMENT= RPM of the ungif lib
NOT_FOR_ARCHS= amd64
-.if (${MACHINE_ARCH} == "i386")
-RPM_SET= libungif-4.1.0-7.${MACHINE_ARCH}.rpm
-.else
-RPM_SET= libungif-4.1.0-8.${MACHINE_ARCH}.rpm
-.endif
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-ungif/distinfo.alpha b/graphics/linux-f10-ungif/distinfo.alpha
deleted file mode 100644
index 6054d65663f5..000000000000
--- a/graphics/linux-f10-ungif/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libungif-4.1.0-8.alpha.rpm) = 60bdb595dcd4a7cff8943a7a513d5957
-SIZE (rpm/libungif-4.1.0-8.alpha.rpm) = 115455
diff --git a/graphics/linux-f10-ungif/distinfo.i386 b/graphics/linux-f10-ungif/distinfo.i386
index 7df2039f460a..cb837bcc44e2 100644
--- a/graphics/linux-f10-ungif/distinfo.i386
+++ b/graphics/linux-f10-ungif/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libungif-4.1.0-7.i386.rpm) = 4cf169c6fc0b69251c2e9ddaad5e2a71
-SIZE (rpm/libungif-4.1.0-7.i386.rpm) = 44699
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 35af56b8b6551e3087ab2fd496f55dac
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 2bd28a1c9d9e22f47f9fbeb4e9bf95a9294037eedb322f5e4cc410a43f41d65d
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 39722
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = a8bce6737125e66f2af311d6e6dc2997
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 47590b7d466edcab4bdfc58724f7c7379dc933677e9a4296eee457d0aa081b1b
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 447818
diff --git a/graphics/linux-f10-ungif/pkg-plist.alpha b/graphics/linux-f10-ungif/pkg-plist.alpha
deleted file mode 100644
index 7962c90ed21d..000000000000
--- a/graphics/linux-f10-ungif/pkg-plist.alpha
+++ /dev/null
@@ -1,20 +0,0 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
diff --git a/graphics/linux-f10-ungif/pkg-plist.i386 b/graphics/linux-f10-ungif/pkg-plist.i386
index 7962c90ed21d..8ec7dee5fa38 100644
--- a/graphics/linux-f10-ungif/pkg-plist.i386
+++ b/graphics/linux-f10-ungif/pkg-plist.i386
@@ -1,20 +1,14 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
+usr/lib/libgif.so.4
+usr/lib/libgif.so.%%PORTVERSION%%
+usr/lib/libungif.so.4
+usr/lib/libungif.so.%%PORTVERSION%%
+usr/share/doc/libungif-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libungif-%%PORTVERSION%%/BUGS
+usr/share/doc/libungif-%%PORTVERSION%%/COPYING
+usr/share/doc/libungif-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libungif-%%PORTVERSION%%/NEWS
+usr/share/doc/libungif-%%PORTVERSION%%/ONEWS
+usr/share/doc/libungif-%%PORTVERSION%%/README
+usr/share/doc/libungif-%%PORTVERSION%%/TODO
+usr/share/doc/libungif-%%PORTVERSION%%/UNCOMPRESSED_GIF
+@dirrm usr/share/doc/libungif-%%PORTVERSION%%
diff --git a/graphics/linux-f8-imlib/Makefile b/graphics/linux-f8-imlib/Makefile
index df6beaab5186..1ac1a642ea9b 100644
--- a/graphics/linux-f8-imlib/Makefile
+++ b/graphics/linux-f8-imlib/Makefile
@@ -6,13 +6,18 @@
#
PORTNAME= imlib
-PORTVERSION= 1.9.8.1
-PORTREVISION= 2
+PORTVERSION= 1.9.13
CATEGORIES= graphics linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-21
MAINTAINER= ports@FreeBSD.org
COMMENT= RPM of imlib
-RPM_SET= imlib-${PORTVERSION}-2.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-imlib/distinfo.alpha b/graphics/linux-f8-imlib/distinfo.alpha
deleted file mode 100644
index 13f2314b4a34..000000000000
--- a/graphics/linux-f8-imlib/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/imlib-1.9.8.1-2.alpha.rpm) = 1e55a013ac2058d1100393ec6e795fa4
-SIZE (rpm/imlib-1.9.8.1-2.alpha.rpm) = 525669
diff --git a/graphics/linux-f8-imlib/distinfo.i386 b/graphics/linux-f8-imlib/distinfo.i386
index a979248ec87a..e7a7b12e0f0e 100644
--- a/graphics/linux-f8-imlib/distinfo.i386
+++ b/graphics/linux-f8-imlib/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/imlib-1.9.8.1-2.i386.rpm) = 64a1a27bc1e276af8aecefa261ab9b3b
-SIZE (rpm/imlib-1.9.8.1-2.i386.rpm) = 162510
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 547f6292ad0b85281b79773ae81ec6fe
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 06f59a3497e001dfa92e549c3c69db6c8827af056c0757cb488f5689e042326b
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 403667
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 6925c73e807665ecb0c728b848350ee0
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 61e73dcf484730bf38a3ea873be30dedf08ac6793f21366ffd97e7c5a9e01ecf
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 773178
diff --git a/graphics/linux-f8-imlib/pkg-plist.alpha b/graphics/linux-f8-imlib/pkg-plist.alpha
deleted file mode 100644
index f19ff0727e49..000000000000
--- a/graphics/linux-f8-imlib/pkg-plist.alpha
+++ /dev/null
@@ -1,21 +0,0 @@
-etc/im_palette-small.pal
-etc/im_palette-tiny.pal
-etc/im_palette.pal
-etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
-usr/lib/libimlib-bmp.so
-usr/lib/libimlib-gif.so
-usr/lib/libimlib-jpeg.so
-usr/lib/libimlib-png.so
-usr/lib/libimlib-ppm.so
-usr/lib/libimlib-ps.so
-usr/lib/libimlib-tiff.so
-usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
-usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
diff --git a/graphics/linux-f8-imlib/pkg-plist.i386 b/graphics/linux-f8-imlib/pkg-plist.i386
index f19ff0727e49..414ff141244a 100644
--- a/graphics/linux-f8-imlib/pkg-plist.i386
+++ b/graphics/linux-f8-imlib/pkg-plist.i386
@@ -2,8 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
+usr/lib/libImlib.so.11.0.0
+usr/lib/libgdk_imlib.so.%%PORTVERSION%%
usr/lib/libimlib-bmp.so
usr/lib/libimlib-gif.so
usr/lib/libimlib-jpeg.so
@@ -12,10 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
+usr/share/doc/imlib-%%PORTVERSION%%/AUTHORS
+usr/share/doc/imlib-%%PORTVERSION%%/ChangeLog
+usr/share/doc/imlib-%%PORTVERSION%%/NEWS
+usr/share/doc/imlib-%%PORTVERSION%%/README
+usr/lib/libImlib.so.11
usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
+@dirrm usr/share/doc/imlib-%%PORTVERSION%%
diff --git a/graphics/linux-f8-jpeg/Makefile b/graphics/linux-f8-jpeg/Makefile
index 03de0fa8e4cd..b542ab05c935 100644
--- a/graphics/linux-f8-jpeg/Makefile
+++ b/graphics/linux-f8-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 <bsd.port.mk>
diff --git a/graphics/linux-f8-jpeg/distinfo.i386 b/graphics/linux-f8-jpeg/distinfo.i386
index 3de09d4b69b1..8a7321881584 100644
--- a/graphics/linux-f8-jpeg/distinfo.i386
+++ b/graphics/linux-f8-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-f8-jpeg/pkg-plist.i386 b/graphics/linux-f8-jpeg/pkg-plist
index c9c21d293f90..c9c21d293f90 100644
--- a/graphics/linux-f8-jpeg/pkg-plist.i386
+++ b/graphics/linux-f8-jpeg/pkg-plist
diff --git a/graphics/linux-f8-png/Makefile b/graphics/linux-f8-png/Makefile
index f827ffa4fdbb..12332642db94 100644
--- a/graphics/linux-f8-png/Makefile
+++ b/graphics/linux-f8-png/Makefile
@@ -7,18 +7,18 @@
PORTNAME= png
PORTVERSION= 1.2.8
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
+DISTNAME= libpng-${PORTVERSION}-1.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib
-DIST_SUBDIR= rpm/i386/fc3
# no alpha rpm is available
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= libpng-${PORTVERSION}-1.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= \
usr/lib/libpng.so.3 \
@@ -29,4 +29,4 @@ PLIST_FILES= \
DOCSDIR= ${PREFIX}/usr/share/doc/libpng-${PORTVERSION}
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-png/distinfo.i386 b/graphics/linux-f8-png/distinfo.i386
index 8dec2c825a09..48ed864c0a5a 100644
--- a/graphics/linux-f8-png/distinfo.i386
+++ b/graphics/linux-f8-png/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
-SHA256 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
-SIZE (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = c8c663262abf784cb176c5efd763587d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 415f069d18a88dffa4cac6e773070a0bd47204b4e1dcae194f2601b51509c080
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 397948
diff --git a/graphics/linux-f8-png10/Makefile b/graphics/linux-f8-png10/Makefile
index 5307a31714f5..7adefa0d6c88 100644
--- a/graphics/linux-f8-png10/Makefile
+++ b/graphics/linux-f8-png10/Makefile
@@ -7,23 +7,23 @@
PORTNAME= png
PORTVERSION= 1.0.16
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics linux
-MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
- http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
+DISTNAME= libpng10-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib (old 1.0 version)
LATEST_LINK= linux-png10
-DIST_SUBDIR= rpm/i386/fc3
ONLY_FOR_ARCHS= i386
-RPM_SET= libpng10-${PORTVERSION}-1.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= usr/lib/libpng.so.2.1.0.16 \
usr/lib/libpng.so.2
DOCSDIR= ${PREFIX}/usr/share/doc/libpng10-1.0.16
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-png10/distinfo.i386 b/graphics/linux-f8-png10/distinfo.i386
index 3fb95b9032b2..5dc28d08c979 100644
--- a/graphics/linux-f8-png10/distinfo.i386
+++ b/graphics/linux-f8-png10/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
-SIZE (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 6bbcf1ed1388357e3c81e13dd13e9e853603f3399c0366c6b940c82407bf3f4f
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 1174c6f9c2ba2326cae9cb6c61a3aeee
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 90f72ec8081e847a57e18186b8b8db1a46f442a442161ac3507a88ca4fddc186
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 388311
diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile
index 736756df7463..8e98c17b8750 100644
--- a/graphics/linux-f8-tiff/Makefile
+++ b/graphics/linux-f8-tiff/Makefile
@@ -7,11 +7,9 @@
PORTNAME= tiff
PORTVERSION= 3.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
-PKGNAMEPREFIX= linux-
+DISTNAME= libtiff-${PORTVERSION}-10.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= TIFF library, Linux/i386 binary
@@ -19,17 +17,10 @@ COMMENT= TIFF library, Linux/i386 binary
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
ONLY_FOR_ARCHS= amd64 i386
-RPM_SET= libtiff-${PORTVERSION}-10.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-BINFILES= fax2ps fax2tiff gif2tiff pal2rgb ppm2tiff ras2tiff raw2tiff \
- rgb2ycbcr thumbnail tiff2bw tiff2pdf tiff2ps tiff2rgba tiffcmp \
- tiffcp tiffdither tiffdump tiffinfo tiffmedian tiffset tiffsplit
-
-.for file in ${BINFILES}
-BRANDFILES+= ${PREFIX}/usr/bin/${file}
-.endfor
-
-post-install:
- @${BRANDELF} -t Linux ${BRANDFILES}
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-tiff/distinfo.i386 b/graphics/linux-f8-tiff/distinfo.i386
index 7a27d5aee7d7..e5ae94ebb82e 100644
--- a/graphics/linux-f8-tiff/distinfo.i386
+++ b/graphics/linux-f8-tiff/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
-SHA256 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
-SIZE (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 9d67f8e29173588835406d3eb91e33a9
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = eb9432f77de2d21c97381f649b903551b2b2fa492f5c2bbf8395a7e9ebd8f7be
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 1095994
diff --git a/graphics/linux-f8-ungif/Makefile b/graphics/linux-f8-ungif/Makefile
index c3fff197ca4c..5c8218e4fc27 100644
--- a/graphics/linux-f8-ungif/Makefile
+++ b/graphics/linux-f8-ungif/Makefile
@@ -4,19 +4,19 @@
# $FreeBSD$
#
PORTNAME= ungif
-PORTVERSION= 4.1.0
-PORTREVISION= 3
+PORTVERSION= 4.1.3
CATEGORIES= graphics linux
+DISTNAME= libungif-${PORTVERSION}-1
MAINTAINTER= maho@FreeBSD.org
COMMENT= RPM of the ungif lib
NOT_FOR_ARCHS= amd64
-.if (${MACHINE_ARCH} == "i386")
-RPM_SET= libungif-4.1.0-7.${MACHINE_ARCH}.rpm
-.else
-RPM_SET= libungif-4.1.0-8.${MACHINE_ARCH}.rpm
-.endif
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-ungif/distinfo.alpha b/graphics/linux-f8-ungif/distinfo.alpha
deleted file mode 100644
index 6054d65663f5..000000000000
--- a/graphics/linux-f8-ungif/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libungif-4.1.0-8.alpha.rpm) = 60bdb595dcd4a7cff8943a7a513d5957
-SIZE (rpm/libungif-4.1.0-8.alpha.rpm) = 115455
diff --git a/graphics/linux-f8-ungif/distinfo.i386 b/graphics/linux-f8-ungif/distinfo.i386
index 7df2039f460a..cb837bcc44e2 100644
--- a/graphics/linux-f8-ungif/distinfo.i386
+++ b/graphics/linux-f8-ungif/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libungif-4.1.0-7.i386.rpm) = 4cf169c6fc0b69251c2e9ddaad5e2a71
-SIZE (rpm/libungif-4.1.0-7.i386.rpm) = 44699
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 35af56b8b6551e3087ab2fd496f55dac
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 2bd28a1c9d9e22f47f9fbeb4e9bf95a9294037eedb322f5e4cc410a43f41d65d
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 39722
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = a8bce6737125e66f2af311d6e6dc2997
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 47590b7d466edcab4bdfc58724f7c7379dc933677e9a4296eee457d0aa081b1b
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 447818
diff --git a/graphics/linux-f8-ungif/pkg-plist.alpha b/graphics/linux-f8-ungif/pkg-plist.alpha
deleted file mode 100644
index 7962c90ed21d..000000000000
--- a/graphics/linux-f8-ungif/pkg-plist.alpha
+++ /dev/null
@@ -1,20 +0,0 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
diff --git a/graphics/linux-f8-ungif/pkg-plist.i386 b/graphics/linux-f8-ungif/pkg-plist.i386
index 7962c90ed21d..8ec7dee5fa38 100644
--- a/graphics/linux-f8-ungif/pkg-plist.i386
+++ b/graphics/linux-f8-ungif/pkg-plist.i386
@@ -1,20 +1,14 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
+usr/lib/libgif.so.4
+usr/lib/libgif.so.%%PORTVERSION%%
+usr/lib/libungif.so.4
+usr/lib/libungif.so.%%PORTVERSION%%
+usr/share/doc/libungif-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libungif-%%PORTVERSION%%/BUGS
+usr/share/doc/libungif-%%PORTVERSION%%/COPYING
+usr/share/doc/libungif-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libungif-%%PORTVERSION%%/NEWS
+usr/share/doc/libungif-%%PORTVERSION%%/ONEWS
+usr/share/doc/libungif-%%PORTVERSION%%/README
+usr/share/doc/libungif-%%PORTVERSION%%/TODO
+usr/share/doc/libungif-%%PORTVERSION%%/UNCOMPRESSED_GIF
+@dirrm usr/share/doc/libungif-%%PORTVERSION%%
diff --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile
index df6beaab5186..1ac1a642ea9b 100644
--- a/graphics/linux-imlib/Makefile
+++ b/graphics/linux-imlib/Makefile
@@ -6,13 +6,18 @@
#
PORTNAME= imlib
-PORTVERSION= 1.9.8.1
-PORTREVISION= 2
+PORTVERSION= 1.9.13
CATEGORIES= graphics linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-21
MAINTAINER= ports@FreeBSD.org
COMMENT= RPM of imlib
-RPM_SET= imlib-${PORTVERSION}-2.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-imlib/distinfo.alpha b/graphics/linux-imlib/distinfo.alpha
deleted file mode 100644
index 13f2314b4a34..000000000000
--- a/graphics/linux-imlib/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/imlib-1.9.8.1-2.alpha.rpm) = 1e55a013ac2058d1100393ec6e795fa4
-SIZE (rpm/imlib-1.9.8.1-2.alpha.rpm) = 525669
diff --git a/graphics/linux-imlib/distinfo.i386 b/graphics/linux-imlib/distinfo.i386
index a979248ec87a..e7a7b12e0f0e 100644
--- a/graphics/linux-imlib/distinfo.i386
+++ b/graphics/linux-imlib/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/imlib-1.9.8.1-2.i386.rpm) = 64a1a27bc1e276af8aecefa261ab9b3b
-SIZE (rpm/imlib-1.9.8.1-2.i386.rpm) = 162510
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 547f6292ad0b85281b79773ae81ec6fe
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 06f59a3497e001dfa92e549c3c69db6c8827af056c0757cb488f5689e042326b
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 403667
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 6925c73e807665ecb0c728b848350ee0
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 61e73dcf484730bf38a3ea873be30dedf08ac6793f21366ffd97e7c5a9e01ecf
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 773178
diff --git a/graphics/linux-imlib/pkg-plist.alpha b/graphics/linux-imlib/pkg-plist.alpha
deleted file mode 100644
index f19ff0727e49..000000000000
--- a/graphics/linux-imlib/pkg-plist.alpha
+++ /dev/null
@@ -1,21 +0,0 @@
-etc/im_palette-small.pal
-etc/im_palette-tiny.pal
-etc/im_palette.pal
-etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
-usr/lib/libimlib-bmp.so
-usr/lib/libimlib-gif.so
-usr/lib/libimlib-jpeg.so
-usr/lib/libimlib-png.so
-usr/lib/libimlib-ppm.so
-usr/lib/libimlib-ps.so
-usr/lib/libimlib-tiff.so
-usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
-usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
diff --git a/graphics/linux-imlib/pkg-plist.i386 b/graphics/linux-imlib/pkg-plist.i386
index f19ff0727e49..414ff141244a 100644
--- a/graphics/linux-imlib/pkg-plist.i386
+++ b/graphics/linux-imlib/pkg-plist.i386
@@ -2,8 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
+usr/lib/libImlib.so.11.0.0
+usr/lib/libgdk_imlib.so.%%PORTVERSION%%
usr/lib/libimlib-bmp.so
usr/lib/libimlib-gif.so
usr/lib/libimlib-jpeg.so
@@ -12,10 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
+usr/share/doc/imlib-%%PORTVERSION%%/AUTHORS
+usr/share/doc/imlib-%%PORTVERSION%%/ChangeLog
+usr/share/doc/imlib-%%PORTVERSION%%/NEWS
+usr/share/doc/imlib-%%PORTVERSION%%/README
+usr/lib/libImlib.so.11
usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
+@dirrm usr/share/doc/imlib-%%PORTVERSION%%
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 <bsd.port.mk>
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.i386 b/graphics/linux-jpeg/pkg-plist
index c9c21d293f90..c9c21d293f90 100644
--- a/graphics/linux-jpeg/pkg-plist.i386
+++ b/graphics/linux-jpeg/pkg-plist
diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile
index f827ffa4fdbb..12332642db94 100644
--- a/graphics/linux-png/Makefile
+++ b/graphics/linux-png/Makefile
@@ -7,18 +7,18 @@
PORTNAME= png
PORTVERSION= 1.2.8
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
+DISTNAME= libpng-${PORTVERSION}-1.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib
-DIST_SUBDIR= rpm/i386/fc3
# no alpha rpm is available
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= libpng-${PORTVERSION}-1.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= \
usr/lib/libpng.so.3 \
@@ -29,4 +29,4 @@ PLIST_FILES= \
DOCSDIR= ${PREFIX}/usr/share/doc/libpng-${PORTVERSION}
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-png/distinfo.i386 b/graphics/linux-png/distinfo.i386
index 8dec2c825a09..48ed864c0a5a 100644
--- a/graphics/linux-png/distinfo.i386
+++ b/graphics/linux-png/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
-SHA256 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
-SIZE (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = c8c663262abf784cb176c5efd763587d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 415f069d18a88dffa4cac6e773070a0bd47204b4e1dcae194f2601b51509c080
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 397948
diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile
index 5307a31714f5..7adefa0d6c88 100644
--- a/graphics/linux-png10/Makefile
+++ b/graphics/linux-png10/Makefile
@@ -7,23 +7,23 @@
PORTNAME= png
PORTVERSION= 1.0.16
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics linux
-MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
- http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
+DISTNAME= libpng10-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib (old 1.0 version)
LATEST_LINK= linux-png10
-DIST_SUBDIR= rpm/i386/fc3
ONLY_FOR_ARCHS= i386
-RPM_SET= libpng10-${PORTVERSION}-1.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= usr/lib/libpng.so.2.1.0.16 \
usr/lib/libpng.so.2
DOCSDIR= ${PREFIX}/usr/share/doc/libpng10-1.0.16
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-png10/distinfo.i386 b/graphics/linux-png10/distinfo.i386
index 3fb95b9032b2..5dc28d08c979 100644
--- a/graphics/linux-png10/distinfo.i386
+++ b/graphics/linux-png10/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
-SIZE (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 6bbcf1ed1388357e3c81e13dd13e9e853603f3399c0366c6b940c82407bf3f4f
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 1174c6f9c2ba2326cae9cb6c61a3aeee
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 90f72ec8081e847a57e18186b8b8db1a46f442a442161ac3507a88ca4fddc186
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 388311
diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile
index 736756df7463..8e98c17b8750 100644
--- a/graphics/linux-tiff/Makefile
+++ b/graphics/linux-tiff/Makefile
@@ -7,11 +7,9 @@
PORTNAME= tiff
PORTVERSION= 3.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
-PKGNAMEPREFIX= linux-
+DISTNAME= libtiff-${PORTVERSION}-10.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= TIFF library, Linux/i386 binary
@@ -19,17 +17,10 @@ COMMENT= TIFF library, Linux/i386 binary
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
ONLY_FOR_ARCHS= amd64 i386
-RPM_SET= libtiff-${PORTVERSION}-10.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-BINFILES= fax2ps fax2tiff gif2tiff pal2rgb ppm2tiff ras2tiff raw2tiff \
- rgb2ycbcr thumbnail tiff2bw tiff2pdf tiff2ps tiff2rgba tiffcmp \
- tiffcp tiffdither tiffdump tiffinfo tiffmedian tiffset tiffsplit
-
-.for file in ${BINFILES}
-BRANDFILES+= ${PREFIX}/usr/bin/${file}
-.endfor
-
-post-install:
- @${BRANDELF} -t Linux ${BRANDFILES}
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-tiff/distinfo.i386 b/graphics/linux-tiff/distinfo.i386
index 7a27d5aee7d7..e5ae94ebb82e 100644
--- a/graphics/linux-tiff/distinfo.i386
+++ b/graphics/linux-tiff/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
-SHA256 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
-SIZE (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 9d67f8e29173588835406d3eb91e33a9
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = eb9432f77de2d21c97381f649b903551b2b2fa492f5c2bbf8395a7e9ebd8f7be
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 1095994
diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile
index c3fff197ca4c..5c8218e4fc27 100644
--- a/graphics/linux-ungif/Makefile
+++ b/graphics/linux-ungif/Makefile
@@ -4,19 +4,19 @@
# $FreeBSD$
#
PORTNAME= ungif
-PORTVERSION= 4.1.0
-PORTREVISION= 3
+PORTVERSION= 4.1.3
CATEGORIES= graphics linux
+DISTNAME= libungif-${PORTVERSION}-1
MAINTAINTER= maho@FreeBSD.org
COMMENT= RPM of the ungif lib
NOT_FOR_ARCHS= amd64
-.if (${MACHINE_ARCH} == "i386")
-RPM_SET= libungif-4.1.0-7.${MACHINE_ARCH}.rpm
-.else
-RPM_SET= libungif-4.1.0-8.${MACHINE_ARCH}.rpm
-.endif
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-ungif/distinfo.alpha b/graphics/linux-ungif/distinfo.alpha
deleted file mode 100644
index 6054d65663f5..000000000000
--- a/graphics/linux-ungif/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libungif-4.1.0-8.alpha.rpm) = 60bdb595dcd4a7cff8943a7a513d5957
-SIZE (rpm/libungif-4.1.0-8.alpha.rpm) = 115455
diff --git a/graphics/linux-ungif/distinfo.i386 b/graphics/linux-ungif/distinfo.i386
index 7df2039f460a..cb837bcc44e2 100644
--- a/graphics/linux-ungif/distinfo.i386
+++ b/graphics/linux-ungif/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libungif-4.1.0-7.i386.rpm) = 4cf169c6fc0b69251c2e9ddaad5e2a71
-SIZE (rpm/libungif-4.1.0-7.i386.rpm) = 44699
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 35af56b8b6551e3087ab2fd496f55dac
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 2bd28a1c9d9e22f47f9fbeb4e9bf95a9294037eedb322f5e4cc410a43f41d65d
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 39722
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = a8bce6737125e66f2af311d6e6dc2997
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 47590b7d466edcab4bdfc58724f7c7379dc933677e9a4296eee457d0aa081b1b
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 447818
diff --git a/graphics/linux-ungif/pkg-plist.alpha b/graphics/linux-ungif/pkg-plist.alpha
deleted file mode 100644
index 7962c90ed21d..000000000000
--- a/graphics/linux-ungif/pkg-plist.alpha
+++ /dev/null
@@ -1,20 +0,0 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
diff --git a/graphics/linux-ungif/pkg-plist.i386 b/graphics/linux-ungif/pkg-plist.i386
index 7962c90ed21d..8ec7dee5fa38 100644
--- a/graphics/linux-ungif/pkg-plist.i386
+++ b/graphics/linux-ungif/pkg-plist.i386
@@ -1,20 +1,14 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
+usr/lib/libgif.so.4
+usr/lib/libgif.so.%%PORTVERSION%%
+usr/lib/libungif.so.4
+usr/lib/libungif.so.%%PORTVERSION%%
+usr/share/doc/libungif-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libungif-%%PORTVERSION%%/BUGS
+usr/share/doc/libungif-%%PORTVERSION%%/COPYING
+usr/share/doc/libungif-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libungif-%%PORTVERSION%%/NEWS
+usr/share/doc/libungif-%%PORTVERSION%%/ONEWS
+usr/share/doc/libungif-%%PORTVERSION%%/README
+usr/share/doc/libungif-%%PORTVERSION%%/TODO
+usr/share/doc/libungif-%%PORTVERSION%%/UNCOMPRESSED_GIF
+@dirrm usr/share/doc/libungif-%%PORTVERSION%%