svn commit: r325979 - in head/x11/xscreensaver: . files
Niclas Zeising
zeising at FreeBSD.org
Mon Sep 2 12:06:00 UTC 2013
Author: zeising
Date: Mon Sep 2 12:05:58 2013
New Revision: 325979
URL: http://svnweb.freebsd.org/changeset/ports/325979
Log:
A bunch of cleanups and fixes.
Fix build with compiler is gccXX (where xx is for instance 46, 47) by
running autoconf to generate a working configure.
Use ${REINPLACE_CMD} instead of hand-rolled sed. Change regexp to work on
configure.in instead of configure, since we'll autoconf configure.in anyway.
Check for libutil.h alongside util.h, and make use of that if it is found.
Make detection and use of gettext work with all compilers. Add locale
messages to plist.
Bump portrevision.
Noticed by: avg (build issues)
Tested by: avg
Added:
head/x11/xscreensaver/files/patch-config.h.in (contents, props changed)
head/x11/xscreensaver/files/patch-configure.in (contents, props changed)
head/x11/xscreensaver/files/patch-utils_textclient.c (contents, props changed)
Modified:
head/x11/xscreensaver/Makefile
head/x11/xscreensaver/files/patch-driver_Makefile.in
head/x11/xscreensaver/pkg-plist
Modified: head/x11/xscreensaver/Makefile
==============================================================================
--- head/x11/xscreensaver/Makefile Mon Sep 2 11:56:52 2013 (r325978)
+++ head/x11/xscreensaver/Makefile Mon Sep 2 12:05:58 2013 (r325979)
@@ -3,7 +3,7 @@
PORTNAME= xscreensaver
PORTVERSION= 5.22
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
@@ -26,6 +26,8 @@ USES= pkgconfig gettext gmake
USE_XORG= xpm xext xxf86misc
USE_GL= yes
GNU_CONFIGURE= yes
+USE_AUTOTOOLS= autoconf
+CONFIGURE_ENV+= "CPPFLAGS= -I ${LOCALBASE}/include" "LDFLAGS= -L ${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
--with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \
--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
@@ -132,12 +134,9 @@ SUB_FILES= xscreensaver-blank.desktop xs
xscreensaver-start.desktop xscreensaver-stop.desktop
post-patch:
- @ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
- @ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \
- -e 's#malloc.h#stdlib.h#g' \
- -e 's#/usr/X11R6#${LOCALBASE}#g' \
- -e 's#pkg_config --list-all#pkg_config --help#' \
- ${WRKSRC}/configure.Patched > ${WRKSRC}/configure
+ ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
+ -e 's|pkg_config --list-all|pkg_config --help|' \
+ ${WRKSRC}/configure.in
.if ${PORT_OPTIONS:MPAM}
.for f in driver/passwd-pam.c driver/xscreensaver.man
@ ${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
Added: head/x11/xscreensaver/files/patch-config.h.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xscreensaver/files/patch-config.h.in Mon Sep 2 12:05:58 2013 (r325979)
@@ -0,0 +1,12 @@
+--- config.h.in.orig 2013-09-02 12:44:35.341733572 +0200
++++ config.h.in 2013-09-02 12:45:05.396737361 +0200
+@@ -340,6 +340,9 @@
+ /* Define to 1 if you have the <util.h> header file. */
+ #undef HAVE_UTIL_H
+
++/* Define to 1 if you have the <libutil.h> header file. */
++#undef HAVE_LIBUTIL_H
++
+ /* Define this if you have the XF86MiscSetGrabKeysState function (which allows
+ the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key sequences to be temporarily
+ disabled. Sadly, it doesn't affect Ctrl-Alt-BS or Ctrl-Alt-F1.) */
Added: head/x11/xscreensaver/files/patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xscreensaver/files/patch-configure.in Mon Sep 2 12:05:58 2013 (r325979)
@@ -0,0 +1,11 @@
+--- configure.in.orig 2013-09-02 12:45:33.940731237 +0200
++++ configure.in 2013-09-02 12:46:13.253728009 +0200
+@@ -3359,7 +3359,7 @@
+ ###############################################################################
+
+ PTY_LIBS=
+-AC_CHECK_HEADERS(pty.h util.h)
++AC_CHECK_HEADERS(pty.h util.h libutil.h)
+ AC_CHECK_X_LIB(util, forkpty,
+ [PTY_LIBS="-lutil"
+ ac_have_forkpty=yes
Modified: head/x11/xscreensaver/files/patch-driver_Makefile.in
==============================================================================
--- head/x11/xscreensaver/files/patch-driver_Makefile.in Mon Sep 2 11:56:52 2013 (r325978)
+++ head/x11/xscreensaver/files/patch-driver_Makefile.in Mon Sep 2 12:05:58 2013 (r325979)
@@ -1,5 +1,5 @@
---- driver/Makefile.in.orig 2008-07-16 14:40:49.000000000 -0700
-+++ driver/Makefile.in 2008-07-18 16:23:37.000000000 -0700
+--- driver/Makefile.in.orig 2013-07-16 11:23:32.000000000 +0200
++++ driver/Makefile.in 2013-09-02 11:56:16.862939343 +0200
@@ -81,8 +81,8 @@
@@ -11,3 +11,12 @@
UTILS_SRC = $(srcdir)/../utils
UTILS_BIN = ../utils
+@@ -207,7 +207,7 @@
+ SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
+ $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
+ -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
+- $(PASSWD_LIBS)
++ $(PASSWD_LIBS) $(INTL_LIBS)
+
+ CMD_LIBS = $(LIBS) $(X_LIBS) \
+ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
Added: head/x11/xscreensaver/files/patch-utils_textclient.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xscreensaver/files/patch-utils_textclient.c Mon Sep 2 12:05:58 2013 (r325979)
@@ -0,0 +1,12 @@
+--- utils/textclient.c.orig 2013-09-02 12:43:01.271738814 +0200
++++ utils/textclient.c 2013-09-02 12:43:25.014748042 +0200
+@@ -50,6 +50,9 @@
+ # ifdef HAVE_UTIL_H
+ # include <util.h>
+ # endif
++# ifdef HAVE_LIBUTIL_H
++# include <libutil.h>
++# endif
+ #endif /* HAVE_FORKPTY */
+
+ /*#define DEBUG*/
Modified: head/x11/xscreensaver/pkg-plist
==============================================================================
--- head/x11/xscreensaver/pkg-plist Mon Sep 2 11:56:52 2013 (r325978)
+++ head/x11/xscreensaver/pkg-plist Mon Sep 2 12:05:58 2013 (r325979)
@@ -217,6 +217,29 @@ share/applications/xscreensaver-lock.des
share/applications/xscreensaver-properties.desktop
share/applications/xscreensaver-start.desktop
share/applications/xscreensaver-stop.desktop
+share/locale/ca/LC_MESSAGES/xscreensaver.mo
+share/locale/da/LC_MESSAGES/xscreensaver.mo
+share/locale/de/LC_MESSAGES/xscreensaver.mo
+share/locale/es/LC_MESSAGES/xscreensaver.mo
+share/locale/et/LC_MESSAGES/xscreensaver.mo
+share/locale/fi/LC_MESSAGES/xscreensaver.mo
+share/locale/fr/LC_MESSAGES/xscreensaver.mo
+share/locale/hu/LC_MESSAGES/xscreensaver.mo
+share/locale/it/LC_MESSAGES/xscreensaver.mo
+share/locale/ja/LC_MESSAGES/xscreensaver.mo
+share/locale/ko/LC_MESSAGES/xscreensaver.mo
+share/locale/nb/LC_MESSAGES/xscreensaver.mo
+share/locale/nl/LC_MESSAGES/xscreensaver.mo
+share/locale/pl/LC_MESSAGES/xscreensaver.mo
+share/locale/pt/LC_MESSAGES/xscreensaver.mo
+share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
+share/locale/ru/LC_MESSAGES/xscreensaver.mo
+share/locale/sk/LC_MESSAGES/xscreensaver.mo
+share/locale/sv/LC_MESSAGES/xscreensaver.mo
+share/locale/vi/LC_MESSAGES/xscreensaver.mo
+share/locale/wa/LC_MESSAGES/xscreensaver.mo
+share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
+share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
share/pixmaps/xscreensaver.xpm
%%DATADIR%%/config/README
%%DATADIR%%/config/abstractile.xml
@@ -436,6 +459,51 @@ share/pixmaps/xscreensaver.xpm
%%DATADIR%%/glade/screensaver-snap.png
%%DATADIR%%/glade/xscreensaver-demo.glade2
@dirrmtry bin/xscreensaver-hacks
+ at dirrmtry share/locale/ca/LC_MESSAGES
+ at dirrmtry share/locale/ca
+ at dirrmtry share/locale/da/LC_MESSAGES
+ at dirrmtry share/locale/da
+ at dirrmtry share/locale/de/LC_MESSAGES
+ at dirrmtry share/locale/de
+ at dirrmtry share/locale/es/LC_MESSAGES
+ at dirrmtry share/locale/es
+ at dirrmtry share/locale/et/LC_MESSAGES
+ at dirrmtry share/locale/et
+ at dirrmtry share/locale/fi/LC_MESSAGES
+ at dirrmtry share/locale/fi
+ at dirrmtry share/locale/fr/LC_MESSAGES
+ at dirrmtry share/locale/fr
+ at dirrmtry share/locale/hu/LC_MESSAGES
+ at dirrmtry share/locale/hu
+ at dirrmtry share/locale/it/LC_MESSAGES
+ at dirrmtry share/locale/it
+ at dirrmtry share/locale/ja/LC_MESSAGES
+ at dirrmtry share/locale/ja
+ at dirrmtry share/locale/ko/LC_MESSAGES
+ at dirrmtry share/locale/ko
+ at dirrmtry share/locale/nb/LC_MESSAGES
+ at dirrmtry share/locale/nb
+ at dirrmtry share/locale/nl/LC_MESSAGES
+ at dirrmtry share/locale/nl
+ at dirrmtry share/locale/pl/LC_MESSAGES
+ at dirrmtry share/locale/pt
+ at dirrmtry share/locale/pt_BR/LC_MESSAGES
+ at dirrmtry share/locale/pt_BR
+ at dirrmtry share/locale/ru/LC_MESSAGES
+ at dirrmtry share/locale/ru
+ at dirrmtry share/locale/sk/LC_MESSAGES
+ at dirrmtry share/locale/sk
+ at dirrmtry share/locale/sv/LC_MESSAGES
+ at dirrmtry share/locale/sv
+ at dirrmtry share/locale/vi/LC_MESSAGES
+ at dirrmtry share/locale/vi
+ at dirrmtry share/locale/wa/LC_MESSAGES
+ at dirrmtry share/locale/wa
+ at dirrmtry share/locale/zh_CN/LC_MESSAGES
+ at dirrmtry share/locale/zh_CN
+ at dirrmtry share/locale/zh_TW/LC_MESSAGES
+ at dirrmtry share/locale/zh_TW
+ at dirrmtry share/locale
@dirrmtry share/applications
@dirrmtry %%DATADIR%%/config
@dirrm %%DATADIR%%/glade
More information about the svn-ports-all
mailing list