Index: head/textproc/sgrep/pkg-plist =================================================================== --- head/textproc/sgrep/pkg-plist (revision 450271) +++ head/textproc/sgrep/pkg-plist (nonexistent) @@ -1,3 +0,0 @@ -bin/sgrep -man/man1/sgrep.1.gz -share/sgreprc Property changes on: head/textproc/sgrep/pkg-plist ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/sgrep/Makefile =================================================================== --- head/textproc/sgrep/Makefile (revision 450271) +++ head/textproc/sgrep/Makefile (revision 450272) @@ -1,22 +1,26 @@ # Created by: # $FreeBSD$ PORTNAME= sgrep PORTVERSION= 0.99 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/ \ LOCAL/jkoshy -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bofh@FreeBSD.org COMMENT= Grep for structured text like SGML and HTML +LICENSE= GPLv2 + +PORTSCOUT= limit:^0\. CONFLICTS= sgrep2-1.* +PLIST_FILES= bin/sgrep man/man1/sgrep.1.gz share/sgreprc # Override the install target in the supplied makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sgrep ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/sgrep.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/sample.sgreprc ${STAGEDIR}${PREFIX}/share/sgreprc .include Index: head/textproc/sgrep/files/patch-Makefile =================================================================== --- head/textproc/sgrep/files/patch-Makefile (revision 450271) +++ head/textproc/sgrep/files/patch-Makefile (revision 450272) @@ -1,39 +1,39 @@ ---- Makefile.orig 1996-05-02 19:58:24.000000000 +0800 -+++ Makefile 2011-09-07 09:33:07.000000000 +0800 +--- Makefile.orig 1996-05-02 11:58:24 UTC ++++ Makefile @@ -10,11 +10,11 @@ # # This is where the executable goes -BINDIR = /usr/local/bin/ +BINDIR = ${PREFIX}/bin # Where sgrep library files are placed (sgreprc) -LIBDIR = /usr/local/lib +LIBDIR = ${PREFIX}/share # Where the manual page goes -MANFILE = /usr/local/man/man1/sgrep.1 +MANFILE = ${PREFIX}/man/man1/sgrep.1 # Where the sample rc file goes RCFILE = $(LIBDIR)/sgreprc # If you can't install as root you might wan't to use this as rc file @@ -25,7 +25,7 @@ VERSION = 0.99 CFLAGS = -O -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\" LDFLAGS = # if cc fails to you use gcc -CC = cc +#CC = cc CPPFLAGS = LIBS = @@ -45,11 +45,7 @@ sgrep: $(OBJECTS) clean: -rm -f $(OBJECTS) -install: sgrep - cp sgrep $(BINDIR)/sgrep - chmod 755 $(BINDIR)/sgrep - cp sgrep.1 $(MANFILE) - chmod 644 $(MANFILE) +install: install.rc: sample.sgreprc cp sample.sgreprc $(RCFILE) Index: head/textproc/sgrep/files/patch-sgrep.1 =================================================================== --- head/textproc/sgrep/files/patch-sgrep.1 (revision 450271) +++ head/textproc/sgrep/files/patch-sgrep.1 (revision 450272) @@ -1,11 +1,11 @@ ---- sgrep.1-- Wed Apr 29 12:26:40 1998 -+++ sgrep.1 Wed Apr 29 12:26:49 1998 -@@ -91,7 +91,7 @@ +--- sgrep.1.orig 1996-04-30 06:38:09 UTC ++++ sgrep.1 +@@ -91,7 +91,7 @@ are read by default first from file \fB$HOME/.sgreprc,\fP or if it doesn't exist, from file -\fB/usr/lib/sgreprc, \fP +\fB/usr/local/share/sgreprc, \fP and then from the command line. Different behavior can be specified through command line options. .Pp