diff options
| author | martin <martin@pkgsrc.org> | 2010-02-05 19:36:16 +0000 |
|---|---|---|
| committer | martin <martin@pkgsrc.org> | 2010-02-05 19:36:16 +0000 |
| commit | a0122991f218338aaf68632abd6c39f963d89213 (patch) | |
| tree | 4926aeaf464a068a98482d6a2e97873a8b9d7210 /misc | |
| parent | a5ffea169d866177a4362f672c2b48bfa830d911 (diff) | |
| download | pkgsrc-a0122991f218338aaf68632abd6c39f963d89213.tar.gz | |
Simplify (I accidently reverted parts of joergs changes and solve the
same problem differently - undo that now). No visible change.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/open2300-mysql/Makefile | 3 | ||||
| -rw-r--r-- | misc/open2300/distinfo | 4 | ||||
| -rw-r--r-- | misc/open2300/patches/patch-aa | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/misc/open2300-mysql/Makefile b/misc/open2300-mysql/Makefile index 3d552979658..8d73eb4f821 100644 --- a/misc/open2300-mysql/Makefile +++ b/misc/open2300-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2010/02/05 15:27:27 martin Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/05 19:36:16 martin Exp $ # PKGNAME= ${DISTNAME:S/-/-mysql-/} @@ -9,6 +9,7 @@ PKG_DESTDIR_SUPPORT= user-destdir BUILD_TARGET= mysql2300 INSTALL_TARGET= install-mysql +INSTALLATION_DIRS+= bin LIBS+= -lmysqlclient LIBS.SunOS+= -lnsl -lsocket diff --git a/misc/open2300/distinfo b/misc/open2300/distinfo index f0b92b03dc0..7326ff98eb2 100644 --- a/misc/open2300/distinfo +++ b/misc/open2300/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.9 2010/02/05 15:26:15 martin Exp $ +$NetBSD: distinfo,v 1.10 2010/02/05 19:36:16 martin Exp $ SHA1 (open2300-1.10.tar.gz) = 428d30bd885b5c0acee257bcd04cb47eee14bc3e RMD160 (open2300-1.10.tar.gz) = 0773bfdf3d0c18b9113f16556651c559cc61b25f Size (open2300-1.10.tar.gz) = 337926 bytes -SHA1 (patch-aa) = 860a31abbfbe8deb6daaf1e6bdfbe2fb49794f49 +SHA1 (patch-aa) = 06dbd4a01ee378bf068ef4e8a55327e36fdc3416 SHA1 (patch-ab) = 9437137a36e434fcabde6acc5373be04523357e9 SHA1 (patch-ac) = 48762f4c60ca475031659cad94701a1bc83b6795 diff --git a/misc/open2300/patches/patch-aa b/misc/open2300/patches/patch-aa index 28f16649c43..67bdebb14e2 100644 --- a/misc/open2300/patches/patch-aa +++ b/misc/open2300/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2010/02/05 15:26:15 martin Exp $ +$NetBSD: patch-aa,v 1.7 2010/02/05 19:36:16 martin Exp $ --- Makefile.orig 2005-03-15 08:14:48.000000000 +0100 +++ Makefile 2010-02-04 18:52:12.000000000 +0100 @@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.6 2010/02/05 15:26:15 martin Exp $ pgsql2300: $(PGSQLOBJ) $(CC) $(CFLAGS) -o $@ $(PGSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/pgsql -L/usr/lib/pgsql -lpq -@@ -94,19 +94,25 @@ +@@ -94,19 +94,23 @@ $(CC) $(CFLAGS) -o $@ $(MINMAXOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) install: @@ -53,7 +53,6 @@ $NetBSD: patch-aa,v 1.6 2010/02/05 15:26:15 martin Exp $ - $(INSTALL) interval2300 $(bindir) - $(INSTALL) minmax2300 $(bindir) - -+ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir) + ${BSD_INSTALL_PROGRAM} open2300 $(DESTDIR)$(bindir) + ${BSD_INSTALL_PROGRAM} dump2300 $(DESTDIR)$(bindir) + ${BSD_INSTALL_PROGRAM} log2300 $(DESTDIR)$(bindir) @@ -69,7 +68,6 @@ $NetBSD: patch-aa,v 1.6 2010/02/05 15:26:15 martin Exp $ + ${BSD_INSTALL_DATA} open2300-dist.conf $(DESTDIR)${PREFIX}/share/examples/open2300/open2300.conf + +install-mysql: -+ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir) + ${BSD_INSTALL_PROGRAM} mysql2300 $(DESTDIR)$(bindir) + uninstall: |