svn commit: r565546 - in head/graphics/jbig2dec: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Wed Feb 17 18:01:08 2021
New Revision: 565546
URL: https://svnweb.freebsd.org/changeset/ports/565546

Log:
  Remoce USES=autoreconf
  
  It is not needed after switching to upstream release tarball (r545843).

Added:
  head/graphics/jbig2dec/files/patch-Makefile.in
     - copied, changed from r565545, head/graphics/jbig2dec/files/patch-Makefile.am
  head/graphics/jbig2dec/files/patch-configure
     - copied, changed from r565545, head/graphics/jbig2dec/files/patch-configure.ac.in
Deleted:
  head/graphics/jbig2dec/files/patch-Makefile.am
  head/graphics/jbig2dec/files/patch-configure.ac.in
Modified:
  head/graphics/jbig2dec/Makefile

Modified: head/graphics/jbig2dec/Makefile
==============================================================================
--- head/graphics/jbig2dec/Makefile	Wed Feb 17 18:01:00 2021	(r565545)
+++ head/graphics/jbig2dec/Makefile	Wed Feb 17 18:01:08 2021	(r565546)
@@ -11,7 +11,7 @@ COMMENT=	Decoder implementation of the JBIG2 image com
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf libtool
+USES=		libtool
 
 CONFIGURE_ENV=	ac_cv_func_getopt_long=yes
 GNU_CONFIGURE=	yes
@@ -28,8 +28,5 @@ PNG_LIB_DEPENDS=	libpng.so:graphics/png
 post-patch:
 	@${RM} ${WRKSRC}/getopt* ${WRKSRC}/sha1.h
 	@${REINPLACE_CMD} -E 's|SHA1_Final\( *([^,]+), *([^\)]+)\)|SHA1_Final(\2, \1)|' ${WRKSRC}/jbig2dec.c ${WRKSRC}/sha1.c
-
-pre-configure:
-	@cd ${WRKSRC}/ && ${SH} autogen.sh
 
 .include <bsd.port.mk>

Copied and modified: head/graphics/jbig2dec/files/patch-Makefile.in (from r565545, head/graphics/jbig2dec/files/patch-Makefile.am)
==============================================================================
--- head/graphics/jbig2dec/files/patch-Makefile.am	Wed Feb 17 18:01:00 2021	(r565545, copy source)
+++ head/graphics/jbig2dec/files/patch-Makefile.in	Wed Feb 17 18:01:08 2021	(r565546)
@@ -1,27 +1,26 @@
---- Makefile.am.orig	2020-02-11 16:28:00 UTC
-+++ Makefile.am
-@@ -28,10 +28,10 @@ libjbig2dec_la_SOURCES = jbig2.c \
- bin_PROGRAMS = jbig2dec
- noinst_PROGRAMS = test_sha1 test_huffman test_arith
+--- Makefile.in.orig	2020-09-10 16:29:31 UTC
++++ Makefile.in
+@@ -611,18 +611,19 @@ libjbig2dec_la_SOURCES = jbig2.c \
+ 	jbig2_generic.h jbig2_symbol_dict.h jbig2_text.h \
+ 	memento.c memento.h
  
 -jbig2dec_SOURCES = jbig2dec.c sha1.c sha1.h \
 -	jbig2.h jbig2_image.h getopt.h \
-+jbig2dec_SOURCES = jbig2dec.c \
++jbig2dec_SOURCES = jbig2dec.c sha1.c \
 +	jbig2.h jbig2_image.h \
  	os_types.h config_types.h config_win32.h
+ 
 -jbig2dec_LDADD = libjbig2dec.la @LIBOBJS@ $(PNG_LIBS)
 +jbig2dec_LDADD = libjbig2dec.la @LIBOBJS@ $(PNG_LIBS) -lmd
- 
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = jbig2dec.pc
-@@ -44,8 +44,9 @@ MAINTAINERCLEANFILES = config_types.h.in
- 
- TESTS = test_sha1 test_jbig2dec.py test_huffman test_arith
- 
+ dist_man_MANS = jbig2dec.1
+ EXTRA_DIST = test_jbig2dec.py msvc.mak LICENSE CHANGES
+ MAINTAINERCLEANFILES = config_types.h.in
 -test_sha1_SOURCES = sha1.c sha1.h
 +test_sha1_SOURCES = sha1.c
  test_sha1_CFLAGS = -DTEST
 +test_sha1_LDADD = -lmd
- 
  test_arith_SOURCES = jbig2_arith.c
  test_arith_CFLAGS = -DTEST
+ test_arith_LDADD = libjbig2dec.la

Copied and modified: head/graphics/jbig2dec/files/patch-configure (from r565545, head/graphics/jbig2dec/files/patch-configure.ac.in)
==============================================================================
--- head/graphics/jbig2dec/files/patch-configure.ac.in	Wed Feb 17 18:01:00 2021	(r565545, copy source)
+++ head/graphics/jbig2dec/files/patch-configure	Wed Feb 17 18:01:08 2021	(r565546)
@@ -1,11 +1,23 @@
---- configure.ac.in.orig	2019-10-02 12:52:19 UTC
-+++ configure.ac.in
-@@ -141,8 +141,6 @@ AC_CHECK_FUNC(getopt_long, 
- 	AC_DEFINE(HAVE_GETOPT_LONG,,
- 	  [Define if the local libc includes getopt_long()]
- 	),[
--	AC_LIBOBJ([getopt])
--	AC_LIBOBJ([getopt1])
- ])
+--- configure.orig	2020-09-10 16:29:32 UTC
++++ configure
+@@ -13599,20 +13599,6 @@ if test "x$ac_cv_func_getopt_long" = xyes; then :
  
- # generate output
+ $as_echo "#define HAVE_GETOPT_LONG /**/" >>confdefs.h
+ 
+-else
+-
+-	case " $LIBOBJS " in
+-  *" getopt.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
+- ;;
+-esac
+-
+-	case " $LIBOBJS " in
+-  *" getopt1.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS getopt1.$ac_objext"
+- ;;
+-esac
+-
+ 
+ fi
+