[pkgsrc/trunk]: pkgsrc/x11/wxGTK Split out some variables into Makefile.commo...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/wxGTK Split out some variables into Makefile.commo...
From: wiz <wiz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:06:26 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f12f8bf9645e
branches:  trunk
changeset: 497310:f12f8bf9645e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jul 24 21:14:51 2005 +0000

description:
Split out some variables into Makefile.common for wxGTK-contrib package.
Add patch-ah and modify patch-ac for wxGTK-contrib.
Fix directory handling in PLIST.

diffstat:

 x11/wxGTK/Makefile         |  51 +++----------------------------------------
 x11/wxGTK/Makefile.common  |  53 ++++++++++++++++++++++++++++++++++++++++++++++
 x11/wxGTK/PLIST            |   4 ++-
 x11/wxGTK/distinfo         |   5 ++-
 x11/wxGTK/patches/patch-ac |  12 +++++-----
 x11/wxGTK/patches/patch-ah |   9 +++++++
 6 files changed, 78 insertions(+), 56 deletions(-)

diffs (214 lines):

diff -r 740bd87efdcc -r f12f8bf9645e x11/wxGTK/Makefile
--- a/x11/wxGTK/Makefile        Sun Jul 24 19:19:21 2005 +0000
+++ b/x11/wxGTK/Makefile        Sun Jul 24 21:14:51 2005 +0000
@@ -1,57 +1,14 @@
-# $NetBSD: Makefile,v 1.41 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2005/07/24 21:14:51 wiz Exp $
 #
 
-DISTNAME=              wxGTK-2.4.2
-PKGREVISION=           5
-CATEGORIES=            x11
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
-EXTRACT_SUFX=          .tar.bz2
-
-MAINTAINER=            tsarna%NetBSD.org@localhost
-HOMEPAGE=              http://www.wxwidgets.org/
-COMMENT=               GTK-based implementation of the wxWidgets GUI library
+.include "Makefile.common"
 
-USE_PKGLOCALEDIR=      YES
-USE_LIBTOOL=           YES
-USE_LANGUAGES=         c c++
-GNU_CONFIGURE=         YES
-CONFIGURE_ARGS+=       --with-opengl
-CONFIGURE_ARGS+=       --with-libjpeg=sys
-CONFIGURE_ARGS+=       --with-zlib=sys
-CONFIGURE_ARGS+=       --with-libpng=sys
-CONFIGURE_ARGS+=       --with-libtiff=sys
-CONFIGURE_ENV+=                BUILDLINK_DIR=${BUILDLINK_DIR}
-
-CPPFLAGS+=             -Dunix=1        # src/common/unzip.c needs this
-
-DOCDIR=                        ${PREFIX}/share/doc/wx/gtk
-
-.include "../../mk/bsd.prefs.mk"
-
-# This is needed for gtk1 and gtk2 on some platforms and
-# it doesn't hurt on those which don't need it
-CONFIGURE_ARGS+=       --with-gtk
-
-.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
-PLIST_SUBST+=          GTKVER=
-.include "../../x11/gtk/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --enable-gtk2
-PLIST_SUBST+=          GTKVER=2
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
+PKGREVISION=           5
+COMMENT=               GTK-based implementation of the wxWidgets GUI library
 
 post-install:
        ${INSTALL_DATA_DIR} ${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE
 
-.include "../../devel/pkg-config/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 740bd87efdcc -r f12f8bf9645e x11/wxGTK/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK/Makefile.common Sun Jul 24 21:14:51 2005 +0000
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile.common,v 1.1 2005/07/24 21:14:51 wiz Exp $
+#
+
+DISTNAME=              wxGTK-2.4.2
+CATEGORIES=            x11
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
+EXTRACT_SUFX=          .tar.bz2
+
+MAINTAINER=            tsarna%NetBSD.org@localhost
+HOMEPAGE=              http://www.wxwidgets.org/
+
+PATCHDIR=              ${.CURDIR}/../../x11/wxGTK/patches
+DISTINFO_FILE=         ${.CURDIR}/../../x11/wxGTK/distinfo
+
+USE_PKGLOCALEDIR=      YES
+USE_LIBTOOL=           YES
+USE_LANGUAGES=         c c++
+GNU_CONFIGURE=         YES
+CONFIGURE_ARGS+=       --with-opengl
+CONFIGURE_ARGS+=       --with-libjpeg=sys
+CONFIGURE_ARGS+=       --with-zlib=sys
+CONFIGURE_ARGS+=       --with-libpng=sys
+CONFIGURE_ARGS+=       --with-libtiff=sys
+CONFIGURE_ENV+=                BUILDLINK_DIR=${BUILDLINK_DIR}
+
+CPPFLAGS+=             -Dunix=1        # src/common/unzip.c needs this
+
+DOCDIR=                        ${PREFIX}/share/doc/wx/gtk
+
+.include "../../mk/bsd.prefs.mk"
+
+# This is needed for gtk1 and gtk2 on some platforms and
+# it doesn't hurt on those which don't need it
+CONFIGURE_ARGS+=       --with-gtk
+
+.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss])
+PLIST_SUBST+=          GTKVER=
+.include "../../x11/gtk/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --enable-gtk2
+PLIST_SUBST+=          GTKVER=2
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.include "../../devel/pkg-config/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
diff -r 740bd87efdcc -r f12f8bf9645e x11/wxGTK/PLIST
--- a/x11/wxGTK/PLIST   Sun Jul 24 19:19:21 2005 +0000
+++ b/x11/wxGTK/PLIST   Sun Jul 24 21:14:51 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:10:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/07/24 21:14:51 wiz Exp $
 bin/wx-config
 bin/wxgtk${GTKVER}-2.4-config
 include/wx/accel.h
@@ -419,6 +419,8 @@
 @dirrm share/doc/wx
 @dirrm lib/wx/include/gtk${GTKVER}-2.4/wx
 @dirrm lib/wx/include/gtk${GTKVER}-2.4
+@exec ${MKDIR} %D/lib/wx/include/univ
+@unexec ${RMDIR} %D/lib/wx/include/univ 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/lib/wx/include 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/lib/wx 2>/dev/null || ${TRUE}
 @dirrm include/wx/unix
diff -r 740bd87efdcc -r f12f8bf9645e x11/wxGTK/distinfo
--- a/x11/wxGTK/distinfo        Sun Jul 24 19:19:21 2005 +0000
+++ b/x11/wxGTK/distinfo        Sun Jul 24 21:14:51 2005 +0000
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.18 2005/06/16 13:02:57 hira Exp $
+$NetBSD: distinfo,v 1.19 2005/07/24 21:14:51 wiz Exp $
 
 SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
 RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e
 Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes
 SHA1 (patch-aa) = 82b31569686773cbdc2200417bed6a376fb12b29
 SHA1 (patch-ab) = 55f61ebaa77aeea5bfe447b974a1f18e87917300
-SHA1 (patch-ac) = 01aa0bea28f838680cce6326fa67700b12f75d86
+SHA1 (patch-ac) = 06a047a28260d30516b87d85a4dd4d5a6c18cfc4
 SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf
 SHA1 (patch-ae) = 81c2e33fbdd4a715da5a14ef3ae0a377d0d9aec2
 SHA1 (patch-af) = 81cddc6dcdf986317f7d62f027515cae6ef2c855
 SHA1 (patch-ag) = ccdaca4030c08aefa922367019e0c9249b810456
+SHA1 (patch-ah) = 24cc32f7eda53f4704422363902f72239eda2253
diff -r 740bd87efdcc -r f12f8bf9645e x11/wxGTK/patches/patch-ac
--- a/x11/wxGTK/patches/patch-ac        Sun Jul 24 19:19:21 2005 +0000
+++ b/x11/wxGTK/patches/patch-ac        Sun Jul 24 21:14:51 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2004/01/10 14:23:52 recht Exp $
+$NetBSD: patch-ac,v 1.7 2005/07/24 21:14:51 wiz Exp $
 
 --- src/makelib.env.in.orig    2003-09-21 13:31:38.000000000 +0200
-+++ src/makelib.env.in 2003-09-25 00:31:25.000000000 +0200
-@@ -33,6 +33,7 @@
++++ src/makelib.env.in
+@@ -33,6 +33,7 @@ libdir = @libdir@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -10,7 +10,7 @@
  
  TARGETLIB_STATIC = $(TARGET_LIBNAME).a
  TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
-@@ -47,13 +48,13 @@
+@@ -47,13 +48,13 @@ LDFLAGS_VERSIONING = @LDFLAGS_VERSIONING
  .SUFFIXES: .o .c .cpp .cxx
  
  .c.o:
@@ -27,7 +27,7 @@
  
  # the comment at the end of the next line is needed because otherwise autoconf
  # would remove this line completely - it contains a built-in hack to remove
-@@ -62,40 +63,21 @@
+@@ -62,40 +63,21 @@ VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc
  
  include $(top_builddir)/src/make.env
  
@@ -56,7 +56,7 @@
 -
 -install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
 +      ${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJECTS:.o=.lo} \
-+      -rpath ${PREFIX}/lib -version-info major:minor
++      -rpath ${PREFIX}/lib -version-info 0:1
  
 -install_so:
 -      $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
diff -r 740bd87efdcc -r f12f8bf9645e x11/wxGTK/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK/patches/patch-ah        Sun Jul 24 21:14:51 2005 +0000
@@ -0,0 +1,9 @@
+$NetBSD: patch-ah,v 1.1 2005/07/24 21:14:51 wiz Exp $
+
+--- contrib/src/Makefile.in.orig       Sun Sep 21 13:32:39 2003
++++ contrib/src/Makefile.in
+@@ -2,3 +2,3 @@
+ 
+-CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc animate #applet
++CONTRIB_SUBDIRS=canvas fl gizmos net ogl plot stc svg xrc #applet
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/net/mldonkey Include converters/libiconv/buildlink3.mk.
Next by Date: [pkgsrc/trunk]: pkgsrc/news/inn This package does link to the perl libraries,...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net/mldonkey Include converters/libiconv/buildlink3.mk.
Next by Thread: [pkgsrc/trunk]: pkgsrc/news/inn This package does link to the perl libraries,...
Indexes:
Home | Main Index | Thread Index | Old Index