cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Install docs (readme and instructions for extending surfraw)

Browse Source 
o Install share file into ${datadir}/<package> (automake pkgdata,
  .in files @datadir@/@PACKAGE@); requires /etc/surfraw.conf upgrade
o @dirrm share/stuff the package owns
naddy@ ok
This commit is contained in:
heko 2001-10-07 18:17:44 +00:00
parent e06dfa9b25
commit c99b40ae2e
5 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/surfraw/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2001/04/14 11:36:21 naddy Exp $ # $OpenBSD: Makefile,v 1.8 2001/10/07 18:17:44 heko Exp $
COMMENT= "command line interface to popular WWW search engines" COMMENT= "command line interface to popular WWW search engines"
@ -23,5 +23,7 @@ CONFIGURE_STYLE= gnu
post-install: post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/surfraw ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/surfraw
${INSTALL_DATA} ${WRKSRC}/surfraw.conf ${PREFIX}/share/examples/surfraw ${INSTALL_DATA} ${WRKSRC}/surfraw.conf ${PREFIX}/share/examples/surfraw
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/surfraw
${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/HACKING ${PREFIX}/share/doc/surfraw
.include <bsd.port.mk> .include <bsd.port.mk>

12
www/surfraw/patches/patch-elvi_Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-elvi_Makefile_am,v 1.1 2001/10/07 18:17:44 heko Exp $
--- elvi/Makefile.am.orig Fri Jan 12 08:23:37 2001
+++ elvi/Makefile.am Sun Oct 7 07:13:57 2001
@@ -36,7 +36,7 @@ bin_SCRIPTS = \
xxx \
yahoo
-sysconf_DATA = surfraw_elvi.list
+pkgdata_DATA = surfraw_elvi.list
EXTRA_DIST = $(bin_SCRIPTS)

50
www/surfraw/patches/patch-elvi_Makefile_in
View File

@ -1,11 +1,11 @@
--- elvi/Makefile.in.orig Wed Feb 28 11:47:19 2001 --- elvi/Makefile.in.orig Sat Jan 13 04:39:42 2001
+++ elvi/Makefile.in Wed Feb 28 13:50:38 2001 +++ elvi/Makefile.in Sun Oct 7 07:36:24 2001
@@ -104,14 +104,14 @@ bin_SCRIPTS = \ @@ -104,14 +104,14 @@ bin_SCRIPTS = \
xxx \ xxx \
yahoo yahoo
-sysconf_DATA = surfraw_elvi.list -sysconf_DATA = surfraw_elvi.list
+data_DATA = surfraw_elvi.list +pkgdata_DATA = surfraw_elvi.list
EXTRA_DIST = $(bin_SCRIPTS) EXTRA_DIST = $(bin_SCRIPTS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@ -13,7 +13,7 @@
SCRIPTS = $(bin_SCRIPTS) SCRIPTS = $(bin_SCRIPTS)
-DATA = $(sysconf_DATA) -DATA = $(sysconf_DATA)
+DATA = $(data_DATA) +DATA = $(pkgdata_DATA)
DIST_COMMON = Makefile.am Makefile.in DIST_COMMON = Makefile.am Makefile.in
@ -22,69 +22,67 @@
done done
-install-sysconfDATA: $(sysconf_DATA) -install-sysconfDATA: $(sysconf_DATA)
+install-dataDATA: $(data_DATA) +install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- @list='$(sysconf_DATA)'; for p in $$list; do \ - @list='$(sysconf_DATA)'; for p in $$list; do \
+ $(mkinstalldirs) $(DESTDIR)$(datadir) + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ @list='$(data_DATA)'; for p in $$list; do \ + @list='$(pkgdata_DATA)'; for p in $$list; do \
if test -f $(srcdir)/$$p; then \ if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/$$p"; \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datadir)/$$p; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
else if test -f $$p; then \ else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/$$p"; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(datadir)/$$p; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
fi; fi; \ fi; fi; \
done done
-uninstall-sysconfDATA: uninstall-sysconfDATA:
+uninstall-dataDATA:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
- list='$(sysconf_DATA)'; for p in $$list; do \ - list='$(sysconf_DATA)'; for p in $$list; do \
- rm -f $(DESTDIR)$(sysconfdir)/$$p; \ - rm -f $(DESTDIR)$(sysconfdir)/$$p; \
+ list='$(data_DATA)'; for p in $$list; do \ + list='$(pkgdata_DATA)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(datadir)/$$p; \ + rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
done done
tags: TAGS tags: TAGS
TAGS: TAGS:
@@ -188,21 +188,21 @@ dvi: @@ -188,7 +188,8 @@ dvi:
check: all check: all
$(MAKE) $(MAKE)
installcheck: installcheck:
-install-exec: install-binSCRIPTS install-sysconfDATA -install-exec: install-binSCRIPTS install-sysconfDATA
+install-exec: install-binSCRIPTS +
@$(NORMAL_INSTALL) +install-exec: install-binSCRIPTS install-pkgdataDATA
-install-data:
+install-data: install-dataDATA
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
install-data:
@@ -197,12 +198,12 @@ install-data:
install: install-exec install-data all install: install-exec install-data all
@: @:
-uninstall: uninstall-binSCRIPTS uninstall-sysconfDATA -uninstall: uninstall-binSCRIPTS uninstall-sysconfDATA
+uninstall: uninstall-binSCRIPTS uninstall-dataDATA +uninstall: uninstall-binSCRIPTS uninstall-pkgdataDATA
install-strip: install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
installdirs: installdirs:
- $(mkinstalldirs) $(DATADIR)$(bindir) $(DATADIR)$(sysconfdir) - $(mkinstalldirs) $(DATADIR)$(bindir) $(DATADIR)$(sysconfdir)
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir)
mostlyclean-generic: mostlyclean-generic:
@@ -230,8 +230,8 @@ maintainer-clean: maintainer-clean-gene @@ -230,8 +231,8 @@ maintainer-clean: maintainer-clean-gene
@echo "This command is intended for maintainers to use;" @echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
-.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-sysconfDATA \ -.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-sysconfDATA \
-install-sysconfDATA tags distdir info dvi installcheck install-exec \ -install-sysconfDATA tags distdir info dvi installcheck install-exec \
+.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-dataDATA \ +.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataDATA \
+install-dataDATA tags distdir info dvi installcheck install-exec \ +install-pkgdataDATA tags distdir info dvi installcheck install-exec \
install-data install uninstall all installdirs mostlyclean-generic \ install-data install uninstall all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \ distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean mostlyclean distclean maintainer-clean

6
www/surfraw/patches/patch-surfraw_conf_in
View File

@ -1,5 +1,5 @@
--- surfraw.conf.in.orig Wed Feb 28 11:43:57 2001 --- surfraw.conf.in.orig Tue Aug 22 19:01:50 2000
+++ surfraw.conf.in Wed Feb 28 11:44:51 2001 +++ surfraw.conf.in Sun Oct 7 07:21:14 2001
@@ -27,7 +27,7 @@ def SURFRAW_conf $HOME/.surfraw.conf @@ -27,7 +27,7 @@ def SURFRAW_conf $HOME/.surfraw.conf
# name/path of browser executable # name/path of browser executable
@ -14,4 +14,4 @@
# file containing list of elvi # file containing list of elvi
-def SURFRAW_elvi_list @sysconfdir@/surfraw_elvi.list -def SURFRAW_elvi_list @sysconfdir@/surfraw_elvi.list
+def SURFRAW_elvi_list @datadir@/surfraw_elvi.list +def SURFRAW_elvi_list @datadir@/@PACKAGE@/surfraw_elvi.list

9
www/surfraw/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2001/03/01 01:41:20 obecian Exp $ @comment $OpenBSD: PLIST,v 1.4 2001/10/07 18:17:44 heko Exp $
bin/W bin/W
bin/altavista bin/altavista
bin/amazon bin/amazon
@ -36,5 +36,10 @@ bin/webster
bin/wetandwild bin/wetandwild
bin/xxx bin/xxx
bin/yahoo bin/yahoo
share/surfraw_elvi.list share/doc/surfraw/HACKING
share/doc/surfraw/README
share/examples/surfraw/surfraw.conf share/examples/surfraw/surfraw.conf
share/surfraw/surfraw_elvi.list
@dirrm share/surfraw
@dirrm share/examples/surfraw
@dirrm share/doc/surfraw