5 files changed, 21 insertions, 100 deletions

diff --git a/graphics/libmng/Makefile b/graphics/libmng/Makefile
index 14697f5489ce..870e9baf7052 100644
--- a/graphics/libmng/Makefile
+++ b/graphics/libmng/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libmng
-PORTVERSION=	0.9.3
+PORTVERSION=	1.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.3-t.com/libmng/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -18,16 +18,10 @@ MAINTAINER=	mi@aldan.algebra.com
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		lcms:${PORTSDIR}/graphics/lcms
 
-SHLIB_VER=	0
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
+MAKEFILE=	${FILESDIR}/Makefile.bsd
+MAKE_ARGS+=	-j2
 
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-jpeg=${LOCALBASE} \
-		--with-lcms=${LOCALBASE}
-
-PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 
 MAN3=		libmng.3
 MAN5=		mng.5 jng.5
diff --git a/graphics/libmng/distinfo b/graphics/libmng/distinfo
index ceb87a08e95e..9fa258544b07 100644
--- a/graphics/libmng/distinfo
+++ b/graphics/libmng/distinfo
@@ -1 +1 @@
-MD5 (libmng-0.9.3.tar.gz) = 2fbb9fbfbcd1b649ca645e98d85aabf1
+MD5 (libmng-1.0.0.tar.gz) = 54c9cb5bf9aa5f76dfa4d63cddea539a
diff --git a/graphics/libmng/files/Makefile.bsd b/graphics/libmng/files/Makefile.bsd
new file mode 100644
index 000000000000..eee8c306e901
--- /dev/null
+++ b/graphics/libmng/files/Makefile.bsd
@@ -0,0 +1,16 @@
+LIB=	mng
+
+NOPROFILE=	yes
+SHLIB_MAJOR?=	1
+SHLIB_MINOR?=	0
+
+LOBJS!=		make -f ${.CURDIR}/Makefile.in -V libmng_la_OBJECTS
+SRCS=		${LOBJS:.lo=.c}
+
+CFLAGS+=	-I${INCDIR}
+
+INCS=		libmng.h libmng_conf.h libmng_types.h
+INCDIR=		${LOCALBASE}/include
+LIBDIR=		${LOCALBASE}/lib
+
+.include <bsd.lib.mk>
diff --git a/graphics/libmng/files/patch-aa b/graphics/libmng/files/patch-aa
deleted file mode 100644
index c276b4f557e7..000000000000
--- a/graphics/libmng/files/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure	Sun Oct 29 05:02:00 2000
-+++ configure	Thu Nov  2 11:31:45 2000
-@@ -2664,67 +2664,3 @@
- 
--  ac_safe=`echo "lcms/lcms.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for lcms/lcms.h""... $ac_c" 1>&6
--echo "configure:2668: checking for lcms/lcms.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 2673 "configure"
--#include "confdefs.h"
--#include <lcms/lcms.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
--fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  echo $ac_n "checking for cmsCreateRGBProfile in -llcms""... $ac_c" 1>&6
--echo "configure:2695: checking for cmsCreateRGBProfile in -llcms" >&5
--ac_lib_var=`echo lcms'_'cmsCreateRGBProfile | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-llcms  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2703 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char cmsCreateRGBProfile();
--
--int main() {
--cmsCreateRGBProfile()
--; return 0; }
--EOF
--if { (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  
--      LIBS="$LIBS -llcms"
-+  LIBS="$LIBS -llcms"
-       cat >> confdefs.h <<\EOF
-@@ -2737,3 +2673,2 @@
- 
--    
- else
-@@ -2745,13 +2680,2 @@
- fi
--
--  
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--
--  test $_restore -eq 1 && CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
--
--fi
--
- 
diff --git a/graphics/libmng/pkg-plist b/graphics/libmng/pkg-plist
index e2be30c4ca13..097357b6b54a 100644
--- a/graphics/libmng/pkg-plist
+++ b/graphics/libmng/pkg-plist
@@ -3,4 +3,4 @@ include/libmng_conf.h
 include/libmng_types.h
 lib/libmng.a
 lib/libmng.so
-lib/libmng.so.%%SHLIB_VER%%
+lib/libmng.so.1.0