ports/96420: [PATCH] graphics/png: fix pkg-plist on FreeBSD before Dec 21, 2004

[Rong-En Fan]

>Number:         96420
>Category:       ports
>Synopsis:       [PATCH] graphics/png: fix pkg-plist on FreeBSD before Dec 21, 2004
>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:   Thu Apr 27 16:20:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Rong-En Fan
>Release:        FreeBSD 6.0
>Organization:
NTU CSIE
>Environment:
>Description:
PR/96244 proposed to use the new favor NO_* and committed. However,
this only applied to FreeBSD after Dec 21, 2004, when NO* -> NO_*
conversion happens, bsd.compat.mk was added. 

For those 4.x, 5.x users, graphics/png will build a profiled library
libpng_p.a, so the pkg-plist is incomplete. In these versions,
bsd.lib.mk still uses NOPROFILE, not NO_PROFILE, for example.

Port maintainer (ache at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
Set NO* or NO_* based on __FreeEBSD_version__. However, there is no
version for this conversion. So I choose the closed one, 600008, which
happend on Jan 25, 2005 (about one month later).

Tested on 4.11-RELEASE (492000), 5.5-PRERELEASE (504104), and
6.0-RELEASE (600034).

Also, make portlint(1) happy about PATCH_SITES.

--- png-1.2.8_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/png/Makefile /home/rafan/tmp/ports/png/Makefile
--- /usr/ports/graphics/png/Makefile	Fri Feb 10 03:43:11 2006
+++ /home/rafan/tmp/ports/png/Makefile	Thu Apr 27 23:57:42 2006
@@ -12,6 +12,7 @@
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lib${PORTNAME}
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
+
 PATCH_SITES=	${MASTER_SITES}
 #PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 #PATCHFILES=
diff -ruN --exclude=CVS /usr/ports/graphics/png/files/patch-aa /home/rafan/tmp/ports/png/files/patch-aa
--- /usr/ports/graphics/png/files/patch-aa	Tue Apr 25 04:19:44 2006
+++ /home/rafan/tmp/ports/png/files/patch-aa	Thu Apr 27 23:55:01 2006
@@ -1,13 +1,17 @@
---- scripts/makefile.freebsd.orig	Sat May 18 18:46:45 2002
-+++ scripts/makefile.freebsd	Mon Apr 24 17:59:39 2006
-@@ -8,26 +8,26 @@
+--- scripts/makefile.freebsd.orig	Sat May 18 22:46:45 2002
++++ scripts/makefile.freebsd	Thu Apr 27 23:54:36 2006
+@@ -8,26 +8,31 @@
  LIB=		png
  SHLIB_MAJOR=	${SHLIB_VER}
  SHLIB_MINOR=	0
--NOPROFILE=	YES
--NOOBJ=          YES
++.if (${OSVERSION} > 600007)
 +NO_PROFILE=	YES
 +NO_OBJ=		YES
++.else
+ NOPROFILE=	YES
+-NOOBJ=          YES
++NOOBJ=		YES
++.endif
  
  # where make install puts libpng.a and png.h
 -DESTDIR=	${PREFIX}
@@ -36,7 +40,7 @@
  
  SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
  	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
-@@ -44,5 +44,23 @@
+@@ -44,5 +49,23 @@
  DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
  writelock:
  	chmod a-w *.[ch35] $(DOCS) scripts/*
--- png-1.2.8_3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: