diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-06-02 03:14:50 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-06-02 03:14:50 +0000 |
| commit | 49aa384ee7dcffd19d1a04e90136f58b78ce4f38 (patch) | |
| tree | 3cf88d573578ad2b69a36d3935d74fb95f0d4675 | |
| parent | e366d0c694f76afeff8379f738912bfa77414859 (diff) | |
| download | pkgsrc-49aa384ee7dcffd19d1a04e90136f58b78ce4f38.tar.gz | |
Resolve conflicts from last commit.
| -rw-r--r-- | emulators/suse64_glx/Makefile | 10 | ||||
| -rw-r--r-- | graphics/gtkglext/Makefile | 11 |
2 files changed, 2 insertions, 19 deletions
diff --git a/emulators/suse64_glx/Makefile b/emulators/suse64_glx/Makefile index 65de769f8af..80ae2855960 100644 --- a/emulators/suse64_glx/Makefile +++ b/emulators/suse64_glx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/06/02 01:19:54 jschauma Exp $ +# $NetBSD: Makefile,v 1.7 2003/06/02 03:14:50 jschauma Exp $ DISTNAME= suse_glx-${SUSE_VERSION} PKGREVISION= 2 @@ -21,12 +21,4 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPMFILES= glx-000229-53.i386.rpm .include "../suse64_linux/Makefile.common" -<<<<<<< Makefile -<<<<<<< Makefile .include "../../mk/bsd.pkg.mk" -======= -.include "../../mk.bsd.pkg.mk" ->>>>>>> 1.4 -======= -.include "../../mk/bsd.pkg.mk" ->>>>>>> 1.5 diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index 89c93ef73c5..58eb2551e9e 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,16 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2003/06/02 01:19:25 jschauma Exp $ +# $NetBSD: Makefile,v 1.8 2003/06/02 03:14:50 jschauma Exp $ # -<<<<<<< Makefile -DISTNAME= gtkglext-0.6.1 -PKGREVISION= 1 -======= DISTNAME= gtkglext-0.7.1 -<<<<<<< Makefile ->>>>>>> 1.5 -======= -PKGREVISION= 1 ->>>>>>> 1.6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkglext/} EXTRACT_SUFX= .tar.bz2 |