Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c6d12dfdd9d83c593262c3b808e895475232b047

commit c6d12dfdd9d83c593262c3b808e895475232b047
Author: Devil505 <devil505li...@gmail.com>
Date:   Thu Feb 11 13:02:16 2010 +0100

fotoxx-9.5-1-i686
* remove custom Makefile
* version bump
* fixed #4067

diff --git a/source/xapps-extra/fotoxx/FrugalBuild 
b/source/xapps-extra/fotoxx/FrugalBuild
index 867a464..43fd686 100644
--- a/source/xapps-extra/fotoxx/FrugalBuild
+++ b/source/xapps-extra/fotoxx/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Devil505 <devil505li...@gmail.com>

pkgname=fotoxx
-pkgver=9.2
+pkgver=9.5
pkgrel=1
pkgdesc="A program for improving image files made with a digital camera"
url="http://kornelix.squarespace.com/$pkgname/";
@@ -11,16 +11,18 @@ options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="lynx -dump http://kornelix.squarespace.com/downloads/ | Flasttar"
-source=(http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz
 Makefile)
-sha1sums=('8145b1ec9ff8ffabf8fef3c1006b8b0d2ac1d320' \
-          '906a13751c8c2531eb242d828949124fa6cbf2e0')
+source=(http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz)
+sha1sums=('a30330c49d0e283f63b1c87c3dabbaba21e91a48')
replaces=('fotox')

build() {
Fcd
-  cp $Fsrcdir/Makefile . || Fdie
-  Fmkdir usr/share/applications
-  Fmake
-  make PREFIX=$Fdestdir/usr install || Fdie
+  Fsed "kornelix-" "" Makefile
+  Fsed "xdg-" "#xdg-" Makefile
+  PREFIX=/usr make || Fdie
+  Fmkdir usr/share/{$pkgname,applications,man/man1}
+  make PREFIX=$Fdestdir/usr menu || Fdie
+  make DESTDIR=$Fdestdir PREFIX=/usr install || Fdie
+  Fmv usr/share/$pkgname/$pkgname.desktop 
usr/share/applications/$pkgname.desktop
}

diff --git a/source/xapps-extra/fotoxx/Makefile 
b/source/xapps-extra/fotoxx/Makefile
deleted file mode 100644
index a93ed5e..0000000
--- a/source/xapps-extra/fotoxx/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-PROGRAM = fotoxx
-VERSION = 9.2
-
-ifeq "$(PREFIX)" ""
-       PREFIX = /usr/local
-endif
-
-SOURCE = $(PROGRAM)-$(VERSION).cpp
-BINDIR = $(PREFIX)/bin
-DATADIR = $(PREFIX)/share/$(PROGRAM)
-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
-DESKTOP = $(PREFIX)/share/applications/$(PROGRAM).desktop
-MANDIR = $(PREFIX)/share/man/man1
-
-CFLAGS = -O -Wall -c `pkg-config --cflags gtk+-2.0`
-LFLAGS = -O -Wall -rdynamic -lfreeimage `pkg-config --libs gtk+-2.0 
gthread-2.0`
-
-$(PROGRAM): $(PROGRAM).o zfuncs.o
-       @ g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o
-
-$(PROGRAM).o: $(SOURCE) zfuncs.h
-       @ g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE)               \
-         -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
-
-zfuncs.o: zfuncs.cpp zfuncs.h
-       @ g++ $(CFLAGS) zfuncs.cpp      \
-         -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D 
"BINDIR=\"$(BINDIR)\""
-
-install: $(PROGRAM)
-       mkdir -p $(DESTDIR)$(DOCDIR)
-       mkdir -p $(DESTDIR)$(BINDIR)
-       mkdir -p $(DESTDIR)$(DATADIR)
-       mkdir -p $(DESTDIR)$(DATADIR)/locales
-       mkdir -p $(DESTDIR)$(MANDIR)
-       cp -R doc/* $(DESTDIR)$(DOCDIR)
-       cp -R data/* $(DESTDIR)$(DATADIR)
-       cp $(PROGRAM) $(DESTDIR)$(BINDIR)
-       cp -R locales/* $(DESTDIR)$(DATADIR)/locales
-#  install .desktop file (menu entry)
-       @echo "[Desktop Entry]" >  $(DESTDIR)/$(DESKTOP)
-       @echo "Name=$(PROGRAM)" >> $(DESTDIR)/$(DESKTOP)
-       @echo "Categories=Graphics" >> $(DESTDIR)/$(DESKTOP)
-       @echo "Type=Application" >> $(DESTDIR)/$(DESKTOP)
-       @echo "Terminal=false" >> $(DESTDIR)/$(DESKTOP)
-       @echo "Exec=$(BINDIR)/$(PROGRAM)" >> $(DESTDIR)/$(DESKTOP)
-       @echo "Icon=$(DATADIR)/icons/$(PROGRAM).png" >> $(DESTDIR)/$(DESKTOP)
-       @echo "GenericName=Digital Photo Editor" >> $(DESTDIR)/$(DESKTOP)
-#  install man page
-       cp -f doc/$(PROGRAM).man $(PROGRAM).1
-       gzip -f $(PROGRAM).1
-       cp $(PROGRAM).1.gz $(DESTDIR)$(MANDIR)
-       rm -f $(PROGRAM).1.gz
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to