CVS commit: pkgsrc/x11/xteddy

["Kevin Bloom" <ktnb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Fri Jan 17 20:18:18 UTC 2025

Modified Files:
        pkgsrc/x11/xteddy: Makefile PLIST distinfo
Added Files:
        pkgsrc/x11/xteddy/patches: patch-Makefile.in patch-configure
Removed Files:
        pkgsrc/x11/xteddy/patches: patch-aa patch-ab patch-ac

Log Message:
xteddy: update to 2.2

- uses imlib2 now
- many other bug fixes and improvements


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xteddy/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xteddy/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xteddy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xteddy/patches/patch-Makefile.in \
    pkgsrc/x11/xteddy/patches/patch-configure
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xteddy/patches/patch-aa
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xteddy/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xteddy/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xteddy/Makefile
diff -u pkgsrc/x11/xteddy/Makefile:1.23 pkgsrc/x11/xteddy/Makefile:1.24
--- pkgsrc/x11/xteddy/Makefile:1.23     Mon Oct 29 05:07:22 2012
+++ pkgsrc/x11/xteddy/Makefile  Fri Jan 17 20:18:18 2025
@@ -1,22 +1,35 @@
-# $NetBSD: Makefile,v 1.23 2012/10/29 05:07:22 asau Exp $
+# $NetBSD: Makefile,v 1.24 2025/01/17 20:18:18 ktnb Exp $
 
-DISTNAME=      xteddy-1.1
-PKGREVISION=   1
+DISTNAME=      xteddy_2.2.orig
+PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
 CATEGORIES=    x11 games
-MASTER_SITES=  http://staffwww.itn.liu.se/~stegu/xteddy/
+MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/x/xteddy/}
 
 MAINTAINER=    johnam%mail.kemper.org@localhost
-HOMEPAGE=      http://staffwww.itn.liu.se/~stegu/xteddy/
+HOMEPAGE=      https://web.archive.org/web/20210211193059/http://staffwww.itn.liu.se/~stegu/xteddy/
 COMMENT=       Cuddly teddy bear for your desktop
+LICENSE=       gnu-gpl-v2
+
+WRKSRC=        ${WRKDIR}/${PKGNAME_NOREV}
+
+USE_TOOLS+=    bash:run pkg-config
 
 GNU_CONFIGURE= YES
 
-INSTALLATION_DIRS=     share/xteddy/pixmaps
+#BUILDLINK_DEPMETHOD.libXt?=   build
+
+REPLACE_BASH+= xtoys
 
-BUILDLINK_DEPMETHOD.libXt?=    build
+SUBST_CLASSES+=                prefix
+SUBST_SED.prefix+=     -e "s,/usr/local,${PREFIX},"
+SUBST_SED.prefix+=     -e "s,/usr/share,${PREFIX}/share,"
+SUBST_SED.prefix+=     -e "s,/usr/games,${PREFIX}/bin,"
+SUBST_FILES.prefix+=   xteddy.c
+SUBST_FILES.prefix+=   xtoys
+SUBST_STAGE.prefix=    pre-configure
+SUBST_MESSAGE.prefix=  Adapt hardcoded prefix for pkgsrc.
 
-.include "../../x11/libSM/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xteddy/PLIST
diff -u pkgsrc/x11/xteddy/PLIST:1.3 pkgsrc/x11/xteddy/PLIST:1.4
--- pkgsrc/x11/xteddy/PLIST:1.3 Sat Jun 16 03:15:33 2012
+++ pkgsrc/x11/xteddy/PLIST     Fri Jan 17 20:18:18 2025
@@ -1,15 +1,21 @@
-@comment $NetBSD: PLIST,v 1.3 2012/06/16 03:15:33 dholland Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/01/17 20:18:18 ktnb Exp $
 bin/xteddy
-man/man1/xteddy.1
-share/xteddy/pixmaps/teddy_bw.xbm
-share/xteddy/pixmaps/teddy_color.xpm
-share/xteddy/pixmaps/teddy_icon.xbm
-share/xteddy/pixmaps/teddy_mask.xbm
-share/xteddy/pixmaps/xpenguin_bw.xbm
-share/xteddy/pixmaps/xpenguin_color.xpm
-share/xteddy/pixmaps/xpenguin_icon.xbm
-share/xteddy/pixmaps/xpenguin_mask.xbm
-share/xteddy/pixmaps/xteddy_bw.xbm
-share/xteddy/pixmaps/xteddy_color.xpm
-share/xteddy/pixmaps/xteddy_icon.xbm
-share/xteddy/pixmaps/xteddy_mask.xbm
+bin/xteddy_test
+bin/xtoys
+man/man6/xteddy.6
+share/xteddy/teddy.png
+share/xteddy/xalex.png
+share/xteddy/xbobo.png
+share/xteddy/xbrummi.png
+share/xteddy/xcherubino.png
+share/xteddy/xduck.png
+share/xteddy/xhedgehog.png
+share/xteddy/xklitze.png
+share/xteddy/xnamu.png
+share/xteddy/xorca.png
+share/xteddy/xpenguin.png
+share/xteddy/xpuppy.png
+share/xteddy/xruessel.png
+share/xteddy/xteddy.png
+share/xteddy/xtrouble.png
+share/xteddy/xtuxxy.png

Index: pkgsrc/x11/xteddy/distinfo
diff -u pkgsrc/x11/xteddy/distinfo:1.9 pkgsrc/x11/xteddy/distinfo:1.10
--- pkgsrc/x11/xteddy/distinfo:1.9      Tue Oct 26 11:34:57 2021
+++ pkgsrc/x11/xteddy/distinfo  Fri Jan 17 20:18:18 2025
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:34:57 nia Exp $
+$NetBSD: distinfo,v 1.10 2025/01/17 20:18:18 ktnb Exp $
 
-BLAKE2s (xteddy-1.1.tar.gz) = 31a59effee94c8f5af71034db8d7567f056dd95fe0d8d76409c70d13c7a42204
-SHA512 (xteddy-1.1.tar.gz) = afdd08b44475a37d1acb1314714fba209c6ff9146b022893e3b933f1ba78a92be77d2e9b5eaee0dfa8c163828f9a73c1702428fa333fd2b47c49f4de92cfc5c9
-Size (xteddy-1.1.tar.gz) = 117141 bytes
-SHA1 (patch-aa) = b77f0b43a999f54b28602ab1fb66ed320a5632c1
-SHA1 (patch-ab) = 260f836f4aab651c72caebac821e497b54d72cbd
-SHA1 (patch-ac) = 28dce1fcdd1367c33159001bd5bba9cf4e7291a8
+BLAKE2s (xteddy_2.2.orig.tar.gz) = f9a7a03c5f8e5aa01cdc65b288727fb05cfc525f0a1cd99153a4b740a3d19c20
+SHA512 (xteddy_2.2.orig.tar.gz) = e48f1f616980b747b3e528a7bb3a46605986e87e05cbad1385992931098acd8857cdd9fa7c38bca94007e74d1ab13cfd567fe6e502eecf8691e24272bd98159b
+Size (xteddy_2.2.orig.tar.gz) = 867005 bytes
+SHA1 (patch-Makefile.in) = 10366d1b53de18ba7c72a08ca29cf1091c154f3c
+SHA1 (patch-configure) = 055e2f2d7e911ef27d0c4737f4da07860a2a046a

Added files:

Index: pkgsrc/x11/xteddy/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/x11/xteddy/patches/patch-Makefile.in:1.1
--- /dev/null   Fri Jan 17 20:18:18 2025
+++ pkgsrc/x11/xteddy/patches/patch-Makefile.in Fri Jan 17 20:18:18 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile.in,v 1.1 2025/01/17 20:18:18 ktnb Exp $
+
+Include the X libs
+
+--- Makefile.in.orig   2025-01-13 17:59:27.720893995 +0000
++++ Makefile.in
+@@ -58,9 +58,10 @@ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-      $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++      $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(X_CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ \
++      ${X_LIBS} ${X_EXTRA_LIBS} ${X_PRE_LIBS}
+ SOURCES = $(xteddy_SOURCES)
+ DIST_SOURCES = $(xteddy_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
Index: pkgsrc/x11/xteddy/patches/patch-configure
diff -u /dev/null pkgsrc/x11/xteddy/patches/patch-configure:1.1
--- /dev/null   Fri Jan 17 20:18:18 2025
+++ pkgsrc/x11/xteddy/patches/patch-configure   Fri Jan 17 20:18:18 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2025/01/17 20:18:18 ktnb Exp $
+
+Use pkgsrc share dir
+
+--- configure.orig     2025-01-13 18:01:52.957881473 +0000
++++ configure
+@@ -5052,7 +5052,7 @@ echo "${ECHO_T}yes" >&6; }
+       :
+ fi
+ 
+-PIXMAP_PATH="/usr/share/xteddy"
++PIXMAP_PATH="${prefix}/share/xteddy/pixmaps"
+ 
+ 
+ ac_config_files="$ac_config_files Makefile html/Makefile images/Makefile"