editors/beaver/patches/patch-aa

   1 $NetBSD: patch-aa,v 1.3 2008/08/04 21:34:39 bjs Exp $
   2
   3 - configure for pkgsrc
   4 - use libtool (why?)
   5 - rearrange installation
   6 - honor PKGMANDIR
   7
   8 --- src/Makefile.orig   2008-06-27 03:33:36.000000000 +0000
   9 +++ src/Makefile
  10 @@ -7,20 +7,19 @@
  11
  12  ############## Public section. Modify according to your needs.  ###############
  13
  14 -CC      = gcc
  15 -RM      = rm -f
  16 -CP      = cp
  17 +#CC      = gcc
  18 +#RM      = rm -f
  19 +#CP      = cp
  20
  21 -DESTDIR = /usr/local
  22  IPATH   =
  23  LPATH   =
  24 -OPTI    = -Wall -O3 -funroll-loops -fomit-frame-pointer #-DDEBUG_FCN
  25 +OPTI    = -Wall #-O3 -funroll-loops -fomit-frame-pointer #-DDEBUG_FCN
  26  DBUG    = #-ggdb -pg -fbounds-check
  27  WARN   = #-W -Wall #-pedantic -ansi
  28
  29  ### Unix version ###
  30 -CFLAGS  = ${OPTI} ${DBUG} ${WARN} ${IPATH} `pkg-config gtk+-2.0 --cflags`
  31 -LDFLAGS = ${OPTI} ${DBUG} ${WARN} ${LPATH} `pkg-config gtk+-2.0 --libs`
  32 +CFLAGS  += `pkg-config gtk+-2.0 --cflags` -prefer-pic
  33 +LDFLAGS += `pkg-config gtk+-2.0 --libs`
  34  NAME    = beaver
  35
  36  ### Windows version ###
  37 @@ -32,66 +31,38 @@ NAME    = beaver
  38
  39  ###################### Private section. Do not modify  ########################
  40
  41 -ifndef DBUG
  42 -       STRIP = strip --strip-all ${NAME}
  43 -endif
  44 -
  45  SRC    = main.c search.c tools.c languages.c editor.c prefs.c conf.c msgbar.c\
  46           toolbar.c interface.c filesops.c completion.c undoredo.c
  47  INC    = ${SRC:.c=.h} struct.h wordfile.h
  48  OBJ    = ${SRC:.c=.o}
  49
  50  all    : ${OBJ}
  51 -       ${CC} -o ${NAME} ${OBJ} ${LDFLAGS}
  52 -       @${STRIP}
  53 +       ${LIBTOOL} --mode=link --tag=CC \
  54 +               ${CC} -o ${NAME} ${OBJ:.o=.lo} ${LDFLAGS}
  55
  56  .c.o   :
  57 -       ${CC} ${CFLAGS} -c $< -o $@
  58 +       ${LIBTOOL} --mode=compile --tag=CC \
  59 +               ${CC} ${CFLAGS} -c $< -o ${@:.o=.lo}
  60
  61  ${OBJ} : ${INC}
  62
  63  install :
  64 -       install -d $(DESTDIR)/share/beaver/bin
  65 -       install beaver $(DESTDIR)/share/beaver/bin
  66 -       $(CP) $(DESTDIR)/share/beaver/bin/beaver $(DESTDIR)/share/beaver/bin/beaver.orig
  67 -       echo "#!/bin/bash" > $(DESTDIR)/share/beaver/bin/beaver
  68 -       echo "cd $(DESTDIR)/share/beaver/bin/" >> $(DESTDIR)/share/beaver/bin/beaver
  69 -       echo "./beaver.orig" >> $(DESTDIR)/share/beaver/bin/beaver
  70 -       ln -sf $(DESTDIR)/share/beaver/bin/beaver $(DESTDIR)/bin/beaver
  71 -       install -d $(DESTDIR)/share/beaver/bl
  72 -       $(CP) ../bl/*.bl $(DESTDIR)/share/beaver/bl
  73 -       install -d $(DESTDIR)/share/beaver/pixmaps
  74 -       $(CP) ../pixmaps/beaver.png $(DESTDIR)/share/beaver/pixmaps
  75 -       $(CP) ../pixmaps/about.xpm $(DESTDIR)/share/beaver/pixmaps
  76 -       chmod 644 $(DESTDIR)/share/beaver/pixmaps/beaver.png
  77 -       chmod 644 $(DESTDIR)/share/beaver/pixmaps/about.xpm
  78 -       install -d $(DESTDIR)/share/applications
  79 -       $(CP) ../beaver.desktop $(DESTDIR)/share/applications/beaver.desktop
  80 -       chmod 644 $(DESTDIR)/share/applications/beaver.desktop
  81 -       sed -i $(DESTDIR)/share/applications/beaver.desktop -e "s/Icon=/Icon=`echo $(DESTDIR) | sed -e 's/\//\\\\\//g'`\/share\/beaver\/pixmaps\//g"
  82 -       gzip -c9 ../beaver.1x > ../beaver.1x.gz
  83 -       install -d $(DESTDIR)/man/man1
  84 -       $(CP) ../beaver.1x.gz $(DESTDIR)/man/man1
  85 -       chmod 644 $(DESTDIR)/man/man1/beaver.1x.gz
  86 -       @echo
  87 -       @echo "Files installed :"
  88 -       @echo "-----------------"
  89 -       @echo
  90 -       @echo "$(DESTDIR)/bin/beaver"
  91 -       @echo "$(DESTDIR)/bin/beaver.orig"
  92 -       @echo "$(DESTDIR)/share/beaver/bin/beaver"
  93 -       @echo "$(DESTDIR)/share/beaver/bl/example1.bl"
  94 -       @echo "$(DESTDIR)/share/beaver/bl/example2.bl"
  95 -       @echo "$(DESTDIR)/share/beaver/bl/glib.bl"
  96 -       @echo "$(DESTDIR)/share/beaver/pixmaps/beaver.png"
  97 -       @echo "$(DESTDIR)/share/beaver/pixmaps/about.xpm"
  98 -       @echo "$(DESTDIR)/share/applications/beaver.desktop"
  99 -       @echo "$(DESTDIR)/man/man1/beaver.1x.gz"
 100 -       @echo
 101 -       @echo ",----------------------------------."
 102 -       @echo "| Beaver succesfully installed ^_^ |"
 103 -       @echo "\`----------------------------------'"
 104 -
 105 +       ${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/bin
 106 +       ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} \
 107 +               beaver $(DESTDIR)${PREFIX}/bin/beaver
 108 +       ${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/beaver/bl
 109 +       ${BSD_INSTALL_DATA} ../bl/*.bl $(DESTDIR)${PREFIX}/share/beaver/bl
 110 +       ${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/pixmaps/beaver
 111 +       ${BSD_INSTALL_DATA} ../pixmaps/beaver.png \
 112 +               $(DESTDIR)${PREFIX}/share/pixmaps/beaver
 113 +       ${BSD_INSTALL_DATA} ../pixmaps/about.xpm \
 114 +               $(DESTDIR)${PREFIX}/share/pixmaps/beaver
 115 +       ${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/applications
 116 +       ${BSD_INSTALL_DATA} ../beaver.desktop \
 117 +               $(DESTDIR)${PREFIX}/share/applications/beaver.desktop
 118 +       ${BSD_INSTALL_MAN_DIR} $(DESTDIR)${PREFIX}/${PKGMANDIR}/man1
 119 +       ${BSD_INSTALL_MAN} ../beaver.1x \
 120 +               $(DESTDIR)${PREFIX}/${PKGMANDIR}/man1/beaver.1
 121  .PHONY: clean re
 122
 123  clean  :