ports/74186: ports/graphics/linux-png / linux-png10 DIST_SUBDIR Path incorrectly

[tjs]

>Number:         74186
>Category:       ports
>Synopsis:       ports/graphics/linux-png / linux-png10 DIST_SUBDIR Path incorrectly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 21 03:00:51 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jin-Shan Tseng
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
NSYSU-CDPA
>Environment:
System: FreeBSD Pluto.CDPA.nsysu.edu.tw 5.3-STABLE FreeBSD 5.3-STABLE #0: Tue Nov 9 03:25:43 CST 2004 tjs at Pluto.CDPA.nsysu.edu.tw:/usr/obj/usr/src/sys/Pluto i386


>Description:
        ports/graphics/linux-png / linux-png10 DIST_SUBDIR Path incorrectly
>How-To-Repeat:
        cd /usr/ports/graphics/linux-png / linux-png10 and make fetch

>Fix:
    .include "../../x11-toolkits/linux-gtk/Makefile" will overwirte DIST_SUBDIR

--- ports/graphics/linux-png/Makefile.orig       Sun Nov 21 10:37:21 2004
+++ ports/graphics/linux-png/Makefile    Sun Nov 21 10:38:20 2004
@@ -14,7 +14,7 @@
 MAINTAINER=    ports at FreeBSD.org
 COMMENT=       RPM of the PNG lib

-DIST_SUBDIR=   rpm/i386/fc3
 # no alpha rpm is available
 ONLY_FOR_ARCHS=        i386
 RPM_SET=       libpng-${PORTVERSION}-1.i386.rpm

--- ports/graphics/linux-png/distinfo.i386.orig  Sun Nov 21 10:37:26 2004
+++ ports/graphics/linux-png/distinfo.i386       Sun Nov 21 10:38:54 2004
@@ -1,2 +1,2 @@
-MD5 (rpm/i386/fc3/libpng-1.2.7-1.i386.rpm) = 47d1b7cfeb21648e620127adbf036150
-SIZE (rpm/i386/fc3/libpng-1.2.7-1.i386.rpm) = 158081
+MD5 (rpm/libpng-1.2.7-1.i386.rpm) = 47d1b7cfeb21648e620127adbf036150
+SIZE (rpm/libpng-1.2.7-1.i386.rpm) = 158081

--- ports/graphics/linux-png10/Makefile.orig       Sun Nov 21 10:56:31 2004
+++ ports/graphics/linux-png10/Makefile    Sun Nov 21 10:56:42 2004
@@ -16,7 +16,7 @@

 LATEST_LINK=   linux-png10

-DIST_SUBDIR=   rpm/i386/fc3
 ONLY_FOR_ARCHS=        i386
 RPM_SET=       libpng10-${PORTVERSION}-1.i386.rpm

--- distinfo.i386.orig  Sun Nov 21 10:56:35 2004
+++ distinfo.i386       Sun Nov 21 10:56:55 2004
@@ -1,2 +1,2 @@
-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/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
+SIZE (rpm/libpng10-1.0.16-1.i386.rpm) = 150813

>Release-Note:
>Audit-Trail:
>Unformatted:
 >> rpm/libpng-1.2.7-1.i386.rpm is not in /home/ports/graphics/linux-png/distinfo.i386.
 >> Either /home/ports/graphics/linux-png/distinfo.i386 is out of date, or
 >> rpm/libpng-1.2.7-1.i386.rpm is spelled incorrectly.
 >> *** Error code 1
 >>
 
 >> rpm/libpng10-1.0.16-1.i386.rpm is not in /home/ports/graphics/linux-png10/distinfo.i386.
 >> Either /home/ports/graphics/linux-png10/distinfo.i386 is out of date, or
 >> rpm/libpng10-1.0.16-1.i386.rpm is spelled incorrectly.
 >> *** Error code 1
 >>