catch fakeroot escapees and simplify; ok couderc@

This commit is contained in:
naddy 2003-08-27 12:41:32 +00:00
parent 3b11991a91
commit 97ce729f4e
7 changed files with 9 additions and 81 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2003/08/02 15:26:19 couderc Exp $
# $OpenBSD: Makefile,v 1.26 2003/08/27 12:41:32 naddy Exp $
COMMENT= "HTML editor for experienced web designers"
@ -24,8 +24,8 @@ LIB_DEPENDS= gtk-x11-2.0.=0,gdk-x11-2.0.=0::x11/gtk+2 \
pcre::devel/pcre \
aspell::textproc/aspell
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-icon-path=${PREFIX}/share/pixmaps/
CONFIGURE_STYLE=gnu dest
CONFIGURE_ARGS= --with-icon-path='$${DESTDIR}${PREFIX}/share/pixmaps/'
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@ -33,4 +33,7 @@ USE_GMAKE= Yes
NO_REGRESS= Yes
pre-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
.include <bsd.port.mk>

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.5 2003/08/02 15:26:19 couderc Exp $
--- Makefile.in.orig 2003-07-27 17:26:59.000000000 +0200
+++ Makefile.in 2003-08-02 17:00:20.000000000 +0200
@@ -70,12 +70,11 @@ distclean:
install: src/bluefish
pkgdatadir=@pkgdatadir@
- $(INSTALL_DIR) $(pkgdatadir)
- $(INSTALL_DATA) images/bluefish_splash.png $(pkgdatadir)
+ $(INSTALL_DIR) $(DESTDIR)/$(pkgdatadir)
+ $(INSTALL_DATA) images/bluefish_splash.png $(DESTDIR)/$(pkgdatadir)
@cd icons/ && $(MAKE) install
- if [ -d $(iconpath) ]; then \
- $(INSTALL_DATA) inline_images/bluefish_icon1.png $(iconpath)/bluefish-icon.png ;\
- fi
+ $(INSTALL_DIR) $(DESTDIR)/$(iconpath)
+ $(INSTALL_DATA) inline_images/bluefish_icon1.png $(DESTDIR)/$(iconpath)/bluefish-icon.png
@cd src/ && $(MAKE) install
if [ "${USE_NLS}" == "yes" ]; then \
cd po/ && $(MAKE) install;\

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-data_Makefile_in,v 1.2 2003/08/02 15:26:19 couderc Exp $
--- data/Makefile.in.orig 2003-07-27 17:26:59.000000000 +0200
+++ data/Makefile.in 2003-08-02 16:40:23.000000000 +0200
@@ -37,7 +37,7 @@ all: $(DEFAULTFILES)
install: all
$(INSTALL_DIR) $(pkgdatadir)
@for file in $(DEFAULTFILES) ; do \
- $(INSTALL_DATA) $$file $(pkgdatadir)/$$file ;\
+ $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/$$file ;\
done
@for file in $(FUNCREFFILES) ; do \
$(INSTALL_DATA) $$file $(pkgdatadir)/$$file ;\

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-icons_Makefile_in,v 1.2 2003/08/02 15:26:19 couderc Exp $
--- icons/Makefile.in.orig 2003-07-27 17:26:59.000000000 +0200
+++ icons/Makefile.in 2003-08-02 16:40:23.000000000 +0200
@@ -52,9 +52,9 @@ all: bluefish
bluefish:
install: all
- $(INSTALL_DIR) $(pkgdatadir)
+ $(INSTALL_DIR) $(DESTDIR)$(pkgdatadir)
for file in $(OBJS) ; \
- do $(INSTALL_DATA) $$file $(pkgdatadir) ; \
+ do $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir) ; \
done
uninstall:

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-po_Makefile_in,v 1.2 2003/08/02 15:26:19 couderc Exp $
--- po/Makefile.in.orig 2003-07-27 17:26:57.000000000 +0200
+++ po/Makefile.in 2003-08-02 16:51:55.000000000 +0200
@@ -40,9 +40,9 @@ all-no:
install:
@for file in $(SRCS) ; do \
lang=`echo $${file} | sed -e 's/\.po$$//'`;\
- $(INSTALL_DIR) $(localedir)/$${lang}/ ;\
- $(INSTALL_DIR) $(localedir)/$${lang}/LC_MESSAGES/ ;\
- $(INSTALL_DATA) $${lang}.gmo $(localedir)/$${lang}/LC_MESSAGES/${PACKAGE}.mo;\
+ $(INSTALL_DIR) $(DESTDIR)/$(localedir)/$${lang}/ ;\
+ $(INSTALL_DIR) $(DESTDIR)/$(localedir)/$${lang}/LC_MESSAGES/ ;\
+ $(INSTALL_DATA) $${lang}.gmo $(DESTDIR)/$(localedir)/$${lang}/LC_MESSAGES/${PACKAGE}.mo;\
done
uninstall:

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2003/08/02 15:26:19 couderc Exp $
--- src/Makefile.in.orig 2003-07-27 17:26:58.000000000 +0200
+++ src/Makefile.in 2003-08-02 16:40:23.000000000 +0200
@@ -90,8 +90,8 @@ distclean: patchclean
rm -f config.h Makefile *~ *.bak core
install: all
- $(INSTALL_DIR) $(bindir)
- $(INSTALL_PROGRAM) ./bluefish $(bindir)/bluefish
+ $(INSTALL_DIR) $(DESTDIR)/$(bindir)
+ $(INSTALL_PROGRAM) ./bluefish $(DESTDIR)/$(bindir)/bluefish
uninstall:
/bin/rm -f $(bindir)/bluefish

View File

@ -1,9 +1,11 @@
@comment $OpenBSD: PLIST,v 1.8 2003/08/02 15:26:19 couderc Exp $
@comment $OpenBSD: PLIST,v 1.9 2003/08/27 12:41:32 naddy Exp $
bin/bluefish
share/bluefish/bluefish_splash.png
share/bluefish/custom_menu.default
share/bluefish/encodings.default
share/bluefish/filetypes.default
share/bluefish/funcref_html.xml
share/bluefish/funcref_php.xml
share/bluefish/highlighting.default
share/bluefish/icon_c.png
share/bluefish/icon_cfml.png