Index: Makefile
===================================================================
--- Makefile	(revision 375353)
+++ Makefile	(working copy)
@@ -19,7 +19,6 @@
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DPNG_MAN_DIR:STRING=man
-SOSUFFIX=	.${PORTVERSION:E}
 
 OPTIONS_DEFINE=APNG PNGTEST
 OPTIONS_DEFAULT=APNG PNGTEST
@@ -46,7 +45,6 @@
 
 post-patch:
 	${REINPLACE_CMD} \
-		-e 's|RELEASE}.0|RELEASE}|' \
 		-e 's|LIBDIR}/pkgconfig|LIBDIR}data/pkgconfig|' \
 		${WRKSRC}/CMakeLists.txt
 
@@ -70,9 +68,5 @@
 		${WRKSRC}/pngpriv.h ${WRKSRC}/pngstruct.h \
 		${STAGEDIR}${PREFIX}/include/libpng15/
 	-${RMDIR} ${STAGEDIR}${PREFIX}/include/libpng
-	${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpng.pc
-	${LN} -sf libpng15.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpng.pc
-	${RM} ${STAGEDIR}${PREFIX}/lib/libpng15.so.15
-	${MV} ${STAGEDIR}${PREFIX}/lib/libpng15.so.15${SOSUFFIX} ${STAGEDIR}${PREFIX}/lib/libpng15.so.15
 
 .include <bsd.port.mk>
Index: files/patch-makefile.freebsd
===================================================================
--- files/patch-makefile.freebsd	(revision 375353)
+++ files/patch-makefile.freebsd	(working copy)
@@ -1,43 +0,0 @@
---- scripts/makefile.freebsd.orig	2012-06-14 13:28:01.000000000 +0200
-+++ scripts/makefile.freebsd	2012-06-20 21:11:47.000000000 +0200
-@@ -15,13 +15,13 @@
- NO_OBJ=          YES
- 
- # where make install puts libpng.a and png.h
--DESTDIR=	${PREFIX}
--LIBDIR=		/lib
-+#DESTDIR=	${PREFIX}
-+LIBDIR=		${PREFIX}/lib
- INCS=		png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
--INCSDIR=	/include/libpng
-+INCSDIR=	${PREFIX}/include/libpng
- INCDIR=		${INCSDIR}		# for 4.x bsd.lib.mk
- MAN=		libpng.3 libpngpf.3 png.5
--MANDIR=		/man/man
-+MANDIR=		${PREFIX}/man/man
- SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \
- 		libpng/pngconf.h ${INCSDIR}/../pngconf.h \
- 		libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h
-@@ -53,4 +53,22 @@
- writelock:
- 	chmod a-w *.[ch35] $(DOCS) scripts/*
- 
-+libpng-config:
-+	( cat scripts/libpng-config-head.in; \
-+	echo prefix=\"${PREFIX}\"; \
-+	echo libdir=\"${LIBDIR}\"; \
-+	echo ccopts=\"${ccopts}\"; \
-+	echo cppflags=\"${cppflags}\"; \
-+	echo I_opts=\"-I${INCSDIR}\"; \
-+	echo L_opts=\"-L${LIBDIR}\"; \
-+	echo libs=\"-lpng -lz -lm\"; \
-+	echo ldopts=\"${ldopts}\"; \
-+	cat scripts/libpng-config-body.in ) > libpng-config
-+	chmod +x libpng-config
-+
-+beforeinstall: libpng-config
-+	${BSD_INSTALL_SCRIPT} \
-+		libpng-config ${PREFIX}/bin
-+	ln -sf libpng-config ${PREFIX}/bin/libpng15-config
-+
- .include <bsd.lib.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 375353)
+++ pkg-plist	(working copy)
@@ -19,6 +19,7 @@
 lib/libpng15.a
 lib/libpng15.so
 lib/libpng15.so.15
+lib/libpng15.so.15.21.0
 man/man3/libpng.3.gz
 man/man3/libpngpf.3.gz
 man/man5/png.5.gz