180172 – [MAINTAINER] x11-toolkits/gtkada update to version 2.24.4

Bug 180172 - [MAINTAINER] x11-toolkits/gtkada update to version 2.24.4

Summary: [MAINTAINER] x11-toolkits/gtkada update to version 2.24.4

Status:	Closed FIXED

Alias:	None

Product:	Ports & Packages
Classification:	Unclassified
Component:	Individual Port(s) (show other bugs)
Version:	Latest
Hardware:	Any Any

Importance:	Normal Affects Only Me
Assignee:	William Grzybowski

URL:
Keywords:

Depends on:
Blocks:

Reported:	2013-07-01 17:50 UTC by John Marino
Modified:	2013-07-02 15:11 UTC (History)
CC List:	0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description John Marino 2013-07-01 17:50:00 UTC

This update is required for the next version of devel/gps (5.2).  This port needs to be updated together with gps (future PR, number provided later)

Fix: 

The diff is greater than 100k, so it will not attach via web interface.

Link is here: 
http://leaf.dragonflybsd.org/~marino/ada/gtkada-update-2.24.4.diff.txt

Comment 1 John Marino 2013-07-02 14:22:08 UTC

The GPS upgrade has been submitted (ports/180198).
Both PRs must be committed together.

Comment 2 William Grzybowski freebsd_committer

2013-07-02 14:46:28 UTC

Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.

Comment 3 dfilter service freebsd_committer

2013-07-02 15:06:20 UTC

Author: wg
Date: Tue Jul  2 14:06:12 2013
New Revision: 322170
URL: http://svnweb.freebsd.org/changeset/ports/322170

Log:
  x11-toolkits/gtkada: update to 2.24.4.0
  
  - Update to 2.24.4.0
  - Auto generate pkg-plist
  
  PR:		ports/180172
  Submitted by:	John Marino <draco@marino.st> (maintainer)

Added:
  head/x11-toolkits/gtkada/files/patch-docs_Makefile.in   (contents, props changed)
Deleted:
  head/x11-toolkits/gtkada/files/patch-Makefile.in
  head/x11-toolkits/gtkada/files/patch-aa
  head/x11-toolkits/gtkada/files/patch-ab
  head/x11-toolkits/gtkada/files/patch-configure
  head/x11-toolkits/gtkada/files/patch-docs_Makefile
  head/x11-toolkits/gtkada/files/patch-docs_gtkaga_ug_Makefile.in
  head/x11-toolkits/gtkada/files/patch-examples_Makefile
  head/x11-toolkits/gtkada/files/patch-projects_Makefile
  head/x11-toolkits/gtkada/files/patch-src_Makefile.in
  head/x11-toolkits/gtkada/files/patch-src_tools_Makefile.in
  head/x11-toolkits/gtkada/files/patch-testgtk_Makefile.in
  head/x11-toolkits/gtkada/files/patch-xml_Makefile
  head/x11-toolkits/gtkada/pkg-plist
Modified:
  head/x11-toolkits/gtkada/Makefile
  head/x11-toolkits/gtkada/distinfo
  head/x11-toolkits/gtkada/files/patch-src_Makefile.common.in

Modified: head/x11-toolkits/gtkada/Makefile
==============================================================================
--- head/x11-toolkits/gtkada/Makefile	Tue Jul  2 13:20:09 2013	(r322169)
+++ head/x11-toolkits/gtkada/Makefile	Tue Jul  2 14:06:12 2013	(r322170)
@@ -2,34 +2,84 @@
 # $FreeBSD$
 
 PORTNAME=	gtkada
-PORTVERSION=	${GTKADA_VERSION}
-PORTREVISION=	2
+PORTVERSION=	2.24.4.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		gtkada-rm-${GTKADA_VERSION}${EXTRACT_SUFX}
+		gtkada-rm-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	draco@marino.st
 COMMENT=	Ada graphical toolkit based on Gtk2+
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+= makeinfo:${PORTSDIR}/print/texinfo
-BUILD_DEPENDS+= gtk>=${GTKADA_VERSION}:${PORTSDIR}/x11-toolkits/gtk20
-RUN_DEPENDS+=	gtk>=${GTKADA_VERSION}:${PORTSDIR}/x11-toolkits/gtk20
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
-USES+=		ada
+USE_GNOME=	gtk20
+USES=		ada
+
+DESTINY=	${WRKDIR}/destino
+MAKE_ENV+=	DESTDIR=${DESTINY}
 
-GTKADA_VERSION=		2.22
-PLIST_SUB+=		PKGNAME="${PORTNAME}-${GTKADA_VERSION}"
+OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.options.mk>
+
+# Setting MAKE_JOBS_SAFE=yes will break the build because -j is passed
+# to gmake.  So we need to roll our own parallel-job support here.
+# We can check MAKE_JOBS_NUMBER because /etc/make.conf is loaded
+# before this makefile and bsd.port.mk isn't.
+.if !defined(DISABLE_MAKE_JOBS)
+.  if defined(MAKE_JOBS_NUMBER)
+MAKE_ENV+=	PROCESSORS=${MAKE_JOBS_NUMBER}
+.  else
+.    if ${OPSYS} == FreeBSD
+NCPU!=		${SYSCTL} -n kern.smp.cpus
+.    elif ${OPSYS} == DragonFly
+NCPU!=		${SYSCTL} -n hw.ncpu
+.    else
+NCPU=		1
+.    endif
+MAKE_ENV+=	PROCESSORS=${NCPU}
+.  endif
+.endif
+
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
+CONFIGURE_ARGS+=	--enable-nls
+USES+=			gettext
+.else
 CONFIGURE_ARGS+=	--disable-nls
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/misc.c
+	@${REINPLACE_CMD} -e '/DESTDIR =/d' ${WRKSRC}/src/Makefile.common.in
+.if ${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} -e 's/^all: \(.*\)/all: \1 docs/g' ${WRKSRC}/Makefile.in
+.endif
+
+post-install:
+	@${MKDIR} ${DESTINY}${PREFIX}/libdata
+	@${MV} ${DESTINY}${PREFIX}/lib/pkgconfig ${DESTINY}${PREFIX}/libdata/
+	${RM} -rf ${DESTINY}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
+	${CP} -pR ${DESTINY}${PREFIX}/ ${PREFIX}/
+	@cd ${DESTINY}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
+	   ${SORT} > ${WRKDIR}/PLIST.all
+	@cd ${DESTINY}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \
+	   ${SED} -e '/lib\/gnat$$/d' -e '/share\/doc$$/d' -e '/share\/gps/d' \
+	   -e '/share\/examples$$/d' -e '/libdata\/pkgconfig/d' \
+	   -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/share/gps/plug-ins 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/share/gps 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/share/examples 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@echo "@unexec rmdir %D/share/doc 2>/dev/null || true" >> ${WRKDIR}/PLIST.all
+	@${CAT} ${WRKDIR}/PLIST.all >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/x11-toolkits/gtkada/distinfo
==============================================================================
--- head/x11-toolkits/gtkada/distinfo	Tue Jul  2 13:20:09 2013	(r322169)
+++ head/x11-toolkits/gtkada/distinfo	Tue Jul  2 14:06:12 2013	(r322170)
@@ -1,4 +1,4 @@
-SHA256 (gtkada-2.22.tar.bz2) = 2512f98925bc6d1e782aade1b4371c0900469d3afa3a79f3c2e9d71f3accffa7
-SIZE (gtkada-2.22.tar.bz2) = 2775194
-SHA256 (gtkada-rm-2.22.tar.bz2) = 14e8b69b2b84896b8fdc4ef3a9daf7c0af41b42d004a0d1487881fc3d61fb827
-SIZE (gtkada-rm-2.22.tar.bz2) = 3263320
+SHA256 (gtkada-2.24.4.0.tar.bz2) = f26715695052218ddcf7dfb9ccd2248376f7239ab757b61e66201df03c56c3e5
+SIZE (gtkada-2.24.4.0.tar.bz2) = 2758322
+SHA256 (gtkada-rm-2.24.4.0.tar.bz2) = 50456e41ce87a4b795c70f5a2271c43e6ccdeb5dc1b9bd2aef44d0cd56c07855
+SIZE (gtkada-rm-2.24.4.0.tar.bz2) = 3009953

Added: head/x11-toolkits/gtkada/files/patch-docs_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/gtkada/files/patch-docs_Makefile.in	Tue Jul  2 14:06:12 2013	(r322170)
@@ -0,0 +1,18 @@
+--- docs/Makefile.in.orig	2013-07-01 09:42:48.000000000 +0000
++++ docs/Makefile.in
+@@ -4,13 +4,12 @@ CP=cp -p
+ MKDIR=mkdir -p
+ 
+ all:: 
+-	${MAKE} -C gtkada_rm
+-	${MAKE} -C gtkada_ug html latexpdf
++	${MAKE} -C gtkada_ug html 
+ 
+ install::
+-	${MAKE} -C gtkada_rm install
+ 	$(MKDIR) ${DESTDIR}$(docdir)/gtkada_ug/
+ 	-$(CP) -r gtkada_ug/_build/html/* ${DESTDIR}$(docdir)/gtkada_ug/
++	$(CP) -r gtkada_rm_pregen/gtkada_rm ${DESTDIR}$(docdir)/
+ 
+ clean::
+ 	${MAKE} -C gtkada_rm clean

Modified: head/x11-toolkits/gtkada/files/patch-src_Makefile.common.in
==============================================================================
--- head/x11-toolkits/gtkada/files/patch-src_Makefile.common.in	Tue Jul  2 13:20:09 2013	(r322169)
+++ head/x11-toolkits/gtkada/files/patch-src_Makefile.common.in	Tue Jul  2 14:06:12 2013	(r322170)
@@ -1,15 +1,11 @@
-$NetBSD: patch-ad,v 1.1.1.1 2011/02/03 18:57:15 drochner Exp $
-
---- src/Makefile.common.in.orig	2011-01-19 22:48:51.000000000 +0100
+--- src/Makefile.common.in.orig	2013-07-01 09:42:47.000000000 +0000
 +++ src/Makefile.common.in
-@@ -12,9 +12,9 @@
+@@ -14,8 +14,8 @@ MAJOR    = @GTKADA_MAJOR_VERSION@
  MINOR    = @GTKADA_MINOR_VERSION@
  MICRO    = @GTKADA_MICRO_VERSION@
- GTK_LIBS = @GTK_LIBS@
--HAVE_LIBGLADE = @HAVE_LIBGLADE@
+ GTK_LIBS = @GTK_LIBS_FOR_GNATMAKE@
 -HAVE_OPENGL   = @HAVE_OPENGL@
 -HAVE_GNOME    = @HAVE_GNOME@
-+HAVE_LIBGLADE = False
 +HAVE_OPENGL   = False
 +HAVE_GNOME    = False
  BUILD_TYPE      = @BUILD_TYPE@
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 4 William Grzybowski freebsd_committer

2013-07-02 15:11:55 UTC

State Changed
From-To: open->closed

Committed. Thanks!