Attachment 16190 Details for Bug 29780 – file.diff

[patch] file.diff

file.diff (text/plain), 3.79 KB, created by pat on 2001-08-16 19:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pat

Created: 2001-08-16 19:50:01 UTC

Size: 3.79 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/wmcube/Makefile wmcube/Makefile
>--- /usr/ports/sysutils/wmcube/Makefile	Sun Jun  3 22:34:08 2001
>+++ wmcube/Makefile	Thu Aug 16 14:33:57 2001
>@@ -14,13 +14,13 @@
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}/${PORTNAME}
> USE_X_PREFIX=	yes
>-USE_GMAKE=	yes
> USE_XPM=	yes
>+MAKEFILE=	Makefile.FREEBSD
> 
>-do-configure:
>-	@${SED} -e "s|/usr/X11R6/|${X11BASE}/|" \
>-		${WRKSRC}/Makefile.FREEBSD > \
>-		${WRKSRC}/Makefile
>+do-install:
>+	@${INSTALL_PROGRAM} ${WRKSRC}/wmcube ${PREFIX}/bin
>+	@${CHMOD} g+s ${PREFIX}/bin/wmcube
>+	@${CHOWN} root:kmem ${PREFIX}/bin/wmcube
> 
> post-install:
> .for file in *.wmc
>@@ -35,10 +35,10 @@
> 	@${ECHO} "===>   Please Read pkg-descr and README for usage information"
> 	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \
> 		${PREFIX}/share/doc/${PORTNAME}
>-.for file in CHANGES COPYING README TODO
>+.for file in CHANGES README TODO
> 	@${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/${PORTNAME}
> .endfor
> .endif # !NOPORTDOCS
>-	@${SED} -e "s|/usr/X11R6|${PREFIX}|" ${PKGMESSAGE}
>+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/sysutils/wmcube/files/patch-Makefile.FREEBSD wmcube/files/patch-Makefile.FREEBSD
>--- /usr/ports/sysutils/wmcube/files/patch-Makefile.FREEBSD	Mon Jun 18 21:48:35 2001
>+++ wmcube/files/patch-Makefile.FREEBSD	Thu Aug 16 14:22:32 2001
>@@ -1,6 +1,16 @@
>---- Makefile.FREEBSD.orig	Tue May 29 15:20:30 2001
>-+++ Makefile.FREEBSD	Tue May 29 15:22:08 2001
>-@@ -9,7 +9,7 @@
>+--- Makefile.FREEBSD.orig	Thu Aug 16 14:22:12 2001
>++++ Makefile.FREEBSD	Thu Aug 16 14:21:42 2001
>+@@ -1,15 +1,13 @@
>+-CC = gcc
>+ OS = -DFREEBSD
>+ 
>+-LIBDIR = -L/usr/X11R6/lib
>+-LIBDIR = -L/usr/X11R6/lib
>+-INCDIR = -I/usr/X11R6/include
>++LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib
>++INCDIR = -I${X11BASE}/include
>+ 
>+ # Edit OSLIBS as appropriate to include OS specific libraries.
>  
>  OSLIBS = -lkvm
>  LIBS   = -lXpm -lXext -lX11 -lm $(OSLIBS)
>@@ -9,14 +19,12 @@
>  
>  OBJS =	wmcube.o \
>  	../wmgeneral/wmgeneral.o \
>-@@ -32,7 +32,7 @@
>- 	rm -f *~
>+@@ -20,7 +18,7 @@
>+ 	$(CC) $(CFLAGS) $(INCDIR) -c $< -o $*.o
>+ 
>+ wmcube: $(OBJS)
>+-	$(CC) -o wmcube $(OBJS) -lXext $(LIBDIR) $(LIBS)
>++	$(CC) -o wmcube $(OBJS) $(LIBDIR) $(LIBS)
>+ 
>+ all:: wmcube
>  
>- install:: wmcube
>--	cp -f wmcube /usr/local/bin/
>--	chmod g+s /usr/local/bin/wmcube
>--	chown root.kmem /usr/local/bin/wmcube
>-+	$(BSD_INSTALL_PROGRAM) wmcube $(PREFIX)/bin/
>-+	chown root:kmem $(PREFIX)/bin/wmcube
>-+	chmod g+s $(PREFIX)/bin/wmcube
>- 	@echo "wmCube installation finished..."
>diff -ruN /usr/ports/sysutils/wmcube/pkg-message wmcube/pkg-message
>--- /usr/ports/sysutils/wmcube/pkg-message	Sat Jun  2 00:12:13 2001
>+++ wmcube/pkg-message	Thu Aug 16 14:26:57 2001
>@@ -1,10 +1,7 @@
>+-------------------------------------------
> The extra 3d objects are located in:
>-        /usr/X11R6/share/wmcube
>+	%%PREFIX%%/share/wmcube
> 
> To run wmcube type:
>-        wmcube -o /usr/X11R6/share/wmcube &
>-
>-Do not forget to replace /usr/X11R6 with your appropriate installation
>-prefix if you do not use the port's system default.
>-
>-(default: /usr/X11R6/)
>+	wmcube -o %%PREFIX%%/share/wmcube &
>+-------------------------------------------
>diff -ruN /usr/ports/sysutils/wmcube/pkg-plist wmcube/pkg-plist
>--- /usr/ports/sysutils/wmcube/pkg-plist	Sat Jun  2 00:12:13 2001
>+++ wmcube/pkg-plist	Thu Aug 16 14:33:48 2001
>@@ -1,4 +1,7 @@
> bin/wmcube
>+%%PORTDOCS%%share/doc/wmcube/CHANGES
>+%%PORTDOCS%%share/doc/wmcube/README
>+%%PORTDOCS%%share/doc/wmcube/TODO
> share/wmcube/2planes-solid.wmc
> share/wmcube/4d.wmc
> share/wmcube/8star-small.wmc
>@@ -33,9 +36,5 @@
> share/wmcube/star.wmc
> share/wmcube/starcube.wmc
> share/wmcube/wmlogo.wmc
>-%%PORTDOCS%%share/doc/wmcube/CHANGES
>-%%PORTDOCS%%share/doc/wmcube/COPYING
>-%%PORTDOCS%%share/doc/wmcube/README
>-%%PORTDOCS%%share/doc/wmcube/TODO
> @dirrm share/wmcube
> %%PORTDOCS%%@dirrm share/doc/wmcube

Actions: View | Diff

Attachments on bug 29780: 16190