git: 95b6ac4b5ce4 - main - graphics/zphoto: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 04 Aug 2024 12:09:40 UTC
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=95b6ac4b5ce41c77344d1c6da1664111811f4ea5
commit 95b6ac4b5ce41c77344d1c6da1664111811f4ea5
Author: Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-08-04 12:09:35 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-08-04 12:09:35 +0000
graphics/zphoto: Remove expired port
2024-07-31 graphics/zphoto: Depends on expired graphics/ming
---
MOVED | 1 +
graphics/Makefile | 1 -
graphics/zphoto/Makefile | 41 ------
graphics/zphoto/distinfo | 2 -
graphics/zphoto/files/patch-configure | 27 ----
graphics/zphoto/files/patch-exif.c | 144 ---------------------
graphics/zphoto/files/patch-image.cpp | 13 --
.../files/patch-templates_default_all_Makefile.in | 15 ---
graphics/zphoto/files/patch-util.c | 11 --
graphics/zphoto/pkg-descr | 3 -
graphics/zphoto/pkg-message | 31 -----
graphics/zphoto/pkg-plist | 34 -----
12 files changed, 1 insertion(+), 322 deletions(-)
diff --git a/MOVED b/MOVED
index 42d2ec9d58a5..89628e4ac809 100644
--- a/MOVED
+++ b/MOVED
@@ -3403,3 +3403,4 @@ audio/strawberry@qt5|audio/strawberry|2024-07-21|Unflavor. Qt5 is obsolete
audio/strawberry@qt6|audio/strawberry|2024-07-21|Unflavor. Qt5 is obsolete
devel/rubygem-google-protobuf4|devel/rubygem-google-protobuf|2024-07-30|Remove obsoleted port. Use devel/rubygem-google-protobuf instead
graphics/xsvg||2024-08-04|Has expired: Depends on deprecated library graphics/libsvg-cairo
+graphics/zphoto||2024-08-04|Has expired: Depends on expired graphics/ming
diff --git a/graphics/Makefile b/graphics/Makefile
index 5da2139b0237..e97409d3e33e 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1269,6 +1269,5 @@
SUBDIR += zgv
SUBDIR += zimg
SUBDIR += zint
- SUBDIR += zphoto
.include <bsd.port.subdir.mk>
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
deleted file mode 100644
index be84148d532d..000000000000
--- a/graphics/zphoto/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-PORTNAME= zphoto
-PORTVERSION= 1.2
-PORTREVISION= 17
-CATEGORIES= graphics www
-MASTER_SITES= http://namazu.org/~satoru/zphoto/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Zooming photo album generator
-WWW= http://namazu.org/~satoru/zphoto/
-
-LICENSE= LGPL21
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-DEPRECATED= Depends on expired graphics/ming
-EXPIRATION_DATE=2024-07-31
-
-LIB_DEPENDS= libImlib2.so:graphics/imlib2 \
- libming.so:graphics/ming \
- libpopt.so:devel/popt
-
-USES= alias gmake localbase perl5 pkgconfig
-USE_PERL5= build
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-avifile
-
-OPTIONS_DEFINE= NLS ZIP
-OPTIONS_DEFAULT= ZIP
-OPTIONS_SUB= yes
-
-ZIP_DESC= Enable zip support
-
-NLS_USES= gettext-tools
-NLS_CONFIGURE_ENABLE= nls
-
-ZIP_RUN_DEPENDS= zip:archivers/zip
-ZIP_CONFIGURE_OFF= --disable-zip
-
-post-patch:
- @${REINPLACE_CMD} -e 's|<ming.h>|<ming/ming.h>|g' ${WRKSRC}/*.c ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/graphics/zphoto/distinfo b/graphics/zphoto/distinfo
deleted file mode 100644
index 32740ee9698b..000000000000
--- a/graphics/zphoto/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (zphoto-1.2.tar.gz) = 918f19c4a0077b0c5fd2c80fd846acf21b4c7f62750988e6a4a1d0bb6628c15d
-SIZE (zphoto-1.2.tar.gz) = 414079
diff --git a/graphics/zphoto/files/patch-configure b/graphics/zphoto/files/patch-configure
deleted file mode 100644
index 59d2b3606c5f..000000000000
--- a/graphics/zphoto/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
-Add minimal support to `pkg-config imlib2`; imlib2-config has been
-dropped since imlib2-1.7.5.
-
---- configure.orig 2004-07-20 16:49:27 UTC
-+++ configure
-@@ -4494,7 +4494,7 @@ EOF
- SWFMovie_save(movie, "foo"); /* 0.2a API */
- }
- EOF
--if $CC -c tmp.c > /dev/null 2>&1; then
-+if $CC -c $CFLAGS $CPPFLAGS tmp.c > /dev/null 2>&1; then
-
- cat >>confdefs.h <<_ACEOF
- #define MING_0_2a 1
-@@ -4867,6 +4867,12 @@ IMLIB2CONFIG=$ac_cv_path_IMLIB2CONFIG
- esac
- fi
- IMLIB2CONFIG=$ac_cv_path_IMLIB2CONFIG
-+
-+if test -z "$IMLIB2CONFIG"; then
-+ if pkg-config imlib2; then
-+ IMLIB2CONFIG="pkg-config imlib2"
-+ fi
-+fi
-
- if test -n "$IMLIB2CONFIG"; then
- echo "$as_me:$LINENO: result: $IMLIB2CONFIG" >&5
diff --git a/graphics/zphoto/files/patch-exif.c b/graphics/zphoto/files/patch-exif.c
deleted file mode 100644
index 6042b6be5303..000000000000
--- a/graphics/zphoto/files/patch-exif.c
+++ /dev/null
@@ -1,144 +0,0 @@
---- exif.c.orig 2004-06-07 09:58:04 UTC
-+++ exif.c
-@@ -33,11 +33,11 @@ enum {
- HEADER_OFFSET2 = 8
- };
-
--#define SWAP_ENDIAN_LONG(val) ((unsigned long) ( \
-- (((unsigned long) (val) & (unsigned long) 0x000000ffU) << 24) | \
-- (((unsigned long) (val) & (unsigned long) 0x0000ff00U) << 8) | \
-- (((unsigned long) (val) & (unsigned long) 0x00ff0000U) >> 8) | \
-- (((unsigned long) (val) & (unsigned long) 0xff000000U) >> 24)))
-+#define SWAP_ENDIAN_LONG(val) ((unsigned int) ( \
-+ (((unsigned int) (val) & (unsigned int) 0x000000ffU) << 24) | \
-+ (((unsigned int) (val) & (unsigned int) 0x0000ff00U) << 8) | \
-+ (((unsigned int) (val) & (unsigned int) 0x00ff0000U) >> 8) | \
-+ (((unsigned int) (val) & (unsigned int) 0xff000000U) >> 24)))
-
- #define SWAP_ENDIAN_SHORT(val) ((unsigned short) ( \
- (((unsigned short) (val) & (unsigned short) 0x00ff) << 8) | \
-@@ -46,14 +46,14 @@ is_little_endian ()
- static int
- is_little_endian ()
- {
-- static long retval = -1;
-+ static int retval = -1;
-
- if (retval == -1) {
-- long n = 1;
-+ int n = 1;
- char *p = (char *)&n;
- char x[] = {1, 0, 0, 0};
-
-- assert(sizeof(long) == 4);
-+ assert(sizeof(int) == 4);
- if (memcmp(p, x, 4) == 0) {
- retval = 1;
- } else {
-@@ -63,8 +63,8 @@ is_little_endian ()
- return retval;
- }
-
--static unsigned long
--ulong_from_le (unsigned long x)
-+static unsigned int
-+uint_from_le (unsigned int x)
- {
- if (is_little_endian()) {
- return x;
-@@ -83,8 +83,8 @@ ushort_from_be (unsigned short x)
- }
- }
-
--static unsigned long
--ulong_from_be (unsigned long x)
-+static unsigned int
-+uint_from_be (unsigned int x)
- {
- if (is_little_endian()) {
- return SWAP_ENDIAN_LONG(x);
-@@ -115,7 +115,7 @@ static int
-
-
- static int
--efseek (FILE *stream, long offset, int whence)
-+efseek (FILE *stream, int offset, int whence)
- {
- int x = fseek(stream, offset, whence);
- if (x != 0)
-@@ -142,16 +142,16 @@ typedef void (*TraverseFunc) (FILE *fp,
- typedef void (*TraverseFunc) (FILE *fp,
- unsigned short tag,
- unsigned short type,
-- unsigned long size,
-- unsigned long value,
-+ unsigned int size,
-+ unsigned int value,
- void *data);
-
- static void
- get_special_offset (FILE *fp,
- unsigned short tag,
- unsigned short type,
-- unsigned long size,
-- unsigned long value,
-+ unsigned int size,
-+ unsigned int value,
- void *data)
- {
- if (tag == 0x8769) {
-@@ -163,12 +163,12 @@ get_time (FILE *fp,
- get_time (FILE *fp,
- unsigned short tag,
- unsigned short type,
-- unsigned long size,
-- unsigned long value,
-+ unsigned int size,
-+ unsigned int value,
- void *data)
- {
- if (tag == 0x9003) {
-- long curpos;
-+ int curpos;
- char buf[BUFSIZ];
- struct tm t;
-
-@@ -204,16 +204,16 @@ read_ushort (FILE *fp, int le_exif_p)
- return ushort_from_be(x);
- }
-
--static unsigned long
--read_ulong (FILE *fp, int le_exif_p)
-+static unsigned int
-+read_uint (FILE *fp, int le_exif_p)
- {
-- unsigned long x;
-+ unsigned int x;
-
-- efread(&x, sizeof(unsigned long), 1, fp);
-+ efread(&x, sizeof(unsigned int), 1, fp);
- if (le_exif_p)
-- return ulong_from_le(x);
-+ return uint_from_le(x);
- else
-- return ulong_from_be(x);
-+ return uint_from_be(x);
- }
-
- static int
-@@ -225,12 +225,12 @@ read_directory (FILE *fp, TraverseFunc func, void *dat
- n = read_ushort(fp, le_exif_p);
- for (i = 0; i < n; i++) {
- unsigned short tag, type;
-- unsigned long size, value;
-+ unsigned int size, value;
-
- tag = read_ushort(fp, le_exif_p);
- type = read_ushort(fp, le_exif_p);
-- size = read_ulong(fp, le_exif_p);
-- value = read_ulong(fp, le_exif_p);
-+ size = read_uint(fp, le_exif_p);
-+ value = read_uint(fp, le_exif_p);
-
- func(fp, tag, type, size, value, data);
- }
diff --git a/graphics/zphoto/files/patch-image.cpp b/graphics/zphoto/files/patch-image.cpp
deleted file mode 100644
index 68e00e71744d..000000000000
--- a/graphics/zphoto/files/patch-image.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- image.cpp.orig 2004-07-20 16:48:11 UTC
-+++ image.cpp
-@@ -554,8 +554,8 @@ restore_mtime (const char *file_name, ti
- static int
- convert_needed_p (const char *src, const char *dest)
- {
-- char *suffix1 = strrchr(src, '.');
-- char *suffix2 = strrchr(dest, '.');
-+ const char *suffix1 = strrchr(src, '.');
-+ const char *suffix2 = strrchr(dest, '.');
-
- return strcmp(suffix1, suffix2) != 0;
- }
diff --git a/graphics/zphoto/files/patch-templates_default_all_Makefile.in b/graphics/zphoto/files/patch-templates_default_all_Makefile.in
deleted file mode 100644
index 0edc504cbfa3..000000000000
--- a/graphics/zphoto/files/patch-templates_default_all_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- templates/default/all/Makefile.in.orig 2004-07-20 16:49:24 UTC
-+++ templates/default/all/Makefile.in
-@@ -369,9 +369,9 @@ install-data-local:
- | sh
-
- install-data-local:
-- mkdir -p $(templatesdir)
-- cp -p *.html.* $(templatesdir)
-- cp -p *.js.* $(templatesdir)
-+ mkdir -p $(DESTDIR)$(templatesdir)
-+ cp -p *.html.* $(DESTDIR)$(templatesdir)
-+ cp -p *.js.* $(DESTDIR)$(templatesdir)
-
- clean:
- rm -f zphoto.css .photo.html *.html.* *.js.* *.txt
diff --git a/graphics/zphoto/files/patch-util.c b/graphics/zphoto/files/patch-util.c
deleted file mode 100644
index f35f88a9c757..000000000000
--- a/graphics/zphoto/files/patch-util.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- util.c.orig 2004-07-20 16:48:11 UTC
-+++ util.c
-@@ -389,7 +389,7 @@ zphoto_get_image_suffixes (void)
- zphoto_get_image_suffixes (void)
- {
- static char *empty[] = { NULL };
-- static char *suffixes[] = { "jpg", "png", "gif", "bmp", NULL };
-+ static char *suffixes[] = { "jpeg", "jpg", "png", "gif", "bmp", NULL };
-
- if (zphoto_support_image_p()) {
- return suffixes;
diff --git a/graphics/zphoto/pkg-descr b/graphics/zphoto/pkg-descr
deleted file mode 100644
index bd4e5a0b87d5..000000000000
--- a/graphics/zphoto/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Zphoto is a zooming photo album generator.
-
-For more information, see
diff --git a/graphics/zphoto/pkg-message b/graphics/zphoto/pkg-message
deleted file mode 100644
index 2b83a3e52252..000000000000
--- a/graphics/zphoto/pkg-message
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-{ type: install
- message: <<EOM
- This port requires a kernel built with
- the directive:
-
- options USER_LDT
-
- Please, check the FreeBSD Handbook for instructions
- on building a custom kernel. If you do not know
- where to find it, check the FreeBSD website
- http://www.freebsd.org/
-
- Then before running zphoto, users should prepare as follows:
-
- sh or bash:
- $ ZPHOTO_TEMPLATE_DIR=%%PREFIX%%/share/zphoto/templates/en (english)
- $ ZPHOTO_TEMPLATE_DIR=%%PREFIX%%/share/zphoto/templates/ja (japanese)
- $ ZPHOTO_TEMPLATE_DIR=%%PREFIX%%/share/zphoto/templates/all (both)
- $ ZPHOTO_FONT=%%PREFIX%%/share/zphoto/fonts/EfontSerifB.fdb
- $ export ZPHOTO_TEMPLATE_DIR ZPHOTO_FONT
-
- csh or tcsh:
- % setenv ZPHOTO_TEMPLATE_DIR %%PREFIX%%/share/zphoto/templates/en (english)
- % setenv ZPHOTO_TEMPLATE_DIR %%PREFIX%%/share/zphoto/templates/ja (japanese)
- % setenv ZPHOTO_TEMPLATE_DIR %%PREFIX%%/share/zphoto/templates/all (both)
- % setenv ZPHOTO_FONT %%PREFIX%%/share/zphoto/fonts/EfontSerifB.fdb
-
-EOM
-}
-]
diff --git a/graphics/zphoto/pkg-plist b/graphics/zphoto/pkg-plist
deleted file mode 100644
index 97597d24960b..000000000000
--- a/graphics/zphoto/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-bin/zphoto
-%%NLS%%share/locale/ja/LC_MESSAGES/zphoto.mo
-%%NLS%%share/locale/ja_JP.SJIS/LC_MESSAGES/zphoto.mo
-%%DATADIR%%/doc/images/wxzphoto-linux-mini.png
-%%DATADIR%%/doc/images/wxzphoto-linux.png
-%%DATADIR%%/doc/images/wxzphoto-mini.png
-%%DATADIR%%/doc/images/wxzphoto.png
-%%DATADIR%%/doc/zphoto-ja.html
-%%DATADIR%%/doc/zphoto.html
-%%DATADIR%%/fonts/EfontSerifB.fdb
-%%DATADIR%%/templates/default/all/.photo.html
-%%DATADIR%%/templates/default/all/css-colors.txt
-%%DATADIR%%/templates/default/all/flash-colors.txt
-%%DATADIR%%/templates/default/all/index.html.en
-%%DATADIR%%/templates/default/all/index.html.ja
-%%DATADIR%%/templates/default/all/noflash.html.en
-%%DATADIR%%/templates/default/all/noflash.html.ja
-%%DATADIR%%/templates/default/all/zoom.js.en
-%%DATADIR%%/templates/default/all/zoom.js.ja
-%%DATADIR%%/templates/default/all/zphoto.css
-%%DATADIR%%/templates/default/en/.photo.html
-%%DATADIR%%/templates/default/en/css-colors.txt
-%%DATADIR%%/templates/default/en/flash-colors.txt
-%%DATADIR%%/templates/default/en/index.html
-%%DATADIR%%/templates/default/en/noflash.html
-%%DATADIR%%/templates/default/en/zoom.js
-%%DATADIR%%/templates/default/en/zphoto.css
-%%DATADIR%%/templates/default/ja/.photo.html
-%%DATADIR%%/templates/default/ja/css-colors.txt
-%%DATADIR%%/templates/default/ja/flash-colors.txt
-%%DATADIR%%/templates/default/ja/index.html
-%%DATADIR%%/templates/default/ja/noflash.html
-%%DATADIR%%/templates/default/ja/zoom.js
-%%DATADIR%%/templates/default/ja/zphoto.css