upgrade to png 1.2.2
-- headers have been moved from include/ to include/libpng/. for the short term sym-links have been created in include/ but will be removed once all ports have been checked. porters should @comment out the sym-links to check ports locally.
This commit is contained in:
brad
parent
220c8232ff
commit
b65440c52c
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.37 2002/02/07 04:50:55 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.38 2002/04/26 02:19:04 brad Exp $
|
||||
|
||||
COMMENT= "library for manipulating PNG images"
|
||||
|
||||
DISTNAME= libpng-1.2.1
|
||||
DISTNAME= libpng-1.2.2
|
||||
PKGNAME= ${DISTNAME:S/lib//}
|
||||
CATEGORIES= graphics
|
||||
NEED_VERSION= 1.500
|
||||
NEED_VERSION= 1.522
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= libpng
|
||||
|
||||
@ -25,7 +25,12 @@ MAKE_FILE= scripts/makefile.openbsd
|
||||
|
||||
REGRESS_TARGET= test
|
||||
|
||||
post-extract:
|
||||
@cp -f ${FILESDIR}/makefile.openbsd ${WRKSRC}/scripts
|
||||
# short term compatibility sym-links
|
||||
# will be removed once all ports have been checked
|
||||
# for proper operation without the sym-links
|
||||
post-install:
|
||||
@cd ${PREFIX}/include && \
|
||||
ln -sf libpng/png.h png.h && \
|
||||
ln -sf libpng/pngconf.h pngconf.h
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (libpng-1.2.1.tar.gz) = 75a21cbfae566158a0ac6d9f39087c4d
|
||||
RMD160 (libpng-1.2.1.tar.gz) = 028d64f126cc5689620baa6c9c4cfab676823b33
|
||||
SHA1 (libpng-1.2.1.tar.gz) = 829dd4e00cc463dd3fa471032a9836cbff07aea5
|
||||
MD5 (libpng-1.2.2.tar.gz) = 4a23be1a1752537ec3bf210bb3fd03ad
|
||||
RMD160 (libpng-1.2.2.tar.gz) = 036c5bf28086cb2369760052781a686e3ee3784d
|
||||
SHA1 (libpng-1.2.2.tar.gz) = 0eae122ed275320056c7eb7046fc30f68c828399
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
# makefile for libpng
|
||||
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
|
||||
# For conditions of distribution and use, see copyright notice in png.h
|
||||
|
||||
PREFIX?= /usr/local
|
||||
LIBDIR= ${PREFIX}/lib
|
||||
MANDIR= ${PREFIX}/man/cat
|
||||
|
||||
SHLIB_MAJOR= 3
|
||||
SHLIB_MINOR= 0
|
||||
|
||||
LIB= png
|
||||
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
|
||||
pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \
|
||||
pngwio.c pngwrite.c pngwtran.c pngwutil.c
|
||||
|
||||
HDRS= png.h pngconf.h
|
||||
|
||||
CFLAGS+= -Wall
|
||||
CPPFLAGS+= -I${.CURDIR} -DPNG_NO_ASSEMBLER_CODE -DPNG_USE_PNGGCCRD
|
||||
LDADD= -lz
|
||||
|
||||
NOPROFILE= Yes
|
||||
|
||||
CLEANFILES+= pngtest.o pngtest
|
||||
|
||||
MAN= libpng.3 libpngpf.3 png.5
|
||||
DOCS= ANNOUNCE CHANGES LICENSE README libpng.txt
|
||||
|
||||
pngtest.o: pngtest.c
|
||||
${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
|
||||
|
||||
pngtest: pngtest.o
|
||||
${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm
|
||||
|
||||
test: pngtest
|
||||
cd ${.OBJDIR} && env \
|
||||
LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest
|
||||
|
||||
beforeinstall:
|
||||
if [ ! -d ${DESTDIR}${PREFIX}/include ]; then \
|
||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \
|
||||
fi
|
||||
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
|
||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
|
||||
fi
|
||||
if [ ! -d ${DESTDIR}${LIBDIR}/debug ]; then \
|
||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}/debug; \
|
||||
fi
|
||||
if [ ! -d ${DESTDIR}${MANDIR}3 ]; then \
|
||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}3; \
|
||||
fi
|
||||
if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
|
||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
|
||||
fi
|
||||
if [ ! -d ${DESTDIR}${PREFIX}/share/doc/png ]; then \
|
||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/share/doc/png; \
|
||||
fi
|
||||
|
||||
afterinstall:
|
||||
@rm -f ${DESTDIR}${LIBDIR}/libpng_pic.a
|
||||
@rm -f ${DESTDIR}${LIBDIR}/debug/libpng.a
|
||||
@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
|
||||
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||
-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include
|
||||
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||
-m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
66
graphics/png/patches/patch-scripts_makefile_openbsd
Normal file
66
graphics/png/patches/patch-scripts_makefile_openbsd
Normal file
@ -0,0 +1,66 @@
|
||||
$OpenBSD: patch-scripts_makefile_openbsd,v 1.1 2002/04/26 02:19:04 brad Exp $
|
||||
--- scripts/makefile.openbsd.orig Mon Apr 15 10:25:46 2002
|
||||
+++ scripts/makefile.openbsd Sun Apr 21 16:16:34 2002
|
||||
@@ -1,13 +1,15 @@
|
||||
-# makefile for libpng
|
||||
+# makefile for libpng under OpenBSD
|
||||
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
|
||||
# For conditions of distribution and use, see copyright notice in png.h
|
||||
|
||||
PREFIX?= /usr/local
|
||||
LIBDIR= ${PREFIX}/lib
|
||||
-MANDIR= ${PREFIX}/man/cat
|
||||
+MANDIR= ${PREFIX}/man/cat
|
||||
+INCDIR= ${PREFIX}/include/libpng
|
||||
+DOCDIR= ${PREFIX}/share/doc/png
|
||||
|
||||
-SHLIB_MAJOR= 0
|
||||
-SHLIB_MINOR= 1.2.2
|
||||
+SHLIB_MAJOR= 3
|
||||
+SHLIB_MINOR= 0
|
||||
|
||||
LIB= png
|
||||
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \
|
||||
@@ -18,6 +20,7 @@ HDRS= png.h pngconf.h
|
||||
|
||||
CFLAGS+= -Wall
|
||||
CPPFLAGS+= -I${.CURDIR} -DPNG_NO_ASSEMBLER_CODE -DPNG_USE_PNGGCCRD
|
||||
+LDADD= -lz
|
||||
|
||||
NOPROFILE= Yes
|
||||
|
||||
@@ -37,8 +40,8 @@ test: pngtest
|
||||
LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest
|
||||
|
||||
beforeinstall:
|
||||
- if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \
|
||||
- ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include/libpng; \
|
||||
+ if [ ! -d ${DESTDIR}${INCDIR} ]; then \
|
||||
+ ${INSTALL} -d -o root -g wheel ${DESTDIR}${INCDIR}; \
|
||||
fi
|
||||
if [ ! -d ${DESTDIR}${LIBDIR} ]; then \
|
||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \
|
||||
@@ -52,19 +55,17 @@ beforeinstall:
|
||||
if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
|
||||
${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \
|
||||
fi
|
||||
- if [ ! -d ${DESTDIR}${PREFIX}/share/doc/png ]; then \
|
||||
- ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/share/doc/png; \
|
||||
+ if [ ! -d ${DESTDIR}${DOCDIR} ]; then \
|
||||
+ ${INSTALL} -d -o root -g wheel ${DESTDIR}${DOCDIR}; \
|
||||
fi
|
||||
|
||||
afterinstall:
|
||||
@rm -f ${DESTDIR}${LIBDIR}/libpng_pic.a
|
||||
@rm -f ${DESTDIR}${LIBDIR}/debug/libpng.a
|
||||
- @rm -f ${DESTDIR}${PREFIX}/include/png.h
|
||||
- @rm -f ${DESTDIR}${PREFIX}/include/pngconf.h
|
||||
@rmdir ${DESTDIR}${LIBDIR}/debug 2>/dev/null || true
|
||||
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||
- -m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include/libpng
|
||||
+ -m ${NONBINMODE} ${HDRS} ${DESTDIR}${INCDIR}
|
||||
${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||
- -m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png
|
||||
+ -m ${NONBINMODE} ${DOCS} ${DESTDIR}${DOCDIR}
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
@ -1,6 +1,8 @@
|
||||
@comment $OpenBSD: PLIST,v 1.12 2001/11/19 02:40:52 brad Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.13 2002/04/26 02:19:04 brad Exp $
|
||||
include/png.h
|
||||
include/pngconf.h
|
||||
include/libpng/png.h
|
||||
include/libpng/pngconf.h
|
||||
lib/libpng.a
|
||||
%%SHARED%%
|
||||
man/cat3/libpng.0
|
||||
@ -12,3 +14,4 @@ share/doc/png/LICENSE
|
||||
share/doc/png/README
|
||||
share/doc/png/libpng.txt
|
||||
@dirrm share/doc/png
|
||||
@dirrm include/libpng
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user