Page MenuHomeFreeBSD
Files F142079356

D31925.diff
No OneTemporary
Actions

D31925.diff
View Options

diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -1,12 +1,11 @@
# Created by: Vasil Dimov <vd@FreeBSD.org>
PORTNAME= libpano13
-PORTVERSION= 2.9.19
-PORTREVISION= 1
+DISTVERSION= 2.9.20
CATEGORIES= graphics java
-MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES= SF/panotools/${PORTNAME}/${PORTNAME}-${DISTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= fuz@fuz.su
COMMENT= Cross-platform library behind Panorama Tools and other photo stitchers
LICENSE= GPLv2+
@@ -15,32 +14,19 @@
LIB_DEPENDS= libpng.so:graphics/png \
libtiff.so:graphics/tiff
-USE_GNOME= gtk20 glib20 pango atk
-
-USES= autoreconf gnome jpeg libtool pathfix
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \
- -I${LOCALBASE}/include/glib-2.0 \
- -I${LOCALBASE}/include/pango-1.0 \
- -I${LOCALBASE}/include/atk-1.0
-CONFIGURE_ARGS= --with-png=${LOCALBASE} \
- --with-jpeg=${LOCALBASE} \
- --with-tiff=${LOCALBASE}
-INSTALL_TARGET= install-strip
+CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_GnuTar
+USES= cmake jpeg libtool pathfix pkgconfig
USE_LDCONFIG= yes
-OPTIONS_DEFINE= JAVA
+OPTIONS_DEFINE= DOCS JAVA STATIC
OPTIONS_SUB= yes
-.include <bsd.port.options.mk>
+JAVA_USE= java=yes
+JAVA_CMAKE_BOOL= SUPPORT_JAVA_PROGRAMS
+JAVA_VARS= JAVA_OS=native
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA= yes
-JAVA_OS= native
-CONFIGURE_ARGS+= --with-java=${JAVA_HOME}
-.else
-CONFIGURE_ARGS+= --without-java
-.endif
+post-install-STATIC-off:
+ ${RM} ${STAGEDIR}${PREFIX}/lib/libpano13.a
.include <bsd.port.mk>
diff --git a/graphics/libpano13/distinfo b/graphics/libpano13/distinfo
--- a/graphics/libpano13/distinfo
+++ b/graphics/libpano13/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libpano13-2.9.19.tar.gz) = 037357383978341dea8f572a5d2a0876c5ab0a83dffda431bd393357e91d95a8
-SIZE (libpano13-2.9.19.tar.gz) = 3527845
+TIMESTAMP = 1631016195
+SHA256 (libpano13-2.9.20.tar.gz) = 3b532836c37b8cd75cd2227fd9207f7aca3fdcbbd1cce3b9749f056a10229b89
+SIZE (libpano13-2.9.20.tar.gz) = 3564544
diff --git a/graphics/libpano13/files/patch-CMakeLists.txt b/graphics/libpano13/files/patch-CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/graphics/libpano13/files/patch-CMakeLists.txt
@@ -0,0 +1,36 @@
+--- CMakeLists.txt.orig 2021-09-12 22:30:36 UTC
++++ CMakeLists.txt
+@@ -116,7 +116,7 @@ FIND_PACKAGE(PNG REQUIRED)
+ INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+ INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
+
+-set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
++set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} m)
+
+ #
+ # Check build type and set options accordingly
+@@ -314,7 +314,7 @@ INSTALL(
+ AUTHORS
+ COPYING
+ README
+- DESTINATION "share/pano13/doc"
++ DESTINATION "share/doc/libpano13"
+ COMPONENT headers
+ )
+ INSTALL(
+@@ -323,7 +323,7 @@ INSTALL(
+ doc/PTblender.readme
+ doc/PTmender.readme
+ doc/stitch.txt
+- DESTINATION "share/pano13/doc"
++ DESTINATION "share/doc/libpano13"
+ COMPONENT doc
+ )
+
+@@ -488,6 +488,3 @@ if(CPACK_BINARY_RPM)
+ endif()
+
+ include(CPack)
+-
+-enable_testing()
+-add_subdirectory(tests)
diff --git a/graphics/libpano13/files/patch-Makefile.am b/graphics/libpano13/files/patch-Makefile.am
deleted file mode 100644
--- a/graphics/libpano13/files/patch-Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.am.orig 2019-03-30 16:47:30 UTC
-+++ Makefile.am
-@@ -94,13 +94,23 @@ install-exec-hook:
-
- endif
-
--AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(ENDIAN_FLAG)
-+if HAVE_FREEBSD
-+LIN_SRC = sys_ansi.c sys_compat_unix.c ppm.c
-+LIN_DEFS = -D__Ansi__=1
-+LIN_LDFS = -version-info 3:0:0 -lm
-
-+install-exec-hook:
-+ @true
-+
-+endif
-+
-+AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(WIN_DEFS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(ENDIAN_FLAG) $(FBSD_DEFS)
-+
- lib_LTLIBRARIES = libpano13.la
-
--libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
-+libpano13_la_SOURCES = $(STD_SRC) $(JAVA_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(FBSD_SRC)
- libpano13_la_LIBADD = $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) @PANO_WIN32_RESOURCE@
--libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS)
-+libpano13_la_LDFLAGS = $(LIN_LDFS) $(WIN_LDFS) $(DAR_LDFS) $(SOL_LDFS) $(FBSD_LDFS)
- libpano13_la_DEPENDENCIES = @PANO_WIN32_RESOURCE@
-
- pkginclude_HEADERS = $(STD_HDR) $(TOOL_HDR)
diff --git a/graphics/libpano13/files/patch-configure.ac b/graphics/libpano13/files/patch-configure.ac
deleted file mode 100644
--- a/graphics/libpano13/files/patch-configure.ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac.orig Fri Jun 16 13:30:54 2006
-+++ configure.ac Wed Jan 17 10:40:32 2007
-@@ -45,6 +45,11 @@
- ;;
- esac
- ;;
-+ *freebsd*|dragonfly)
-+ PANO_WIN32_RESOURCE=
-+ HSYS=freebsd
-+ HCPU="${target_cpu}"
-+ ;;
- *darwin*)
- PANO_WIN32_RESOURCE=
- HSYS=darwin
-@@ -73,6 +78,7 @@
-
- AM_CONDITIONAL(HAVE_DARWIN, test "${HSYS}" = "darwin")
- AM_CONDITIONAL(HAVE_LINUX, test "${HSYS}" = "linux")
-+AM_CONDITIONAL(HAVE_FREEBSD, test "${HSYS}" = "freebsd")
- AM_CONDITIONAL(HAVE_MAC, test "${HSYS}" = "classic")
- AM_CONDITIONAL(HAVE_MINGW, test "${HSYS}" = "mingw32")
- AM_CONDITIONAL(HAVE_CYGWIN, test "${HSYS}" = "cygwin")
diff --git a/graphics/libpano13/files/patch-m4_ax_check_graphics.m4 b/graphics/libpano13/files/patch-m4_ax_check_graphics.m4
deleted file mode 100644
--- a/graphics/libpano13/files/patch-m4_ax_check_graphics.m4
+++ /dev/null
@@ -1,74 +0,0 @@
---- m4/ax_check_graphics.m4.orig Wed Jan 17 11:09:58 2007
-+++ m4/ax_check_graphics.m4 Wed Jan 17 11:11:53 2007
-@@ -44,7 +44,7 @@
- ZLIB_OLD_LDFLAGS=$LDFLAGS
- ZLIB_OLD_CPPFLAGS=$CPPFLAGS
- if test "x$ZLIB_HOME" != 'x' ; then
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib64"
- else
- LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
-@@ -69,7 +69,7 @@
- LIB_ZLIB="-lz"
- ZLIB_FLAGS="-DHasZLIB"
- else
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LIB_ZLIB="-L$ZLIB_HOME/lib64 -lz"
- else
- LIB_ZLIB="-L$ZLIB_HOME/lib -lz"
-@@ -133,7 +133,7 @@
- PNG_OLD_LDFLAGS=$LDFLAGS
- PNG_OLD_CPPFLAGS=$CPPFLAGS
- if test "x$PNG_HOME" != 'x' ; then
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LDFLAGS="$LDFLAGS -L$PNG_HOME/lib64"
- else
- LDFLAGS="$LDFLAGS -L$PNG_HOME/lib"
-@@ -158,7 +158,7 @@
- LIB_PNG="-lpng"
- PNG_FLAGS="-DHasPNG"
- else
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LIB_PNG="-L$PNG_HOME/lib64 -lpng"
- else
- LIB_PNG="-L$PNG_HOME/lib -lpng"
-@@ -224,7 +224,7 @@
- JPEG_OLD_LDFLAGS=$LDFLAGS
- JPEG_OLD_CPPFLAGS=$CPPFLAGS
- if test "x$JPEG_HOME" != 'x' ; then
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib64"
- else
- LDFLAGS="$LDFLAGS -L$JPEG_HOME/lib"
-@@ -274,7 +274,7 @@
- LIB_JPEG="-ljpeg"
- JPEG_FLAGS="-DHasJPEG"
- else
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LIB_JPEG="-L$JPEG_HOME/lib64 -ljpeg"
- else
- LIB_JPEG="-L$JPEG_HOME/lib -ljpeg"
-@@ -339,7 +339,7 @@
- TIFF_OLD_LDFLAGS=$LDFLAGS
- TIFF_OLD_CPPFLAGS=$CPPFLAGS
- if test "x$TIFF_HOME" != 'x' ; then
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib64"
- else
- LDFLAGS="$LDFLAGS -L$TIFF_HOME/lib"
-@@ -364,7 +364,7 @@
- LIB_TIFF="-ltiff"
- TIFF_FLAGS="-DHasTIFF"
- else
-- if test "x$HCPU" = 'xamd64' ; then
-+ if test "x$HCPU" = 'xamd64' -a "x$HSYS" != 'xfreebsd' ; then
- LIB_TIFF="-L$TIFF_HOME/lib64 -ltiff"
- else
- LIB_TIFF="-L$TIFF_HOME/lib -ltiff"
diff --git a/graphics/libpano13/files/patch-m4_ax_check_java.m4 b/graphics/libpano13/files/patch-m4_ax_check_java.m4
deleted file mode 100644
--- a/graphics/libpano13/files/patch-m4_ax_check_java.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- m4/ax_check_java.m4.orig Wed Jan 17 11:23:05 2007
-+++ m4/ax_check_java.m4 Wed Jan 17 11:25:08 2007
-@@ -2,7 +2,7 @@
- dnl Usage:
- dnl AX_CHECK_JAVA
- dnl Test for java, and defines
--dnl - JAVA_CFLAGS (compiler flags)
-+dnl - JAVA_FLAGS (compiler flags)
- dnl - LIB_JAVA (linker flags, stripping and path)
- dnl prerequisites:
-
-@@ -78,6 +78,9 @@
- case "${target_os}" in
- linux*)
- java_extra_inc=linux
-+ ;;
-+ *freebsd*)
-+ java_extra_inc=freebsd
- ;;
- darwin*)
- java_extra_inc=darwin
diff --git a/graphics/libpano13/files/patch-tools_Makefile.am b/graphics/libpano13/files/patch-tools_Makefile.am
deleted file mode 100644
--- a/graphics/libpano13/files/patch-tools_Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
---- tools/Makefile.am.orig 2010-09-07 23:45:22.000000000 +0300
-+++ tools/Makefile.am 2011-01-09 22:07:41.000000000 +0200
-@@ -40,7 +40,15 @@
- SOL_DEFS =
- endif
-
--AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS)
-+if HAVE_FREEBSD
-+FBSD_SRC = panoinfo_unix.c
-+FBSD_DEFS = -D__Ansi__=1
-+else
-+FBSD_SRC =
-+FBSD_DEFS =
-+endif
-+
-+AM_CPPFLAGS = $(JAVA_FLAGS) $(LIN_DEFS) $(DAR_DEFS) $(SOL_DEFS) $(TIFF_FLAGS) $(JPEG_FLAGS) $(FBSD_DEFS)
- AM_LDFLAGS = -L${top_builddir}
-
- # PTAInterpolate can only be compiled with ptpicker.h, which in turn depends on java
-@@ -85,7 +93,7 @@
- PToptimizer_SOURCES = PToptimizer.c
- PToptimizer_LDADD = -l${PANOLIB}
-
--panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC)
-+panoinfo_SOURCES = $(WIN_SRC) $(LIN_SRC) $(DAR_SRC) $(SOL_SRC) $(FBSD_SRC)
- panoinfo_LDADD = -l${PANOLIB}
-
- EXTRA_DIST = README.PTmender \
diff --git a/graphics/libpano13/pkg-plist b/graphics/libpano13/pkg-plist
--- a/graphics/libpano13/pkg-plist
+++ b/graphics/libpano13/pkg-plist
@@ -20,19 +20,27 @@
include/pano13/ptutils.h
include/pano13/queryfeature.h
include/pano13/version.h
+%%STATIC%%lib/libpano13.a
lib/libpano13.so
lib/libpano13.so.3
lib/libpano13.so.3.0.0
libdata/pkgconfig/libpano13.pc
-man/man1/PTAInterpolate.1.gz
-man/man1/PTblender.1.gz
-man/man1/PTcrop.1.gz
-man/man1/PTinfo.1.gz
-man/man1/PTmasker.1.gz
-man/man1/PTmender.1.gz
-man/man1/PToptimizer.1.gz
-man/man1/PTroller.1.gz
-man/man1/PTtiff2psd.1.gz
-man/man1/PTtiffdump.1.gz
-man/man1/PTuncrop.1.gz
-man/man1/panoinfo.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/Optimize.txt
+%%PORTDOCS%%%%DOCSDIR%%/PTblender.readme
+%%PORTDOCS%%%%DOCSDIR%%/PTmender.readme
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/stitch.txt
+share/man/man1/PTAInterpolate.1.gz
+share/man/man1/PTblender.1.gz
+share/man/man1/PTcrop.1.gz
+share/man/man1/PTinfo.1.gz
+share/man/man1/PTmasker.1.gz
+share/man/man1/PTmender.1.gz
+share/man/man1/PToptimizer.1.gz
+share/man/man1/PTroller.1.gz
+share/man/man1/PTtiff2psd.1.gz
+share/man/man1/PTtiffdump.1.gz
+share/man/man1/PTuncrop.1.gz
+share/man/man1/panoinfo.1.gz

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 16, 8:29 PM (5 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27668504
Default Alt Text
D31925.diff (11 KB)

Event Timeline