head 1.3; access; symbols pkgsrc-2013Q2:1.2.0.20 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.18 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.16 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.14 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.12 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.10 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.8 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.6 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.4 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.2 pkgsrc-2011Q1-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2013.07.09.10.14.53; author marino; state dead; branches; next 1.2; commitid UcVHHm05p3GMtMWw; 1.2 date 2011.02.10.10.43.41; author drochner; state Exp; branches; next 1.1; 1.1 date 2011.02.03.18.57.15; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2011.02.03.18.57.15; author drochner; state Exp; branches; next ; desc @@ 1.3 log @x11/gtkada: Update from version 2.22 to 2.24.4 This is the minimum version necessary to build the next version of the GNAT Programming Studio. It is also the last version to support GTK2+. As this will break GPS 5.0, GPS will be imminently upgraded to version 5.2.1 following this commit. @ text @$NetBSD: patch-ba,v 1.2 2011/02/10 10:43:41 drochner Exp $ --- src/Makefile.in.orig 2010-12-01 21:51:07.000000000 +0000 +++ src/Makefile.in @@@@ -58,46 +58,44 @@@@ gtkada-intl.adb: gtkada-intl.gpb Makefil install: force @@if [ "$(prefix)" != `pwd` ]; then \ echo Installing GtkAda in $(prefix); \ - $(MKDIR) $(bindir); \ - $(MKDIR) $(libdir); \ - $(MKDIR) $(incdir); \ - $(MKDIR) $(alidir)/static; \ - $(INSTALL_DATA) ${OBJ_DIR}/$(ARCHIVENAME) $(alidir)/static; \ - $(RM) $(libdir)/$(ARCHIVENAME); \ + $(MKDIR) $(DESTDIR)$(bindir); \ + $(MKDIR) $(DESTDIR)$(libdir); \ + $(MKDIR) $(DESTDIR)$(incdir); \ + $(MKDIR) $(DESTDIR)$(alidir)/static; \ + $(INSTALL_DATA) ${OBJ_DIR}/$(ARCHIVENAME) $(DESTDIR)$(alidir)/static; \ if [ -f /usr/bin/$(RANLIB) -o -f /bin/$(RANLIB) ]; then \ - $(RANLIB) $(alidir)/static/$(ARCHIVENAME); \ + $(RANLIB) $(DESTDIR)$(alidir)/static/$(ARCHIVENAME); \ fi; \ if [ $(BUILD_SHARED) = yes ]; then \ - $(MKDIR) $(alidir)/relocatable; \ + $(MKDIR) $(DESTDIR)$(alidir)/relocatable; \ if [ "$(OS)" = "Windows_NT" ]; then \ $(INSTALL_DATA) ${OBJ_DIR}/$(SONAME) $(bindir); \ $(CHMOD) +x $(bindir)/$(SONAME); \ else \ - $(INSTALL_DATA) ${OBJ_DIR}/$(SONAME) $(alidir)/relocatable; \ - $(RM) $(libdir)/$(LIBNAME); \ - $(LN) $(SONAME) $(alidir)/relocatable/$(LIBNAME); \ - $(LN) gtkada/relocatable/$(SONAME) $(libdir)/$(LIBNAME); \ - $(LN) gtkada/relocatable/$(SONAME) $(libdir)/$(SONAME); \ + $(INSTALL_DATA) ${OBJ_DIR}/$(SONAME) $(DESTDIR)$(alidir)/relocatable; \ + $(LN) $(SONAME) $(DESTDIR)$(alidir)/relocatable/$(LIBNAME); \ + $(LN) gtkada/relocatable/$(SONAME) $(DESTDIR)$(libdir)/$(LIBNAME); \ + $(LN) gtkada/relocatable/$(SONAME) $(DESTDIR)$(libdir)/$(SONAME); \ fi; \ - $(CP) $(OBJ_DIR)/glib*.ali $(OBJ_DIR)/gdk*.ali $(alidir)/relocatable; \ - $(CP) $(OBJ_DIR)/gtk*.ali $(OBJ_DIR)/pango*.ali $(alidir)/relocatable; \ - $(CP) $(OBJ_DIR)/cairo*.ali $(alidir)/relocatable; \ + $(CP) $(OBJ_DIR)/glib*.ali $(OBJ_DIR)/gdk*.ali $(DESTDIR)$(alidir)/relocatable; \ + $(CP) $(OBJ_DIR)/gtk*.ali $(OBJ_DIR)/pango*.ali $(DESTDIR)$(alidir)/relocatable; \ + $(CP) $(OBJ_DIR)/cairo*.ali $(DESTDIR)$(alidir)/relocatable; \ fi; \ - $(CP) glib*.ads glib*.adb $(MESA_SPECS) $(incdir); \ - $(CP) gdk*.ads gdk*.adb $(incdir); \ - $(CP) gtk*.ads gtk*.adb $(incdir); \ - $(CP) pango*.ads pango*.adb $(incdir); \ - $(CP) cairo*.ads cairo*.adb $(incdir); \ - $(CP) $(OBJ_DIR)/glib*.ali $(OBJ_DIR)/gdk*.ali $(alidir)/static; \ - $(CP) $(OBJ_DIR)/gtk*.ali $(OBJ_DIR)/pango*.ali $(alidir)/static; \ - $(CP) $(OBJ_DIR)/cairo*.ali $(alidir)/static; \ + $(CP) glib*.ads glib*.adb $(MESA_SPECS) $(DESTDIR)$(incdir); \ + $(CP) gdk*.ads gdk*.adb $(DESTDIR)$(incdir); \ + $(CP) gtk*.ads gtk*.adb $(DESTDIR)$(incdir); \ + $(CP) pango*.ads pango*.adb $(DESTDIR)$(incdir); \ + $(CP) cairo*.ads cairo*.adb $(DESTDIR)$(incdir); \ + $(CP) $(OBJ_DIR)/glib*.ali $(OBJ_DIR)/gdk*.ali $(DESTDIR)$(alidir)/static; \ + $(CP) $(OBJ_DIR)/gtk*.ali $(OBJ_DIR)/pango*.ali $(DESTDIR)$(alidir)/static; \ + $(CP) $(OBJ_DIR)/cairo*.ali $(DESTDIR)$(alidir)/static; \ $(MAKE) -C opengl install; \ $(MAKE) -C glade install; \ $(MAKE) -C gnome install; \ $(MAKE) -C tools install; \ - $(CHMOD) ugo-w $(alidir)/static/*.ali; \ + $(CHMOD) ugo-w $(DESTDIR)$(alidir)/static/*.ali; \ if [ $(BUILD_SHARED) = yes ]; then \ - $(CHMOD) ugo-w $(alidir)/relocatable/*.ali; \ + $(CHMOD) ugo-w $(DESTDIR)$(alidir)/relocatable/*.ali; \ fi; \ fi @ 1.2 log @restore some Makefile parts which got lost when I added DESTDIR support @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- src/Makefile.in.orig 2011-02-02 18:33:04.000000000 +0000 d5 1 a5 1 @@@@ -58,47 +58,41 @@@@ gtkada-intl.adb: gtkada-intl.gpb Makefil d69 2 a70 1 - if [ $(BUILD_SHARED) = yes ]; then \ d72 2 a73 1 - fi; \ a75 1 clean: @ 1.1.1.1 log @add gtkada-2.22, Ada wrappers for gtk2, from John Marino per PR pkg/44439 @ text @@