5 files changed, 61 insertions, 46 deletions

diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index 0623378e8ef5..544d58af5bea 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gai
-PORTVERSION=	0.5.8
+PORTVERSION=	0.5.10
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,42 +21,35 @@ USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_GL=		yes
 USE_SDL=	sdl
-USE_GNOME=	gnomehack gnomepanel
+USE_GNOME=	gnomepanel
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDLCONF=${SDL_CONFIG}
 
 PLIST_FILES=	include/gai/gai.h lib/libgai.so.${PORTVERSION} \
-		lib/libgai.so.0 lib/libgai.so libdata/pkgconfig/gai.pc
+		lib/libgai.so.0 lib/libgai.so libdata/pkgconfig/gai.pc \
+		share/locale/de/LC_MESSAGES/gai.mo
 PLIST_DIRS=	include/gai
+PORTDOCS=	*
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+=	-fPIC
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e "s|sdl-config --|${SDL_CONFIG} --|g" ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e "s|lib/pkgconfig|libdata/pkgconfig|g" \
-		-e "s|-O2|${CFLAGS}|g" ${WRKSRC}/gai/Makefile.in
+	@${REINPLACE_CMD} -e "s|sdl-config --|${SDL_CONFIG} --|g; \
+		s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/configure
 
-.if !defined(NOPORTDOCS)
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -R ${WRKSRC}/docs/ ${DOCSDIR}
-	@${FIND} ${DOCSDIR} -type f | \
-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
-	@${FIND} ${DOCSDIR} -type d | ${SORT} -r | \
-		${SED} "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}
-	@${MKDIR} ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/docs && \
+	${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
+	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
+.endif
 .for dir in docking examples templates
-	${CP} -R ${WRKSRC}/${dir} ${EXAMPLESDIR}
+	cd ${WRKSRC} && \
+	${FIND} ${dir} -type d -exec ${MKDIR} "${EXAMPLESDIR}/{}" \; && \
+	${FIND} ${dir} -type f -exec ${INSTALL_DATA} "{}" "${EXAMPLESDIR}/{}" \;
 .endfor
 	@${FIND} ${EXAMPLESDIR} -type f | \
 		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
 	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
 		${SED} "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gai/distinfo b/x11-toolkits/gai/distinfo
index c53c3924b929..26e5accd26e4 100644
--- a/x11-toolkits/gai/distinfo
+++ b/x11-toolkits/gai/distinfo
@@ -1,2 +1,2 @@
-MD5 (gai-0.5.8.tar.bz2) = 29d90cb37fe5341009b27ffd09f871cb
-SIZE (gai-0.5.8.tar.bz2) = 255375
+MD5 (gai-0.5.10.tar.bz2) = 1c9cf2fb24ae6c95412c60f256dc3513
+SIZE (gai-0.5.10.tar.bz2) = 288291
diff --git a/x11-toolkits/gai/files/patch-gai_Makefile.in b/x11-toolkits/gai/files/patch-gai_Makefile.in
new file mode 100644
index 000000000000..e023337f203c
--- /dev/null
+++ b/x11-toolkits/gai/files/patch-gai_Makefile.in
@@ -0,0 +1,32 @@
+--- gai/Makefile.in.orig	Thu Oct 27 15:00:22 2005
++++ gai/Makefile.in	Thu Oct 27 15:02:47 2005
+@@ -1,9 +1,9 @@
+ 
+ # Makefile for the General Applet Interface Library
+ 
+-CFLAGS += -Wall -O2 -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@
++CFLAGS += -Wall -fPIC -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@
+ 
+-LDFLAGS += -g -fPIC -L/usr/X11R6/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ 
++LDFLAGS += -fPIC -L$(X11BASE)/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ 
+ LDFLAGS += @GNOME_LIBS@ @GL_LIBS@ @SDL_LIBS@ @GTHREAD_LIBS@ @PANGO_LIBS@
+ 
+ CC = @CC@
+@@ -23,13 +23,13 @@
+ 
+ install: libgai@LIB_END@
+ 	mkdir -p $(DESTDIR)$(PREFIX)/include/gai
+-	cp gai.h $(DESTDIR)$(PREFIX)/include/gai/
++	$(BSD_INSTALL_DATA) gai.h $(DESTDIR)$(PREFIX)/include/gai/
+ 	mkdir -p $(DESTDIR)$(LIBDIR)
+-	cp libgai@LIB_END@ $(DESTDIR)$(LIBDIR)/libgai@LIB_START@.@GAI_MAJOR@.@GAI_MINOR@.@GAI_MICRO@@LIB_DARWIN@
++	$(BSD_INSTALL_PROGRAM) libgai@LIB_END@ $(DESTDIR)$(LIBDIR)/libgai@LIB_START@.@GAI_MAJOR@.@GAI_MINOR@.@GAI_MICRO@@LIB_DARWIN@
+ 	ln -sf libgai@LIB_START@.@GAI_MAJOR@.@GAI_MINOR@.@GAI_MICRO@@LIB_DARWIN@ $(DESTDIR)$(LIBDIR)/libgai@LIB_START@.@GAI_MAJOR@@LIB_DARWIN@
+ 	ln -sf libgai@LIB_START@.@GAI_MAJOR@@LIB_DARWIN@ $(DESTDIR)$(LIBDIR)/libgai@LIB_END@
+-	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+-	cp ../gai.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
++	mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
++	$(BSD_INSTALL_DATA) ../gai.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
+ uninstall:
+ 	rm -f $(DESTDIR)$(PREFIX)/include/gai/gai.h
+ 	rmdir $(DESTDIR)$(PREFIX)/include/gai
diff --git a/x11-toolkits/gai/files/patch-gai_gai-gnome.c b/x11-toolkits/gai/files/patch-gai_gai-gnome.c
deleted file mode 100644
index 789db3e74ff2..000000000000
--- a/x11-toolkits/gai/files/patch-gai_gai-gnome.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- gai/gai-gnome.c.orig	Sat Aug 14 13:58:24 2004
-+++ gai/gai-gnome.c	Sat Apr 23 17:06:12 2005
-@@ -181,7 +181,7 @@
- static void gai_gnome_create_menu(void)
- {
-     int i,ptr,j=0;
--    gnome_menu_verb = g_malloc0(sizeof(BonoboUIVerb)*GAI.menu_entries);
-+    gnome_menu_verb = g_new0(BonoboUIVerb, GAI.menu_entries + 1);
- 
-     /* It will be freed anyway pretty soon */
-     gnome_menu_xml = g_malloc0(81920);
-@@ -225,6 +225,9 @@
- 	ptr = strlen(gnome_menu_xml);
- 
-     }
-+    gnome_menu_verb[j].cname = NULL;
-+    gnome_menu_verb[j].cb = NULL;
-+    gnome_menu_verb[j].user_data = NULL;
-     sprintf(gnome_menu_xml+ptr,"</popup>\n");
- 
- 
diff --git a/x11-toolkits/gai/files/patch-po_Makefile.in b/x11-toolkits/gai/files/patch-po_Makefile.in
new file mode 100644
index 000000000000..afb7b9c4624e
--- /dev/null
+++ b/x11-toolkits/gai/files/patch-po_Makefile.in
@@ -0,0 +1,11 @@
+--- po/Makefile.in.orig	Thu Oct 27 15:35:03 2005
++++ po/Makefile.in	Thu Oct 27 15:35:11 2005
+@@ -20,7 +20,7 @@
+ 
+ install:
+ 	for LANG in $(LINGUAS); do $(MSGFMT) $$LANG.po --output-file=$$LANG.mo; done 
+-	for LANG in $(LINGUAS); do mkdir -p $(LOCALE_PREFIX)/$$LANG/LC_MESSAGES && cp $$LANG.mo $(LOCALE_PREFIX)/$$LANG/LC_MESSAGES/$(GETTEXT_PACKAGE).mo;done 
++	for LANG in $(LINGUAS); do mkdir -p $(LOCALE_PREFIX)/$$LANG/LC_MESSAGES && $(BSD_INSTALL_DATA) $$LANG.mo $(LOCALE_PREFIX)/$$LANG/LC_MESSAGES/$(GETTEXT_PACKAGE).mo;done 
+ 
+ uninstall:
+ 	for LANG in $(LINGUAS); do rm $(LOCALE_PREFIX)/$$LANG/LC_MESSAGES/$$LANG.mo; done