diff --git a/x11/wmpinboard/Makefile b/x11/wmpinboard/Makefile index 5c5c3b91732..bb88ca9d6b9 100644 --- a/x11/wmpinboard/Makefile +++ b/x11/wmpinboard/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2002/09/17 14:46:07 wilfried Exp $ +# $OpenBSD: Makefile,v 1.9 2002/12/25 11:16:27 wilfried Exp $ COMMENT= 'wm-dockapp; resembling a miniature pin board' @@ -22,6 +22,9 @@ USE_X11= Yes NO_REGRESS= Yes CONFIGURE_STYLE= gnu +post-patch: + @cd ${WRKSRC}/src && rm -f getopt* + do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/src/wmpinboard ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/wmpinboard.1 ${PREFIX}/man/man1 diff --git a/x11/wmpinboard/patches/patch-configure b/x11/wmpinboard/patches/patch-configure index 970a817b406..d3a8a31247b 100644 --- a/x11/wmpinboard/patches/patch-configure +++ b/x11/wmpinboard/patches/patch-configure @@ -1,130 +1,13 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2001/01/17 16:32:53 naddy Exp $ +$OpenBSD: patch-configure,v 1.2 2002/12/25 11:16:27 wilfried Exp $ --- configure.orig Thu Apr 13 15:37:26 2000 -+++ configure Mon Jan 15 17:13:42 2001 -@@ -1035,8 +1035,6 @@ ac_link='${CC-cc} -o conftest${ac_exeext ++++ configure Wed Dec 25 12:04:12 2002 +@@ -1034,9 +1034,6 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAG + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - +- -CFLAGS="$CFLAGS -D_BSD_SOURCE -D_POSIX_SOURCE=199506L" - if test x$GCC = xyes; then CFLAGS="$CFLAGS -Wall -ansi -pedantic" fi -@@ -2199,104 +2197,6 @@ else - fi - done - --echo $ac_n "checking for getopt""... $ac_c" 1>&6 --echo "configure:2204: checking for getopt" >&5 --if eval "test \"`echo '$''{'ac_cv_func_getopt'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char getopt(); -- --int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_getopt) || defined (__stub___getopt) --choke me --#else --getopt(); --#endif -- --; return 0; } --EOF --if { (eval echo configure:2232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_getopt=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_getopt=no" --fi --rm -f conftest* --fi -- --if eval "test \"`echo '$ac_cv_func_'getopt`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- : --else -- echo "$ac_t""no" 1>&6 --need_getopt=yes --fi -- --echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 --echo "configure:2253: checking for getopt_long" >&5 --if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char getopt_long(); -- --int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_getopt_long) || defined (__stub___getopt_long) --choke me --#else --getopt_long(); --#endif -- --; return 0; } --EOF --if { (eval echo configure:2281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_getopt_long=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_getopt_long=no" --fi --rm -f conftest* --fi -- --if eval "test \"`echo '$ac_cv_func_'getopt_long`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- : --else -- echo "$ac_t""no" 1>&6 --need_getopt_long=yes --fi -- - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 - echo "configure:2302: checking for 8-bit clean memcmp" >&5 - if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then -@@ -2633,12 +2533,6 @@ fi - - if test x"$need_memcmp" = xyes; then - CONDITIONAL_SOURCES="$CONDITIONAL_SOURCES memcmp.c" --fi --if test x"$need_getopt" = xyes; then -- CONDITIONAL_SOURCES="$CONDITIONAL_SOURCES getopt.c" --fi --if test x"$need_getopt_long" = xyes; then -- CONDITIONAL_SOURCES="$CONDITIONAL_SOURCES getopt1.c" - fi - - diff --git a/x11/wmpinboard/patches/patch-configure_in b/x11/wmpinboard/patches/patch-configure_in index eafcd7738d3..a62f10866e7 100644 --- a/x11/wmpinboard/patches/patch-configure_in +++ b/x11/wmpinboard/patches/patch-configure_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure_in,v 1.1.1.1 2001/01/17 16:32:53 naddy Exp $ +$OpenBSD: patch-configure_in,v 1.2 2002/12/25 11:16:27 wilfried Exp $ --- configure.in.orig Thu Apr 13 14:40:33 2000 -+++ configure.in Wed Jan 17 13:22:55 2001 ++++ configure.in Wed Dec 25 12:03:38 2002 @@ -10,9 +10,6 @@ CFLAGS=`echo "x $CFLAGS"|sed 's/^x //; s AC_ISC_POSIX AC_LANG_C @@ -11,25 +11,3 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2001/01/17 16:32:53 naddy Exp $ dnl additional compile flags when using gcc if test x$GCC = xyes; then CFLAGS="$CFLAGS -Wall -ansi -pedantic" -@@ -31,8 +28,6 @@ AC_C_INLINE - dnl check for C headers and functions - dnl more or less optional ones first - AC_CHECK_HEADERS([getopt.h malloc.h signal.h string.h unistd.h]) --AC_CHECK_FUNC(getopt, , need_getopt=yes) --AC_CHECK_FUNC(getopt_long, , need_getopt_long=yes) - AC_FUNC_MEMCMP - if test x"$ac_cv_func_memcmp_clean" = xyes; then - AC_DEFINE(HAVE_MEMCMP) -@@ -85,12 +80,6 @@ fi - dnl determine what conditional stuff has to be compiled - if test x"$need_memcmp" = xyes; then - CONDITIONAL_SOURCES="$CONDITIONAL_SOURCES memcmp.c" --fi --if test x"$need_getopt" = xyes; then -- CONDITIONAL_SOURCES="$CONDITIONAL_SOURCES getopt.c" --fi --if test x"$need_getopt_long" = xyes; then -- CONDITIONAL_SOURCES="$CONDITIONAL_SOURCES getopt1.c" - fi - AC_SUBST(CONDITIONAL_SOURCES) - diff --git a/x11/wmpinboard/patches/patch-src_Makefile_in b/x11/wmpinboard/patches/patch-src_Makefile_in index 812cbc8e8e3..43b7fe7cd7b 100644 --- a/x11/wmpinboard/patches/patch-src_Makefile_in +++ b/x11/wmpinboard/patches/patch-src_Makefile_in @@ -1,25 +1,12 @@ -$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2001/01/17 16:32:52 naddy Exp $ ---- src/Makefile.in.orig Thu Apr 13 15:37:51 2000 -+++ src/Makefile.in Tue Jan 16 12:54:50 2001 -@@ -68,10 +68,10 @@ LIBS = $(X_LIBS) -lX11 -lXext -lXpm - - bin_PROGRAMS = wmpinboard - --wmpinboard_SOURCES = @CONDITIONAL_SOURCES@ misc.c misc.h notes.c notes.h wmpinboard.c wmpinboard.h xmisc.c xmisc.h -+wmpinboard_SOURCES = @CONDITIONAL_SOURCES@ getopt.c getopt1.c getopt.h misc.c misc.h notes.c notes.h wmpinboard.c wmpinboard.h xmisc.c xmisc.h - - --EXTRA_wmpinboard_SOURCES = getopt.c getopt1.c getopt.h memcmp.c memcmp.h -+EXTRA_wmpinboard_SOURCES = memcmp.c memcmp.h - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h -@@ -86,7 +86,7 @@ X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --wmpinboard_OBJECTS = misc.o notes.o wmpinboard.o xmisc.o -+wmpinboard_OBJECTS = getopt1.o getopt.o misc.o notes.o wmpinboard.o xmisc.o - wmpinboard_LDADD = $(LDADD) - wmpinboard_DEPENDENCIES = - wmpinboard_LDFLAGS = +$OpenBSD: patch-src_Makefile_in,v 1.2 2002/12/25 11:16:27 wilfried Exp $ +--- src/Makefile.in.orig Wed Dec 25 12:10:46 2002 ++++ src/Makefile.in Wed Dec 25 12:11:23 2002 +@@ -209,7 +209,7 @@ distdir: $(DISTFILES) + done + misc.o: misc.c wmpinboard.h ../config.h + notes.o: notes.c wmpinboard.h ../config.h misc.h xmisc.h notes.h +-wmpinboard.o: wmpinboard.c getopt.h wmpinboard.h ../config.h misc.h \ ++wmpinboard.o: wmpinboard.c wmpinboard.h ../config.h misc.h \ + notes.h xmisc.h ../xpm/pinboard.xpm ../xpm/bbar.xpm \ + ../xpm/abar.xpm ../xpm/digits.xpm + xmisc.o: xmisc.c wmpinboard.h ../config.h misc.h notes.h xmisc.h diff --git a/x11/wmpinboard/patches/patch-src_getopt_c b/x11/wmpinboard/patches/patch-src_getopt_c deleted file mode 100644 index d4167f07730..00000000000 --- a/x11/wmpinboard/patches/patch-src_getopt_c +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-src_getopt_c,v 1.1.1.1 2001/01/17 16:32:52 naddy Exp $ ---- src/getopt.c.orig Wed Sep 1 15:49:35 1999 -+++ src/getopt.c Mon Jan 15 16:45:15 2001 -@@ -43,6 +43,7 @@ - #endif - - #include -+#include - - /* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C -@@ -649,7 +650,7 @@ int - optarg = nameend + 1; - else - { -- if (opterr) -+ if (opterr) { - if (argv[optind - 1][1] == '-') - /* --option */ - fprintf(stderr, -@@ -660,6 +661,7 @@ int - fprintf(stderr, - _("%s: option `%c%s' doesn't allow an argument\n"), - argv[0], argv[optind - 1][0], pfound->name); -+ } - - nextchar += strlen(nextchar); -